Remove last code that assumed xinv/xinx are large object files.

4 files changed, 14 insertions, 22 deletions

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
index 3c1acd78480..02729679b35 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
    * </ol>
    *
    * <p>The valid values for the types parameter are:
-   * "TABLE", "INDEX", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and
-   * "SYSTEM INDEX"
+   * "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
    *
    * @param catalog a catalog name; For org.postgresql, this is ignored, and
    * should be set to null
@@ -1721,10 +1720,9 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
   //
   // IMPORTANT: the query must be enclosed in ( )
   private static final String getTableTypes[][] = {
-    {"TABLE",		"(relkind='r' and relhasrules='f' and relname !~ '^pg_' and relname !~ '^xinv')"},
-    {"VIEW",        "(relkind='v' and relname !~ '^pg_' and relname !~ '^xinv')"},
-    {"INDEX",		"(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"},
-    {"LARGE OBJECT",	"(relkind='r' and relname ~ '^xinv')"},
+    {"TABLE",		"(relkind='r' and relhasrules='f' and relname !~ '^pg_')"},
+    {"VIEW",        "(relkind='v' and relname !~ '^pg_')"},
+    {"INDEX",		"(relkind='i' and relname !~ '^pg_')"},
     {"SEQUENCE",	"(relkind='S' and relname !~ '^pg_')"},
     {"SYSTEM TABLE",	"(relkind='r' and relname ~ '^pg_')"},
     {"SYSTEM INDEX",	"(relkind='i' and relname ~ '^pg_')"}
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
index 64435d81bdb..a5955d553d2 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
    * </ol>
    *
    * <p>The valid values for the types parameter are:
-   * "TABLE", "INDEX", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and
-   * "SYSTEM INDEX"
+   * "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
    *
    * @param catalog a catalog name; For org.postgresql, this is ignored, and
    * should be set to null
@@ -1721,10 +1720,9 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
   //
   // IMPORTANT: the query must be enclosed in ( )
   private static final String getTableTypes[][] = {
-    {"TABLE",		"(relkind='r' and relhasrules='f' and relname !~ '^pg_' and relname !~ '^xinv')"},
-    {"VIEW",        "(relkind='v' and relname !~ '^pg_' and relname !~ '^xinv')"},
-    {"INDEX",		"(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"},
-    {"LARGE OBJECT",	"(relkind='r' and relname ~ '^xinv')"},
+    {"TABLE",		"(relkind='r' and relhasrules='f' and relname !~ '^pg_')"},
+    {"VIEW",        "(relkind='v' and relname !~ '^pg_')"},
+    {"INDEX",		"(relkind='i' and relname !~ '^pg_')"},
     {"SEQUENCE",	"(relkind='S' and relname !~ '^pg_')"},
     {"SYSTEM TABLE",	"(relkind='r' and relname ~ '^pg_')"},
     {"SYSTEM INDEX",	"(relkind='i' and relname ~ '^pg_')"}
diff --git a/src/interfaces/jdbc/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/postgresql/jdbc1/DatabaseMetaData.java
index 4ab6a0c02d9..595340f22f5 100644
--- a/src/interfaces/jdbc/postgresql/jdbc1/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/postgresql/jdbc1/DatabaseMetaData.java
@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
    * </ol>
    *
    * <p>The valid values for the types parameter are:
-   * "TABLE", "INDEX", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and
-   * "SYSTEM INDEX"
+   * "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
    *
    * @param catalog a catalog name; For postgresql, this is ignored, and
    * should be set to null
@@ -1706,9 +1705,8 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
   //
   // IMPORTANT: the query must be enclosed in ( )
   private static final String getTableTypes[][] = {
-    {"TABLE",		"(relkind='r' and relname !~ '^pg_' and relname !~ '^xinv')"},
-    {"INDEX",		"(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"},
-    {"LARGE OBJECT",	"(relkind='r' and relname ~ '^xinv')"},
+    {"TABLE",		"(relkind='r' and relname !~ '^pg_')"},
+    {"INDEX",		"(relkind='i' and relname !~ '^pg_')"},
     {"SEQUENCE",	"(relkind='S' and relname !~ '^pg_')"},
     {"SYSTEM TABLE",	"(relkind='r' and relname ~ '^pg_')"},
     {"SYSTEM INDEX",	"(relkind='i' and relname ~ '^pg_')"}
diff --git a/src/interfaces/jdbc/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/postgresql/jdbc2/DatabaseMetaData.java
index b4b7ebc677f..a936cb518cc 100644
--- a/src/interfaces/jdbc/postgresql/jdbc2/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/postgresql/jdbc2/DatabaseMetaData.java
@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
    * </ol>
    *
    * <p>The valid values for the types parameter are:
-   * "TABLE", "INDEX", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and
-   * "SYSTEM INDEX"
+   * "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
    *
    * @param catalog a catalog name; For postgresql, this is ignored, and
    * should be set to null
@@ -1706,9 +1705,8 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
   //
   // IMPORTANT: the query must be enclosed in ( )
   private static final String getTableTypes[][] = {
-    {"TABLE",		"(relkind='r' and relname !~ '^pg_' and relname !~ '^xinv')"},
-    {"INDEX",		"(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"},
-    {"LARGE OBJECT",	"(relkind='r' and relname ~ '^xinv')"},
+    {"TABLE",		"(relkind='r' and relname !~ '^pg_')"},
+    {"INDEX",		"(relkind='i' and relname !~ '^pg_')"},
     {"SEQUENCE",	"(relkind='S' and relname !~ '^pg_')"},
     {"SYSTEM TABLE",	"(relkind='r' and relname ~ '^pg_')"},
     {"SYSTEM INDEX",	"(relkind='i' and relname ~ '^pg_')"}