Skip to content

P
Postgres FD Implementation
Commit 5c8055e4 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

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

parent a1d28be8
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 22 deletions
src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
View file @ 5c8055e4
...@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
* </ol> * </ol>
* *
* <p>The valid values for the types parameter are: * <p>The valid values for the types parameter are:
* "TABLE", "INDEX", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and * "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
* "SYSTEM INDEX"
* *
* @param catalog a catalog name; For org.postgresql, this is ignored, and * @param catalog a catalog name; For org.postgresql, this is ignored, and
* should be set to null * should be set to null
...@@ -1721,10 +1720,9 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -1721,10 +1720,9 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
// //
// IMPORTANT: the query must be enclosed in ( ) // IMPORTANT: the query must be enclosed in ( )
private static final String getTableTypes[][] = { private static final String getTableTypes[][] = {
{"TABLE", "(relkind='r' and relhasrules='f' and relname !~ '^pg_' and relname !~ '^xinv')"}, {"TABLE", "(relkind='r' and relhasrules='f' and relname !~ '^pg_')"},
{"VIEW", "(relkind='v' and relname !~ '^pg_' and relname !~ '^xinv')"}, {"VIEW", "(relkind='v' and relname !~ '^pg_')"},
{"INDEX", "(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"}, {"INDEX", "(relkind='i' and relname !~ '^pg_')"},
{"LARGE OBJECT", "(relkind='r' and relname ~ '^xinv')"},
{"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"}, {"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"},
{"SYSTEM TABLE", "(relkind='r' and relname ~ '^pg_')"}, {"SYSTEM TABLE", "(relkind='r' and relname ~ '^pg_')"},
{"SYSTEM INDEX", "(relkind='i' and relname ~ '^pg_')"} {"SYSTEM INDEX", "(relkind='i' and relname ~ '^pg_')"}
......
src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
View file @ 5c8055e4
...@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
* </ol> * </ol>
* *
* <p>The valid values for the types parameter are: * <p>The valid values for the types parameter are:
* "TABLE", "INDEX", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and * "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
* "SYSTEM INDEX"
* *
* @param catalog a catalog name; For org.postgresql, this is ignored, and * @param catalog a catalog name; For org.postgresql, this is ignored, and
* should be set to null * should be set to null
...@@ -1721,10 +1720,9 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -1721,10 +1720,9 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
// //
// IMPORTANT: the query must be enclosed in ( ) // IMPORTANT: the query must be enclosed in ( )
private static final String getTableTypes[][] = { private static final String getTableTypes[][] = {
{"TABLE", "(relkind='r' and relhasrules='f' and relname !~ '^pg_' and relname !~ '^xinv')"}, {"TABLE", "(relkind='r' and relhasrules='f' and relname !~ '^pg_')"},
{"VIEW", "(relkind='v' and relname !~ '^pg_' and relname !~ '^xinv')"}, {"VIEW", "(relkind='v' and relname !~ '^pg_')"},
{"INDEX", "(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"}, {"INDEX", "(relkind='i' and relname !~ '^pg_')"},
{"LARGE OBJECT", "(relkind='r' and relname ~ '^xinv')"},
{"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"}, {"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"},
{"SYSTEM TABLE", "(relkind='r' and relname ~ '^pg_')"}, {"SYSTEM TABLE", "(relkind='r' and relname ~ '^pg_')"},
{"SYSTEM INDEX", "(relkind='i' and relname ~ '^pg_')"} {"SYSTEM INDEX", "(relkind='i' and relname ~ '^pg_')"}
......
src/interfaces/jdbc/postgresql/jdbc1/DatabaseMetaData.java
View file @ 5c8055e4
...@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
* </ol> * </ol>
* *
* <p>The valid values for the types parameter are: * <p>The valid values for the types parameter are:
* "TABLE", "INDEX", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and * "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
* "SYSTEM INDEX"
* *
* @param catalog a catalog name; For postgresql, this is ignored, and * @param catalog a catalog name; For postgresql, this is ignored, and
* should be set to null * should be set to null
...@@ -1706,9 +1705,8 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -1706,9 +1705,8 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
// //
// IMPORTANT: the query must be enclosed in ( ) // IMPORTANT: the query must be enclosed in ( )
private static final String getTableTypes[][] = { private static final String getTableTypes[][] = {
{"TABLE", "(relkind='r' and relname !~ '^pg_' and relname !~ '^xinv')"}, {"TABLE", "(relkind='r' and relname !~ '^pg_')"},
{"INDEX", "(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"}, {"INDEX", "(relkind='i' and relname !~ '^pg_')"},
{"LARGE OBJECT", "(relkind='r' and relname ~ '^xinv')"},
{"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"}, {"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"},
{"SYSTEM TABLE", "(relkind='r' and relname ~ '^pg_')"}, {"SYSTEM TABLE", "(relkind='r' and relname ~ '^pg_')"},
{"SYSTEM INDEX", "(relkind='i' and relname ~ '^pg_')"} {"SYSTEM INDEX", "(relkind='i' and relname ~ '^pg_')"}
......
src/interfaces/jdbc/postgresql/jdbc2/DatabaseMetaData.java
View file @ 5c8055e4
...@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -1617,8 +1617,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
* </ol> * </ol>
* *
* <p>The valid values for the types parameter are: * <p>The valid values for the types parameter are:
* "TABLE", "INDEX", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and * "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
* "SYSTEM INDEX"
* *
* @param catalog a catalog name; For postgresql, this is ignored, and * @param catalog a catalog name; For postgresql, this is ignored, and
* should be set to null * should be set to null
...@@ -1706,9 +1705,8 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -1706,9 +1705,8 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
// //
// IMPORTANT: the query must be enclosed in ( ) // IMPORTANT: the query must be enclosed in ( )
private static final String getTableTypes[][] = { private static final String getTableTypes[][] = {
{"TABLE", "(relkind='r' and relname !~ '^pg_' and relname !~ '^xinv')"}, {"TABLE", "(relkind='r' and relname !~ '^pg_')"},
{"INDEX", "(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"}, {"INDEX", "(relkind='i' and relname !~ '^pg_')"},
{"LARGE OBJECT", "(relkind='r' and relname ~ '^xinv')"},
{"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"}, {"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"},
{"SYSTEM TABLE", "(relkind='r' and relname ~ '^pg_')"}, {"SYSTEM TABLE", "(relkind='r' and relname ~ '^pg_')"},
{"SYSTEM INDEX", "(relkind='i' and relname ~ '^pg_')"} {"SYSTEM INDEX", "(relkind='i' and relname ~ '^pg_')"}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment