diff options
| -rw-r--r-- | src/interfaces/odbc/info.c | 4 | ||||
| -rw-r--r-- | src/interfaces/odbc/pgtypes.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/interfaces/odbc/info.c b/src/interfaces/odbc/info.c index 165fd0bcaee..cebc305da3e 100644 --- a/src/interfaces/odbc/info.c +++ b/src/interfaces/odbc/info.c @@ -2368,7 +2368,9 @@ Int2 result_cols; "AND (pg_proc.proname LIKE '%%upd') " "AND (pg_proc_1.proname LIKE '%%del') " "AND (pg_trigger.tgrelid=pt.tgconstrrelid) " - "AND (pg_trigger_1.tgrelid = pt.tgconstrrelid))", + "AND (pg_trigger.tgconstrname=pt.tgconstrname) " + "AND (pg_trigger_1.tgrelid=pt.tgconstrrelid) " + "AND (pg_trigger_1.tgconstrname=pt.tgconstrname))", fk_table_needed); result = SQLExecDirect(htbl_stmt, tables_query, strlen(tables_query)); diff --git a/src/interfaces/odbc/pgtypes.c b/src/interfaces/odbc/pgtypes.c index 4263eea7b85..ebee8ab262f 100644 --- a/src/interfaces/odbc/pgtypes.c +++ b/src/interfaces/odbc/pgtypes.c @@ -217,7 +217,9 @@ Int2 pgtype_to_sqltype(StatementClass *stmt, Int4 type) case PG_TYPE_XID: case PG_TYPE_INT4: return SQL_INTEGER; - case PG_TYPE_INT8: return SQL_BIGINT; + /* Change this to SQL_BIGINT for ODBC v3 bjm 2001-01-23 */ + case PG_TYPE_INT8: return SQL_CHAR; + case PG_TYPE_NUMERIC: return SQL_NUMERIC; case PG_TYPE_FLOAT4: return SQL_REAL; |