Fix a typo in SQLForeignKeys-ResultSet-Column.

'deferrablity' should be 'DEFERRABILITY'.
Report from Alexander Roskamp.

diff --git a/info.c b/info.c
index 97f77f529d4ca1bd8e3aad7b3a984f2a1205a694..c2c4ff0985121758b3c7cff00926bc71a648aea5 100644 (file)
--- a/info.c
+++ b/info.c
@@ -5823,31 +5823,31 @@ PGAPI_ForeignKeys_new(HSTMT hstmt,
 #define    return  DONT_CALL_RETURN_FROM_HERE???
    printfPQExpBuffer(&tables_query,
        "select"
-       "   %s as PKTABLE_CAT"
-       ",\n    %s as PKTABLE_SCHEM"
-       ",\n    c2.relname as PKTABLE_NAME"
-       ",\n    a2.attname as PKCOLUMN_NAME"
-       ",\n    %s as FKTABLE_CAT"
-       ",\n    %s as FKTABLE_SCHEM"
-       ",\n    c1.relname as FKTABLE_NAME"
-       ",\n    a1.attname as FKCOLUMN_NAME"
-       ",\n    i::int2 as KEY_SEQ"
+       "   %s as \"PKTABLE_CAT\""
+       ",\n    %s as \"PKTABLE_SCHEM\""
+       ",\n    c2.relname as \"PKTABLE_NAME\""
+       ",\n    a2.attname as \"PKCOLUMN_NAME\""
+       ",\n    %s as \"FKTABLE_CAT\""
+       ",\n    %s as \"FKTABLE_SCHEM\""
+       ",\n    c1.relname as \"FKTABLE_NAME\""
+       ",\n    a1.attname as \"FKCOLUMN_NAME\""
+       ",\n    i::int2 as \"KEY_SEQ\""
        ",\n    case ref.confupdtype"
        "\n     when 'c' then %d::int2"
        "\n     when 'n' then %d::int2"
        "\n     when 'd' then %d::int2"
        "\n     when 'r' then %d::int2"
        "\n     else %d::int2"
-       "\n end as UPDATE_RULE"
+       "\n end as \"UPDATE_RULE\""
        ",\n    case ref.confdeltype"
        "\n     when 'c' then %d::int2"
        "\n     when 'n' then %d::int2"
        "\n     when 'd' then %d::int2"
        "\n     when 'r' then %d::int2"
        "\n     else %d::int2"
-       "\n end as DELETE_RULE"
-       ",\n    ref.conname as FK_NAME"
-       ",\n    cn.conname as PK_NAME"
+       "\n end as \"DELETE_RULE\""
+       ",\n    ref.conname as \"FK_NAME\""
+       ",\n    cn.conname as \"PK_NAME\""
        ",\n    case"
        "\n     when ref.condeferrable then"
        "\n         case"
@@ -5855,7 +5855,7 @@ PGAPI_ForeignKeys_new(HSTMT hstmt,
        "\n         else %d::int2"
        "\n         end"
        "\n     else %d::int2"
-       "\n end as DEFERRABLITY"
+       "\n end as \"DEFERRABILITY\""
        "\n from"
        "\n ((((((("
        " (select cn.oid, conrelid, conkey, confrelid, confkey"

diff --git a/test/expected/catalogfunctions.out b/test/expected/catalogfunctions.out
index a6d11fd9f37db9c2263ca9d2adc34bf082d1832a..21f8c4a5e3817e09ae7f28fea0134c3d7d3c956c 100644 (file)
--- a/test/expected/catalogfunctions.out
+++ b/test/expected/catalogfunctions.out
@@ -128,20 +128,20 @@ Result set:
 contrib_regression public  testtab1    id  1   testtab1_pkey
 Check for SQLForeignKeys
 Result set metadata:
-pktable_cat: VARCHAR(63) digits: 0, nullable
-pktable_schem: VARCHAR(63) digits: 0, not nullable
-pktable_name: VARCHAR(63) digits: 0, not nullable
-pkcolumn_name: VARCHAR(63) digits: 0, not nullable
-fktable_cat: VARCHAR(63) digits: 0, nullable
-fktable_schem: VARCHAR(63) digits: 0, not nullable
-fktable_name: VARCHAR(63) digits: 0, not nullable
-fkcolumn_name: VARCHAR(63) digits: 0, not nullable
-key_seq: SMALLINT(5) digits: 0, nullable
-update_rule: SMALLINT(5) digits: 0, nullable
-delete_rule: SMALLINT(5) digits: 0, nullable
-fk_name: VARCHAR(63) digits: 0, not nullable
-pk_name: VARCHAR(63) digits: 0, not nullable
-deferrablity: SMALLINT(5) digits: 0, nullable
+PKTABLE_CAT: VARCHAR(63) digits: 0, nullable
+PKTABLE_SCHEM: VARCHAR(63) digits: 0, not nullable
+PKTABLE_NAME: VARCHAR(63) digits: 0, not nullable
+PKCOLUMN_NAME: VARCHAR(63) digits: 0, not nullable
+FKTABLE_CAT: VARCHAR(63) digits: 0, nullable
+FKTABLE_SCHEM: VARCHAR(63) digits: 0, not nullable
+FKTABLE_NAME: VARCHAR(63) digits: 0, not nullable
+FKCOLUMN_NAME: VARCHAR(63) digits: 0, not nullable
+KEY_SEQ: SMALLINT(5) digits: 0, nullable
+UPDATE_RULE: SMALLINT(5) digits: 0, nullable
+DELETE_RULE: SMALLINT(5) digits: 0, nullable
+FK_NAME: VARCHAR(63) digits: 0, not nullable
+PK_NAME: VARCHAR(63) digits: 0, not nullable
+DEFERRABILITY: SMALLINT(5) digits: 0, nullable
 Result set:
 contrib_regression public  testtab1    id  contrib_regression  public  testtab_fk  id  1   3   3   testtab_fk_id_fkey  testtab1_pkey   7
 Check for SQLProcedures