Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5c8055e

Browse files
committed
Remove last code that assumed xinv/xinx are large object files.
1 parenta1d28be commit5c8055e

File tree

4 files changed

+14
-22
lines changed

4 files changed

+14
-22
lines changed

‎src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,8 +1617,7 @@ 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", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and
1621-
* "SYSTEM INDEX"
1620+
* "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
16221621
*
16231622
* @param catalog a catalog name; For org.postgresql, this is ignored, and
16241623
* should be set to null
@@ -1721,10 +1720,9 @@ public java.sql.ResultSet getTables(String catalog, String schemaPattern, String
17211720
//
17221721
// IMPORTANT: the query must be enclosed in ( )
17231722
privatestaticfinalStringgetTableTypes[][] = {
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')"},
1723+
{"TABLE","(relkind='r' and relhasrules='f' and relname !~ '^pg_')"},
1724+
{"VIEW","(relkind='v' and relname !~ '^pg_')"},
1725+
{"INDEX","(relkind='i' and relname !~ '^pg_')"},
17281726
{"SEQUENCE","(relkind='S' and relname !~ '^pg_')"},
17291727
{"SYSTEM TABLE","(relkind='r' and relname ~ '^pg_')"},
17301728
{"SYSTEM INDEX","(relkind='i' and relname ~ '^pg_')"}

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,8 +1617,7 @@ 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", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and
1621-
* "SYSTEM INDEX"
1620+
* "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
16221621
*
16231622
* @param catalog a catalog name; For org.postgresql, this is ignored, and
16241623
* should be set to null
@@ -1721,10 +1720,9 @@ public java.sql.ResultSet getTables(String catalog, String schemaPattern, String
17211720
//
17221721
// IMPORTANT: the query must be enclosed in ( )
17231722
privatestaticfinalStringgetTableTypes[][] = {
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')"},
1723+
{"TABLE","(relkind='r' and relhasrules='f' and relname !~ '^pg_')"},
1724+
{"VIEW","(relkind='v' and relname !~ '^pg_')"},
1725+
{"INDEX","(relkind='i' and relname !~ '^pg_')"},
17281726
{"SEQUENCE","(relkind='S' and relname !~ '^pg_')"},
17291727
{"SYSTEM TABLE","(relkind='r' and relname ~ '^pg_')"},
17301728
{"SYSTEM INDEX","(relkind='i' and relname ~ '^pg_')"}

‎src/interfaces/jdbc/postgresql/jdbc1/DatabaseMetaData.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,8 +1617,7 @@ 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", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and
1621-
* "SYSTEM INDEX"
1620+
* "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
16221621
*
16231622
* @param catalog a catalog name; For postgresql, this is ignored, and
16241623
* should be set to null
@@ -1706,9 +1705,8 @@ public java.sql.ResultSet getTables(String catalog, String schemaPattern, String
17061705
//
17071706
// IMPORTANT: the query must be enclosed in ( )
17081707
privatestaticfinalStringgetTableTypes[][] = {
1709-
{"TABLE","(relkind='r' and relname !~ '^pg_' and relname !~ '^xinv')"},
1710-
{"INDEX","(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"},
1711-
{"LARGE OBJECT","(relkind='r' and relname ~ '^xinv')"},
1708+
{"TABLE","(relkind='r' and relname !~ '^pg_')"},
1709+
{"INDEX","(relkind='i' and relname !~ '^pg_')"},
17121710
{"SEQUENCE","(relkind='S' and relname !~ '^pg_')"},
17131711
{"SYSTEM TABLE","(relkind='r' and relname ~ '^pg_')"},
17141712
{"SYSTEM INDEX","(relkind='i' and relname ~ '^pg_')"}

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,8 +1617,7 @@ 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", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and
1621-
* "SYSTEM INDEX"
1620+
* "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
16221621
*
16231622
* @param catalog a catalog name; For postgresql, this is ignored, and
16241623
* should be set to null
@@ -1706,9 +1705,8 @@ public java.sql.ResultSet getTables(String catalog, String schemaPattern, String
17061705
//
17071706
// IMPORTANT: the query must be enclosed in ( )
17081707
privatestaticfinalStringgetTableTypes[][] = {
1709-
{"TABLE","(relkind='r' and relname !~ '^pg_' and relname !~ '^xinv')"},
1710-
{"INDEX","(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"},
1711-
{"LARGE OBJECT","(relkind='r' and relname ~ '^xinv')"},
1708+
{"TABLE","(relkind='r' and relname !~ '^pg_')"},
1709+
{"INDEX","(relkind='i' and relname !~ '^pg_')"},
17121710
{"SEQUENCE","(relkind='S' and relname !~ '^pg_')"},
17131711
{"SYSTEM TABLE","(relkind='r' and relname ~ '^pg_')"},
17141712
{"SYSTEM INDEX","(relkind='i' and relname ~ '^pg_')"}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp