From b561e18860d7079699b3accf1c130967f40d5f7a Mon Sep 17 00:00:00 2001 From: Dave Cramer Date: Tue, 15 Apr 2025 16:55:44 -0700 Subject: [PATCH] remove schema and table name from SpecialColumns and update test --- info.c | 2 -- test/expected/catalogfunctions.out | 12 +++++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/info.c b/info.c index e351c96e..da1ec2c9 100644 --- a/info.c +++ b/info.c @@ -3167,8 +3167,6 @@ WHERE a.attnum > 0 and c.relname like 'testuktab'; */ initPQExpBuffer(&columns_query); printfPQExpBuffer(&columns_query, "select NULL as \"SCOPE\"," - "n.nspname as \"SCHEMA_NAME\"," - "c.relname as \"TABLE_NAME\"," "a.attname AS \"COLUMN_NAME\"," "t.typname AS \"DATA_TYPE\"," "t.typname AS \"TYPE_NAME\"," diff --git a/test/expected/catalogfunctions.out b/test/expected/catalogfunctions.out index 71ede25a..7980f396 100644 --- a/test/expected/catalogfunctions.out +++ b/test/expected/catalogfunctions.out @@ -80,7 +80,7 @@ contrib_regression public lo_test_tab id 4 int4 contrib_regression public lo_test_tab large_data -4 lo contrib_regression public test_special id 4 int4 contrib_regression public test_special ival 4 int4 -contrib_regression public test_special_pkey id 4 int4 +contrib_regression public test_special_id id 4 int4 contrib_regression public test_special_ui ival 4 int4 contrib_regression public testforeign c1 4 int4 contrib_regression public testmatview id 4 int4 @@ -107,7 +107,7 @@ contrib_regression public testtab1 id UPDATE YES contrib_regression public testtab1 id SELECT YES contrib_regression public testtab1 id REFERENCES YES contrib_regression public testtab1 id INSERT YES -Check for SQLSpecialColumns ROWVER +Check for SQLSpecialColumns Result set metadata: SCOPE: SMALLINT(5) digits: 0, nullable COLUMN_NAME: VARCHAR(128) digits: 0, nullable @@ -119,11 +119,9 @@ DECIMAL_DIGITS: SMALLINT(5) digits: 0, nullable PSEUDO_COLUMN: SMALLINT(5) digits: 0, nullable Result set: NULL xmin 4 xid 10 4 0 2 -Check for SQLSpecialColumns ROWID +Check for SQLSpecialColumns Result set metadata: SCOPE: LONGVARCHAR(8190) digits: 0, nullable -SCHEMA_NAME: VARCHAR(63) digits: 0, not nullable -TABLE_NAME: VARCHAR(63) digits: 0, not nullable COLUMN_NAME: VARCHAR(63) digits: 0, not nullable DATA_TYPE: VARCHAR(63) digits: 0, not nullable TYPE_NAME: VARCHAR(63) digits: 0, not nullable @@ -132,8 +130,8 @@ BUFFER_LENGTH: SMALLINT(5) digits: 0, not nullable DECIMAL_DIGITS: INTEGER(10) digits: 0, nullable PSEUDO_COLUMN: INTEGER(10) digits: 0, nullable Result set: -NULL public test_special id int4 int4 4 4 0 1 -NULL public test_special ival int4 int4 4 4 0 1 +NULL id int4 int4 4 4 0 1 +NULL ival int4 int4 4 4 0 1 Check for SQLStatistics Result set metadata: TABLE_CAT: VARCHAR(128) digits: 0, nullable