patch from Mitchel Friedman to fix getTables

Dave Cramer · Dave Cramer · commit 7aa6270fc7ac · 2002-03-05T03:02:52.000Z
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
@@ -13,7 +13,7 @@
 /*
  * This class provides information about the database as a whole.
  *
- * $Id: DatabaseMetaData.java,v 1.43 2002/03/05 02:14:06 davec Exp $
+ * $Id: DatabaseMetaData.java,v 1.44 2002/03/05 03:02:47 davec Exp $
  *
  * <p>Many of the methods here return lists of information in ResultSets.  You
  * 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
 			String relKind;
 			switch (r.getBytes(3)[0])
 			{
-				case (byte) 'r':
-					relKind = "TABLE";
-					break;
+				case (byte) 'r':                                        
+					if ( r.getString(1).startsWith("pg_") )
+                                        {
+                                                relKind = "SYSTEM TABLE";
+                                        }
+                                        else
+                                        {
+                                                relKind = "TABLE";
+                                        }
+ 					break;
 				case (byte) 'i':
 					relKind = "INDEX";
 					break;
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
@@ -15,7 +15,7 @@
 /*
  * This class provides information about the database as a whole.
  *
- * $Id: DatabaseMetaData.java,v 1.50 2002/03/05 02:14:08 davec Exp $
+ * $Id: DatabaseMetaData.java,v 1.51 2002/03/05 03:02:52 davec Exp $
  *
  * <p>Many of the methods here return lists of information in ResultSets.  You
  * 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
 			switch (r.getBytes(3)[0])
 			{
 				case (byte) 'r':
-					relKind = "TABLE";
+					if ( r.getString(1).startsWith("pg_") )
+					{
+						relKind = "SYSTEM TABLE";
+					}
+					else
+					{
+						relKind = "TABLE";
+					}
 					break;
 				case (byte) 'i':
 					relKind = "INDEX";
