rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ODBC compile, prevent ODBCVER warning, though the version numbers go 

not match.
This commit is contained in:
Bruce Momjian 2000-12-11 18:51:26 +00:00
parent 0cbfde72fe
commit 01b5efa5e3
3 changed files with 97 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/interfaces/odbc/info.c
View File

@ -2255,12 +2255,15 @@ char tables_query[MAX_STATEMENT_LEN];
char trig_deferrable[2];
char trig_initdeferred[2];
char trig_args[1024];
char upd_rule[MAX_NAME_LEN], del_rule[MAX_NAME_LEN];
char upd_rule[MAX_TABLE_LEN], del_rule[MAX_TABLE_LEN];
char pk_table_needed[MAX_TABLE_LEN + 1];
char fk_table_needed[MAX_TABLE_LEN + 1];
char *pkey_ptr, *fkey_ptr, *pk_table, *fk_table;
int i, j, k, num_keys;
SWORD trig_nargs, upd_rule_type, del_rule_type, defer_type;
SWORD trig_nargs, upd_rule_type=0, del_rule_type=0;
#if (ODBCVER >= 0x0300)
SWORD defer_type;
#endif
char pkey[MAX_INFO_STRING];
Int2 result_cols;
@ -2814,7 +2817,7 @@ Int2 result_cols;
set_tuplefield_string(&row->tuple[13], trig_args);
#if (ODBCVER >= 0x0300)
mylog("defer_type = '%s', defer_type);
mylog("defer_type = '%s'", defer_type);
set_tuplefield_int2(&row->tuple[14], defer_type);
#endif /* ODBCVER >= 0x0300 */

2
src/interfaces/odbc/isql.h
View File

@ -24,7 +24,9 @@ typedef signed short RETCODE;
# define SQL_API EXPORT CALLBACK
# endif
#ifndef ODBCVER
# define ODBCVER 0x0200
#endif
# define SQL_MAX_MESSAGE_LENGTH 512
# define SQL_MAX_DSN_LENGTH 32

2
src/interfaces/odbc/psqlodbc.h
View File

@ -34,7 +34,9 @@ typedef double SDOUBLE;
typedef UInt4 Oid;
/* Driver stuff */
#ifndef ODBCVER
#define ODBCVER 0x0250
#endif
#define DRIVER_ODBC_VER "02.50"
#define DRIVERNAME "PostgreSQL ODBC"