Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d766693

Browse files
committed
Back out *inv* changes for this file. Peter want to handle it.
1 parent b9b045d commit d766693

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,8 @@ public java.sql.ResultSet getProcedureColumns(String catalog, String schemaPatte
16171617
* </ol>
16181618
*
16191619
* <p>The valid values for the types parameter are:
1620-
* "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
1620+
* "TABLE", "INDEX", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and
1621+
* "SYSTEM INDEX"
16211622
*
16221623
* @param catalog a catalog name; For org.postgresql, this is ignored, and
16231624
* should be set to null
@@ -1720,9 +1721,10 @@ public java.sql.ResultSet getTables(String catalog, String schemaPattern, String
17201721
//
17211722
// IMPORTANT: the query must be enclosed in ( )
17221723
private static final String getTableTypes[][] = {
1723-
{"TABLE", "(relkind='r' and relhasrules='f' and relname !~ '^pg_')"},
1724-
{"VIEW", "(relkind='v' and relname !~ '^pg_')"},
1725-
{"INDEX", "(relkind='i' and relname !~ '^pg_')"},
1724+
{"TABLE", "(relkind='r' and relhasrules='f' and relname !~ '^pg_' and relname !~ '^xinv')"},
1725+
{"VIEW", "(relkind='v' and relname !~ '^pg_' and relname !~ '^xinv')"},
1726+
{"INDEX", "(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"},
1727+
{"LARGE OBJECT", "(relkind='r' and relname ~ '^xinv')"},
17261728
{"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"},
17271729
{"SYSTEM TABLE", "(relkind='r' and relname ~ '^pg_')"},
17281730
{"SYSTEM INDEX", "(relkind='i' and relname ~ '^pg_')"}

0 commit comments

Comments
 (0)