From 0bd656e4073eeccc07f84f223c56818c30294c8d Mon Sep 17 00:00:00 2001 From: Kris Jurka Date: Wed, 16 Jun 2004 03:36:56 +0000 Subject: [PATCH] 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. --- .../org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java index ec73b286551..c608ae1e347 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 +