aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Cramer <davec@fastcrypt.com>2002-12-20 13:15:53 +0000
committerDave Cramer <davec@fastcrypt.com>2002-12-20 13:15:53 +0000
commit83feff3ee70266c9936b512cbbf80c2605ac86ba (patch)
tree95fc7b9673a5c5d651e3edd6ca38dd796c7103e9
parentff494e88511fb2d40401d404ca1345b71804e79b (diff)
downloadpostgresql-83feff3ee70266c9936b512cbbf80c2605ac86ba.tar.gz
postgresql-83feff3ee70266c9936b512cbbf80c2605ac86ba.zip
patch for null table in getPrimaryKeys
-rw-r--r--src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
index 00a9bee46bf..02798897ad1 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
@@ -2903,9 +2903,11 @@ public abstract class AbstractJdbc1DatabaseMetaData
" ci.relname AS PK_NAME "+
from+
" WHERE ct.oid=i.indrelid AND ci.oid=i.indexrelid "+
- " AND a.attrelid=ci.oid AND i.indisprimary "+
- " AND ct.relname = '"+escapeQuotes(table)+"' "+
- where+
+ " AND a.attrelid=ci.oid AND i.indisprimary ";
+ if (table != null && !"".equals(table)) {
+ sql += " AND ct.relname = '"+escapeQuotes(table)+"' ";
+ }
+ sql += where+
" ORDER BY table_name, pk_name, key_seq";
return connection.createStatement().executeQuery(sql);
}