Commit7aa6270

Dave Cramer

committed

patch from Mitchel Friedman to fix getTables

1 parent925d60e commit7aa6270Copy full SHA for 7aa6270

File tree

+20

-6

lines changed

src/interfaces/jdbc/org/postgresql
- jdbc1
  - DatabaseMetaData.java
- jdbc2
  - DatabaseMetaData.java

+20

-6

lines changed

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`/*`
`14`	`14`	`* This class provides information about the database as a whole.`
`15`	`15`	`*`
`16`		`- * $Id: DatabaseMetaData.java,v 1.43 2002/03/05 02:14:06 davec Exp $`
	`16`	`+ * $Id: DatabaseMetaData.java,v 1.44 2002/03/0503:02:47 davec Exp $`
`17`	`17`	`*`
`18`	`18`	`* <p>Many of the methods here return lists of information in ResultSets. You`
`19`	`19`	`* can use the normal ResultSet methods such as getString and getInt to`
`@@ -1731,9 +1731,16 @@ public java.sql.ResultSet getTables(String catalog, String schemaPattern, String`
`1731`	`1731`	`StringrelKind;`
`1732`	`1732`	`switch (r.getBytes(3)[0])`
`1733`	`1733`	`{`
`1734`		`-case (byte)'r':`
`1735`		`-relKind ="TABLE";`
`1736`		`-break;`
	`1734`	`+case (byte)'r':`
	`1735`	`+if (r.getString(1).startsWith("pg_") )`
	`1736`	`+ {`
	`1737`	`+relKind ="SYSTEM TABLE";`
	`1738`	`+ }`
	`1739`	`+else`
	`1740`	`+ {`
	`1741`	`+relKind ="TABLE";`
	`1742`	`+ }`
	`1743`	`+break;`
`1737`	`1744`	`case (byte)'i':`
`1738`	`1745`	`relKind ="INDEX";`
`1739`	`1746`	`break;`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`/*`
`16`	`16`	`* This class provides information about the database as a whole.`
`17`	`17`	`*`
`18`		`- * $Id: DatabaseMetaData.java,v 1.50 2002/03/05 02:14:08 davec Exp $`
	`18`	`+ * $Id: DatabaseMetaData.java,v 1.51 2002/03/0503:02:52 davec Exp $`
`19`	`19`	`*`
`20`	`20`	`* <p>Many of the methods here return lists of information in ResultSets. You`
`21`	`21`	`* can use the normal ResultSet methods such as getString and getInt to`
`@@ -1832,7 +1832,14 @@ public java.sql.ResultSet getTables(String catalog, String schemaPattern, String`
`1832`	`1832`	`switch (r.getBytes(3)[0])`
`1833`	`1833`	`{`
`1834`	`1834`	`case (byte)'r':`
`1835`		`-relKind ="TABLE";`
	`1835`	`+if (r.getString(1).startsWith("pg_") )`
	`1836`	`+{`
	`1837`	`+relKind ="SYSTEM TABLE";`
	`1838`	`+}`
	`1839`	`+else`
	`1840`	`+{`
	`1841`	`+relKind ="TABLE";`
	`1842`	`+}`
`1836`	`1843`	`break;`
`1837`	`1844`	`case (byte)'i':`
`1838`	`1845`	`relKind ="INDEX";`

Comments

(0)