From: Kris Jurka Date: Wed, 16 Jun 2004 03:36:56 +0000 (+0000) Subject: Fix DatabaseMetaData results for determining foreign key X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=b235c1d2f3f8af1aa7af9f001023a7555db41059;p=users%2Fbernd%2Fpostgres.git 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 ec73b28655..c608ae1e34 100644 --- 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 +