Fix DatabaseMetaData results for determining foreign key

relationships.  Resulting columns from getImportedExportedKeys should
be FKTABLE_SCHEM and PKTABLE_SCHEM, not _SCHEMA.

Per report from jeff@bonevich.com.

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
index ec73b2865515cf0b0d94bbdceef6d29a50d7dcb2..c608ae1e34711f881ad43def9d88898c94908b3f 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
@@ -2976,8 +2976,8 @@ public abstract class AbstractJdbc1DatabaseMetaData
                 */
 
                if (connection.haveMinimumServerVersion("7.4")) {
-                       String sql = "SELECT NULL::text AS PKTABLE_CAT, pkn.nspname AS PKTABLE_SCHEMA, pkc.relname AS PKTABLE_NAME, pka.attname AS PKCOLUMN_NAME, "+
-                       "NULL::text AS FK_TABLE_CAT, fkn.nspname AS FKTABLE_SCHEMA, fkc.relname AS FKTABLE_NAME, fka.attname AS FKCOLUMN_NAME, "+
+                       String sql = "SELECT NULL::text AS PKTABLE_CAT, pkn.nspname AS PKTABLE_SCHEM, pkc.relname AS PKTABLE_NAME, pka.attname AS PKCOLUMN_NAME, "+
+                       "NULL::text AS FK_TABLE_CAT, fkn.nspname AS FKTABLE_SCHEM, fkc.relname AS FKTABLE_NAME, fka.attname AS FKCOLUMN_NAME, "+
                        "pos.n AS KEY_SEQ, "+
                        "CASE con.confupdtype "+
                                " WHEN 'c' THEN " + DatabaseMetaData.importedKeyCascade +