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

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
index 3c1acd784802d221217da3e9121664365a460dc1..02729679b35ec71756e0e81e2404ad468f07bf6f 100644 (file)
--- 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 64435d81bdb62ba3ace094ef18b532126f4c37d9..a5955d553d239b67f768b641823003611fb1e04c 100644 (file)
--- 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 4ab6a0c02d90069f20d73a6f6dc4c2b77a53205f..595340f22f5b306379112dade3907d277d3269a1 100644 (file)
--- 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 b4b7ebc677fb2334eac7c0d5c810a627a08bbcd5..a936cb518cc03316c549e1d6884c6ba84d52f347 100644 (file)
--- 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_')"}