From: Bruce Momjian Date: Sun, 11 Feb 2001 05:58:41 +0000 (+0000) Subject: Source alignment cleanups. X-Git-Tag: REL7_1~461 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3152ef63a624cfecf1889068db49397a0a8e035e;p=postgresql Source alignment cleanups. --- diff --git a/src/interfaces/odbc/bind.c b/src/interfaces/odbc/bind.c index a787b59e32..16a375301f 100644 --- a/src/interfaces/odbc/bind.c +++ b/src/interfaces/odbc/bind.c @@ -35,7 +35,7 @@ /* Bind parameters on a statement handle */ -RETCODE SQL_API +RETCODE SQL_API SQLBindParameter( HSTMT hstmt, UWORD ipar, @@ -156,7 +156,7 @@ SQLBindParameter( /* - - - - - - - - - */ /* Associate a user-supplied buffer with a database column. */ -RETCODE SQL_API +RETCODE SQL_API SQLBindCol( HSTMT hstmt, UWORD icol, @@ -267,7 +267,7 @@ SQLBindCol( /* it is best to say this function is not supported and let the application assume a */ /* data type (most likely varchar). */ -RETCODE SQL_API +RETCODE SQL_API SQLDescribeParam( HSTMT hstmt, UWORD ipar, @@ -321,7 +321,7 @@ SQLDescribeParam( /* Sets multiple values (arrays) for the set of parameter markers. */ -RETCODE SQL_API +RETCODE SQL_API SQLParamOptions( HSTMT hstmt, UDWORD crow, @@ -344,7 +344,7 @@ SQLParamOptions( /* like it does for SQLDescribeParam is that some applications don't care and try */ /* to call it anyway. */ /* If the statement does not have parameters, it should just return 0. */ -RETCODE SQL_API +RETCODE SQL_API SQLNumParams( HSTMT hstmt, SWORD FAR *pcpar) diff --git a/src/interfaces/odbc/columninfo.h b/src/interfaces/odbc/columninfo.h index 964ebc7617..da1dbfe0f6 100644 --- a/src/interfaces/odbc/columninfo.h +++ b/src/interfaces/odbc/columninfo.h @@ -36,9 +36,9 @@ char CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn); /* functions for setting up the fields from within the program, */ /* without reading from a socket */ -void CI_set_num_fields(ColumnInfoClass *self, int new_num_fields); +void CI_set_num_fields(ColumnInfoClass *self, int new_num_fields); void CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name, - Oid new_adtid, Int2 new_adtsize, Int4 atttypmod); + Oid new_adtid, Int2 new_adtsize, Int4 atttypmod); #endif diff --git a/src/interfaces/odbc/connection.c b/src/interfaces/odbc/connection.c index e5aecc8760..2a4b62ef5c 100644 --- a/src/interfaces/odbc/connection.c +++ b/src/interfaces/odbc/connection.c @@ -34,7 +34,7 @@ extern GLOBAL_VALUES globals; -RETCODE SQL_API +RETCODE SQL_API SQLAllocConnect( HENV henv, HDBC FAR *phdbc) @@ -75,7 +75,7 @@ SQLAllocConnect( /* - - - - - - - - - */ -RETCODE SQL_API +RETCODE SQL_API SQLConnect( HDBC hdbc, UCHAR FAR *szDSN, @@ -132,7 +132,7 @@ SQLConnect( /* - - - - - - - - - */ -RETCODE SQL_API +RETCODE SQL_API SQLBrowseConnect( HDBC hdbc, UCHAR FAR *szConnStrIn, @@ -151,7 +151,7 @@ SQLBrowseConnect( /* - - - - - - - - - */ /* Drop any hstmts open on hdbc and disconnect from database */ -RETCODE SQL_API +RETCODE SQL_API SQLDisconnect( HDBC hdbc) { @@ -191,7 +191,7 @@ SQLDisconnect( /* - - - - - - - - - */ -RETCODE SQL_API +RETCODE SQL_API SQLFreeConnect( HDBC hdbc) { diff --git a/src/interfaces/odbc/connection.h b/src/interfaces/odbc/connection.h index 6b824e4684..efc7eaeaea 100644 --- a/src/interfaces/odbc/connection.h +++ b/src/interfaces/odbc/connection.h @@ -200,26 +200,26 @@ struct col_info #endif typedef BOOL (FAR WINAPI * DataSourceToDriverProc) (UDWORD, - SWORD, - PTR, - SDWORD, - PTR, - SDWORD, - SDWORD FAR *, - UCHAR FAR *, - SWORD, - SWORD FAR *); + SWORD, + PTR, + SDWORD, + PTR, + SDWORD, + SDWORD FAR *, + UCHAR FAR *, + SWORD, + SWORD FAR *); typedef BOOL (FAR WINAPI * DriverToDataSourceProc) (UDWORD, - SWORD, - PTR, - SDWORD, - PTR, - SDWORD, - SDWORD FAR *, - UCHAR FAR *, - SWORD, - SWORD FAR *); + SWORD, + PTR, + SDWORD, + PTR, + SDWORD, + SDWORD FAR *, + UCHAR FAR *, + SWORD, + SWORD FAR *); /******* The Connection handle ************/ struct ConnectionClass_ diff --git a/src/interfaces/odbc/drvconn.c b/src/interfaces/odbc/drvconn.c index d6e3706a7d..4204913e0b 100644 --- a/src/interfaces/odbc/drvconn.c +++ b/src/interfaces/odbc/drvconn.c @@ -65,7 +65,7 @@ extern HINSTANCE NEAR s_hModule;/* Saved module handle. */ extern GLOBAL_VALUES globals; -RETCODE SQL_API +RETCODE SQL_API SQLDriverConnect( HDBC hdbc, HWND hwnd, diff --git a/src/interfaces/odbc/environ.c b/src/interfaces/odbc/environ.c index b4294678ae..d0353531c0 100644 --- a/src/interfaces/odbc/environ.c +++ b/src/interfaces/odbc/environ.c @@ -22,7 +22,7 @@ ConnectionClass *conns[MAX_CONNECTIONS]; -RETCODE SQL_API +RETCODE SQL_API SQLAllocEnv(HENV FAR *phenv) { static char *func = "SQLAllocEnv"; @@ -41,7 +41,7 @@ SQLAllocEnv(HENV FAR *phenv) return SQL_SUCCESS; } -RETCODE SQL_API +RETCODE SQL_API SQLFreeEnv(HENV henv) { static char *func = "SQLFreeEnv"; @@ -62,7 +62,7 @@ SQLFreeEnv(HENV henv) /* Returns the next SQL error information. */ -RETCODE SQL_API +RETCODE SQL_API SQLError( HENV henv, HDBC hdbc, diff --git a/src/interfaces/odbc/execute.c b/src/interfaces/odbc/execute.c index b4ef4a5975..ac7f2ee30f 100644 --- a/src/interfaces/odbc/execute.c +++ b/src/interfaces/odbc/execute.c @@ -39,7 +39,7 @@ extern GLOBAL_VALUES globals; /* Perform a Prepare on the SQL statement */ -RETCODE SQL_API +RETCODE SQL_API SQLPrepare(HSTMT hstmt, UCHAR FAR *szSqlStr, SDWORD cbSqlStr) @@ -133,7 +133,7 @@ SQLPrepare(HSTMT hstmt, /* Performs the equivalent of SQLPrepare, followed by SQLExecute. */ -RETCODE SQL_API +RETCODE SQL_API SQLExecDirect( HSTMT hstmt, UCHAR FAR *szSqlStr, @@ -195,7 +195,7 @@ SQLExecDirect( } /* Execute a prepared SQL statement */ -RETCODE SQL_API +RETCODE SQL_API SQLExecute( HSTMT hstmt) { @@ -326,7 +326,7 @@ SQLExecute( /* - - - - - - - - - */ -RETCODE SQL_API +RETCODE SQL_API SQLTransact( HENV henv, HDBC hdbc, @@ -408,7 +408,7 @@ SQLTransact( /* - - - - - - - - - */ -RETCODE SQL_API +RETCODE SQL_API SQLCancel( HSTMT hstmt) /* Statement to cancel. */ { @@ -486,7 +486,7 @@ SQLCancel( /* Returns the SQL string as modified by the driver. */ /* Currently, just copy the input string without modification */ /* observing buffer limits and truncation. */ -RETCODE SQL_API +RETCODE SQL_API SQLNativeSql( HDBC hdbc, UCHAR FAR *szSqlStrIn, @@ -540,7 +540,7 @@ SQLNativeSql( /* Supplies parameter data at execution time. Used in conjuction with */ /* SQLPutData. */ -RETCODE SQL_API +RETCODE SQL_API SQLParamData( HSTMT hstmt, PTR FAR *prgbValue) @@ -651,7 +651,7 @@ SQLParamData( /* Supplies parameter data at execution time. Used in conjunction with */ /* SQLParamData. */ -RETCODE SQL_API +RETCODE SQL_API SQLPutData( HSTMT hstmt, PTR rgbValue, diff --git a/src/interfaces/odbc/gpps.h b/src/interfaces/odbc/gpps.h index 95d559ff9b..5059866e72 100644 --- a/src/interfaces/odbc/gpps.h +++ b/src/interfaces/odbc/gpps.h @@ -17,24 +17,22 @@ extern "C" { #endif - DWORD - GetPrivateProfileString(char *theSection, /* section name */ - char *theKey, /* search key name */ - char *theDefault, /* default value if not - * found */ - char *theReturnBuffer, /* return valuse stored - * here */ - size_t theBufferLength, /* byte length of return - * buffer */ - char *theIniFileName); /* pathname of ini file - * to search */ - - DWORD - WritePrivateProfileString(char *theSection, /* section name */ - char *theKey, /* write key name */ - char *theBuffer, /* input buffer */ - char *theIniFileName); /* pathname of ini file - * to write */ +DWORD GetPrivateProfileString(char *theSection, /* section name */ + char *theKey, /* search key name */ + char *theDefault, /* default value if not + * found */ + char *theReturnBuffer, /* return valuse stored + * here */ + size_t theBufferLength, /* byte length of return + * buffer */ + char *theIniFileName); /* pathname of ini file + * to search */ + +DWORD WritePrivateProfileString(char *theSection, /* section name */ + char *theKey, /* write key name */ + char *theBuffer, /* input buffer */ + char *theIniFileName); /* pathname of ini file + * to write */ #ifdef __cplusplus } diff --git a/src/interfaces/odbc/info.c b/src/interfaces/odbc/info.c index 8a75fdac64..884ee4afcd 100644 --- a/src/interfaces/odbc/info.c +++ b/src/interfaces/odbc/info.c @@ -58,7 +58,7 @@ extern GLOBAL_VALUES globals; /* - - - - - - - - - */ -RETCODE SQL_API +RETCODE SQL_API SQLGetInfo( HDBC hdbc, UWORD fInfoType, @@ -713,7 +713,7 @@ SQLGetInfo( /* - - - - - - - - - */ -RETCODE SQL_API +RETCODE SQL_API SQLGetTypeInfo( HSTMT hstmt, SWORD fSqlType) @@ -810,7 +810,7 @@ SQLGetTypeInfo( /* - - - - - - - - - */ -RETCODE SQL_API +RETCODE SQL_API SQLGetFunctions( HDBC hdbc, UWORD fFunction, @@ -1094,7 +1094,7 @@ SQLGetFunctions( -RETCODE SQL_API +RETCODE SQL_API SQLTables( HSTMT hstmt, UCHAR FAR *szTableQualifier, @@ -1419,7 +1419,7 @@ SQLTables( -RETCODE SQL_API +RETCODE SQL_API SQLColumns( HSTMT hstmt, UCHAR FAR *szTableQualifier, @@ -1855,7 +1855,7 @@ SQLColumns( return SQL_SUCCESS; } -RETCODE SQL_API +RETCODE SQL_API SQLSpecialColumns( HSTMT hstmt, UWORD fColType, @@ -2004,7 +2004,7 @@ SQLSpecialColumns( return SQL_SUCCESS; } -RETCODE SQL_API +RETCODE SQL_API SQLStatistics( HSTMT hstmt, UCHAR FAR *szTableQualifier, @@ -2393,7 +2393,7 @@ SEEYA: return SQL_SUCCESS; } -RETCODE SQL_API +RETCODE SQL_API SQLColumnPrivileges( HSTMT hstmt, UCHAR FAR *szTableQualifier, @@ -2419,7 +2419,7 @@ SQLColumnPrivileges( /* SQLPrimaryKeys() * Retrieve the primary key columns for the specified table. */ -RETCODE SQL_API +RETCODE SQL_API SQLPrimaryKeys( HSTMT hstmt, UCHAR FAR *szTableQualifier, @@ -2595,7 +2595,7 @@ SQLPrimaryKeys( return SQL_SUCCESS; } -RETCODE SQL_API +RETCODE SQL_API SQLForeignKeys( HSTMT hstmt, UCHAR FAR *szPkTableQualifier, @@ -3259,7 +3259,7 @@ SQLForeignKeys( -RETCODE SQL_API +RETCODE SQL_API SQLProcedureColumns( HSTMT hstmt, UCHAR FAR *szProcQualifier, @@ -3279,7 +3279,7 @@ SQLProcedureColumns( return SQL_ERROR; } -RETCODE SQL_API +RETCODE SQL_API SQLProcedures( HSTMT hstmt, UCHAR FAR *szProcQualifier, @@ -3297,7 +3297,7 @@ SQLProcedures( return SQL_ERROR; } -RETCODE SQL_API +RETCODE SQL_API SQLTablePrivileges( HSTMT hstmt, UCHAR FAR *szTableQualifier, diff --git a/src/interfaces/odbc/iodbc.h b/src/interfaces/odbc/iodbc.h index ef3df399a6..3dccf89a66 100644 --- a/src/interfaces/odbc/iodbc.h +++ b/src/interfaces/odbc/iodbc.h @@ -51,15 +51,15 @@ typedef int BOOL; #define MEM_FREE(ptr) ((ptr)? farfree((void far*)(ptr)):0) #define STRCPY(t, s) (_fstrcpy((char FAR*)(t), (char FAR*)(s))) #define STRNCPY(t,s,n) (_fstrncpy((char FAR*)(t), (char FAR*)(s), (size_t)(n))) -#define STRLEN(str) ((str)? _fstrlen((char FAR*)(str)):0) -#define STREQ(a, b) (_fstrcmp((char FAR*)(a), (char FAR*)(b) == 0) +#define STRLEN(str) ((str)? _fstrlen((char FAR*)(str)):0) +#define STREQ(a, b) (_fstrcmp((char FAR*)(a), (char FAR*)(b) == 0) #endif #endif /* WIN32 */ -#define SYSERR (-1) +#define SYSERR (-1) -#ifndef NULL +#ifndef NULL #define NULL ((void FAR*)0UL) #endif diff --git a/src/interfaces/odbc/isql.h b/src/interfaces/odbc/isql.h index 5e62563e29..72b58a3d3f 100644 --- a/src/interfaces/odbc/isql.h +++ b/src/interfaces/odbc/isql.h @@ -24,72 +24,72 @@ typedef signed short RETCODE; #define SQL_API EXPORT CALLBACK #endif -#define ODBCVER 0x0250 +#define ODBCVER 0x0250 -#define SQL_MAX_MESSAGE_LENGTH 512 -#define SQL_MAX_DSN_LENGTH 32 +#define SQL_MAX_MESSAGE_LENGTH 512 +#define SQL_MAX_DSN_LENGTH 32 /* return code */ -#define SQL_INVALID_HANDLE (-2) -#define SQL_ERROR (-1) -#define SQL_SUCCESS 0 +#define SQL_INVALID_HANDLE (-2) +#define SQL_ERROR (-1) +#define SQL_SUCCESS 0 #define SQL_SUCCESS_WITH_INFO 1 -#define SQL_NO_DATA_FOUND 100 +#define SQL_NO_DATA_FOUND 100 /* standard SQL datatypes (agree with ANSI type numbering) */ -#define SQL_CHAR 1 -#define SQL_NUMERIC 2 -#define SQL_DECIMAL 3 -#define SQL_INTEGER 4 -#define SQL_SMALLINT 5 -#define SQL_FLOAT 6 -#define SQL_REAL 7 -#define SQL_DOUBLE 8 -#define SQL_VARCHAR 12 - -#define SQL_TYPE_MIN SQL_CHAR -#define SQL_TYPE_NULL 0 -#define SQL_TYPE_MAX SQL_VARCHAR +#define SQL_CHAR 1 +#define SQL_NUMERIC 2 +#define SQL_DECIMAL 3 +#define SQL_INTEGER 4 +#define SQL_SMALLINT 5 +#define SQL_FLOAT 6 +#define SQL_REAL 7 +#define SQL_DOUBLE 8 +#define SQL_VARCHAR 12 + +#define SQL_TYPE_MIN SQL_CHAR +#define SQL_TYPE_NUL 0 +#define SQL_TYPE_MAX SQL_VARCHAR /* C to SQL datatype mapping */ -#define SQL_C_CHAR SQL_CHAR -#define SQL_C_LONG SQL_INTEGER -#define SQL_C_SHORT SQL_SMALLINT -#define SQL_C_FLOAT SQL_REAL -#define SQL_C_DOUBLE SQL_DOUBLE -#define SQL_C_DEFAULT 99 +#define SQL_C_CHAR SQL_CHAR +#define SQL_C_LONG SQL_INTEGER +#define SQL_C_SHORT SQL_SMALLINT +#define SQL_C_FLOAT SQL_REAL +#define SQL_C_DOUBLE SQL_DOUBLE +#define SQL_C_DEFAULT 99 -#define SQL_NO_NULLS 0 -#define SQL_NULLABLE 1 -#define SQL_NULLABLE_UNKNOWN 2 +#define SQL_NO_NULLS 0 +#define SQL_NULLABLE 1 +#define SQL_NULLABLE_UNKNOWN 2 /* some special length values */ -#define SQL_NULL_DATA (-1) -#define SQL_DATA_AT_EXEC (-2) -#define SQL_NTS (-3) +#define SQL_NULL_DATA (-1) +#define SQL_DATA_AT_EXEC (-2) +#define SQL_NTS (-3) /* SQLFreeStmt flag values */ -#define SQL_CLOSE 0 -#define SQL_DROP 1 -#define SQL_UNBIND 2 -#define SQL_RESET_PARAMS 3 +#define SQL_CLOSE 0 +#define SQL_DROP 1 +#define SQL_UNBIND 2 +#define SQL_RESET_PARAMS 3 /* SQLTransact flag values */ -#define SQL_COMMIT 0 -#define SQL_ROLLBACK 1 +#define SQL_COMMIT 0 +#define SQL_ROLLBACK 1 /* SQLColAttributes flag values */ -#define SQL_COLUMN_COUNT 0 -#define SQL_COLUMN_LABEL 18 -#define SQL_COLATT_OPT_MAX SQL_COLUMN_LABEL +#define SQL_COLUMN_COUNT 0 +#define SQL_COLUMN_LABEL 18 +#define SQL_COLATT_OPT_MAX SQL_COLUMN_LABEL #define SQL_COLUMN_DRIVER_START 1000 -#define SQL_COLATT_OPT_MIN SQL_COLUMN_COUNT +#define SQL_COLATT_OPT_MIN SQL_COLUMN_COUNT /* Null handles */ -#define SQL_NULL_HENV 0 -#define SQL_NULL_HDBC 0 -#define SQL_NULL_HSTMT 0 +#define SQL_NULL_HENV 0 +#define SQL_NULL_HDBC 0 +#define SQL_NULL_HSTMT 0 /* All code below has been added to the original isql.h coming from iodbc */ typedef unsigned char BYTE; @@ -98,13 +98,13 @@ typedef unsigned char BYTE; #define SQL_COLUMN_NAME 1 #define SQL_COLUMN_TYPE 2 #define SQL_COLUMN_LENGTH 3 -#define SQL_COLUMN_PRECISION 4 +#define SQL_COLUMN_PRECISION 4 #define SQL_COLUMN_SCALE 5 -#define SQL_COLUMN_DISPLAY_SIZE 6 +#define SQL_COLUMN_DISPLAY_SIZE 6 #define SQL_COLUMN_NULLABLE 7 #define SQL_COLUMN_UNSIGNED 8 #define SQL_COLUMN_MONEY 9 -#define SQL_COLUMN_UPDATABLE 10 +#define SQL_COLUMN_UPDATABLE 10 #define SQL_COLUMN_AUTO_INCREMENT 11 #define SQL_COLUMN_CASE_SENSITIVE 12 #define SQL_COLUMN_SEARCHABLE 13 @@ -114,11 +114,11 @@ typedef unsigned char BYTE; #define SQL_COLUMN_QUALIFIER_NAME 17 /* SQLColAttributes Searchable flags */ -#define SQL_UNSEARCHABLE 0 -#define SQL_LIKE_ONLY 1 -#define SQL_ALL_EXCEPT_LIKE 2 -#define SQL_SEARCHABLE 3 -#define SQL_PRED_SEARCHABLE SQL_SEARCHABLE +#define SQL_UNSEARCHABLE 0 +#define SQL_LIKE_ONLY 1 +#define SQL_ALL_EXCEPT_LIKE 2 +#define SQL_SEARCHABLE 3 +#define SQL_PRED_SEARCHABLE SQL_SEARCHABLE /* SQLColAttributes Updateable flags */ #define SQL_ATTR_READONLY 0 diff --git a/src/interfaces/odbc/isqlext.h b/src/interfaces/odbc/isqlext.h index fd8e39385f..2d85120a29 100644 --- a/src/interfaces/odbc/isqlext.h +++ b/src/interfaces/odbc/isqlext.h @@ -7,230 +7,230 @@ #include "isql.h" -#define SQL_STILL_EXECUTING 2 -#define SQL_NEED_DATA 99 +#define SQL_STILL_EXECUTING 2 +#define SQL_NEED_DATA 99 /* extend SQL datatypes */ -#define SQL_DATE 9 -#define SQL_TIME 10 -#define SQL_TIMESTAMP 11 -#define SQL_LONGVARCHAR (-1) -#define SQL_BINARY (-2) -#define SQL_VARBINARY (-3) -#define SQL_LONGVARBINARY (-4) -#define SQL_BIGINT (-5) -#define SQL_TINYINT (-6) -#define SQL_BIT (-7) /* conflict with SQL3 ??? */ +#define SQL_DATE 9 +#define SQL_TIME 10 +#define SQL_TIMESTAMP 11 +#define SQL_LONGVARCHAR (-1) +#define SQL_BINARY (-2) +#define SQL_VARBINARY (-3) +#define SQL_LONGVARBINARY (-4) +#define SQL_BIGINT (-5) +#define SQL_TINYINT (-6) +#define SQL_BIT (-7) /* conflict with SQL3 ??? */ #define SQL_TYPE_DRIVER_START (-80) /* C to SQL datatype mapping */ -#define SQL_C_DATE SQL_DATE -#define SQL_C_TIME SQL_TIME -#define SQL_C_TIMESTAMP SQL_TIMESTAMP -#define SQL_C_BINARY SQL_BINARY -#define SQL_C_BIT SQL_BIT -#define SQL_C_TINYINT SQL_TINYINT - -#define SQL_SIGNED_OFFSET (-20) -#define SQL_UNSIGNED_OFFSET (-22) - -#define SQL_C_SLONG (SQL_C_LONG + SQL_SIGNED_OFFSET) -#define SQL_C_SSHORT (SQL_C_SHORT + SQL_SIGNED_OFFSET) -#define SQL_C_STINYINT (SQL_TINYINT + SQL_SIGNED_OFFSET) -#define SQL_C_ULONG (SQL_C_LONG + SQL_UNSIGNED_OFFSET) -#define SQL_C_USHORT (SQL_C_SHORT + SQL_UNSIGNED_OFFSET) -#define SQL_C_UTINYINT (SQL_TINYINT + SQL_UNSIGNED_OFFSET) -#define SQL_C_BOOKMARK SQL_C_ULONG +#define SQL_C_DATE SQL_DATE +#define SQL_C_TIME SQL_TIME +#define SQL_C_TIMESTAMP SQL_TIMESTAMP +#define SQL_C_BINARY SQL_BINARY +#define SQL_C_BIT SQL_BIT +#define SQL_C_TINYINT SQL_TINYINT + +#define SQL_SIGNED_OFFSET (-20) +#define SQL_UNSIGNED_OFFSET (-22) + +#define SQL_C_SLONG (SQL_C_LONG + SQL_SIGNED_OFFSET) +#define SQL_C_SSHORT (SQL_C_SHORT + SQL_SIGNED_OFFSET) +#define SQL_C_STINYINT (SQL_TINYINT + SQL_SIGNED_OFFSET) +#define SQL_C_ULONG (SQL_C_LONG + SQL_UNSIGNED_OFFSET) +#define SQL_C_USHORT (SQL_C_SHORT + SQL_UNSIGNED_OFFSET) +#define SQL_C_UTINYINT (SQL_TINYINT + SQL_UNSIGNED_OFFSET) +#define SQL_C_BOOKMARK SQL_C_ULONG #if defined(SQL_TYPE_MIN) #undef SQL_TYPE_MIN -#define SQL_TYPE_MIN SQL_BIT +#define SQL_TYPE_MIN SQL_BIT /* Note:If SQL_BIT uses SQL3 value (i.e. 14) then, * SQL_TYPE_MIN need to be defined as SQL_TINYINT * (i.e. -6). */ #endif -#define SQL_ALL_TYPES 0 +#define SQL_ALL_TYPES 0 /* SQLDriverConnect flag values */ -#define SQL_DRIVER_NOPROMPT 0 -#define SQL_DRIVER_COMPLETE 1 -#define SQL_DRIVER_PROMPT 2 +#define SQL_DRIVER_NOPROMPT 0 +#define SQL_DRIVER_COMPLETE 1 +#define SQL_DRIVER_PROMPT 2 #define SQL_DRIVER_COMPLETE_REQUIRED 3 /* SQLSetParam extensions */ -#define SQL_DEFAULT_PARAM (-5) -#define SQL_IGNORE (-6) +#define SQL_DEFAULT_PARAM (-5) +#define SQL_IGNORE (-6) /* function number for SQLGetFunctions and _iodbcdm_getproc */ -#define SQL_API_SQLALLOCCONNECT 1 -#define SQL_API_SQLALLOCENV 2 -#define SQL_API_SQLALLOCSTMT 3 -#define SQL_API_SQLBINDCOL 4 -#define SQL_API_SQLCANCEL 5 -#define SQL_API_SQLCOLATTRIBUTES 6 -#define SQL_API_SQLCONNECT 7 -#define SQL_API_SQLDESCRIBECOL 8 -#define SQL_API_SQLDISCONNECT 9 -#define SQL_API_SQLERROR 10 -#define SQL_API_SQLEXECDIRECT 11 -#define SQL_API_SQLEXECUTE 12 -#define SQL_API_SQLFETCH 13 -#define SQL_API_SQLFREECONNECT 14 -#define SQL_API_SQLFREEENV 15 -#define SQL_API_SQLFREESTMT 16 -#define SQL_API_SQLGETCURSORNAME 17 -#define SQL_API_SQLNUMRESULTCOLS 18 -#define SQL_API_SQLPREPARE 19 -#define SQL_API_SQLROWCOUNT 20 -#define SQL_API_SQLSETCURSORNAME 21 -#define SQL_API_SQLSETPARAM 22 -#define SQL_API_SQLTRANSACT 23 - -#define SQL_NUM_FUNCTIONS 23 - -#define SQL_EXT_API_START 40 - -#define SQL_API_SQLCOLUMNS 40 - -#define SQL_API_SQLDRIVERCONNECT 41 -#define SQL_API_SQLGETCONNECTOPTION 42 -#define SQL_API_SQLGETDATA 43 -#define SQL_API_SQLGETFUNCTIONS 44 -#define SQL_API_SQLGETINFO 45 -#define SQL_API_SQLGETSTMTOPTION 46 -#define SQL_API_SQLGETTYPEINFO 47 -#define SQL_API_SQLPARAMDATA 48 -#define SQL_API_SQLPUTDATA 49 -#define SQL_API_SQLSETCONNECTOPTION 50 -#define SQL_API_SQLSETSTMTOPTION 51 -#define SQL_API_SQLSPECIALCOLUMNS 52 -#define SQL_API_SQLSTATISTICS 53 -#define SQL_API_SQLTABLES 54 - -#define SQL_API_SQLBROWSECONNECT 55 -#define SQL_API_SQLCOLUMNPRIVILEGES 56 -#define SQL_API_SQLDATASOURCES 57 -#define SQL_API_SQLDESCRIBEPARAM 58 -#define SQL_API_SQLEXTENDEDFETCH 59 -#define SQL_API_SQLFOREIGNKEYS 60 -#define SQL_API_SQLMORERESULTS 61 -#define SQL_API_SQLNATIVESQL 62 -#define SQL_API_SQLNUMPARAMS 63 -#define SQL_API_SQLPARAMOPTIONS 64 -#define SQL_API_SQLPRIMARYKEYS 65 -#define SQL_API_SQLPROCEDURECOLUMNS 66 -#define SQL_API_SQLPROCEDURES 67 -#define SQL_API_SQLSETPOS 68 -#define SQL_API_SQLSETSCROLLOPTIONS 69 -#define SQL_API_SQLTABLEPRIVILEGES 70 - -#define SQL_API_SQLDRIVERS 71 -#define SQL_API_SQLBINDPARAMETER 72 +#define SQL_API_SQLALLOCCONNECT 1 +#define SQL_API_SQLALLOCENV 2 +#define SQL_API_SQLALLOCSTMT 3 +#define SQL_API_SQLBINDCOL 4 +#define SQL_API_SQLCANCEL 5 +#define SQL_API_SQLCOLATTRIBUTES 6 +#define SQL_API_SQLCONNECT 7 +#define SQL_API_SQLDESCRIBECOL 8 +#define SQL_API_SQLDISCONNECT 9 +#define SQL_API_SQLERROR 10 +#define SQL_API_SQLEXECDIRECT 11 +#define SQL_API_SQLEXECUTE 12 +#define SQL_API_SQLFETCH 13 +#define SQL_API_SQLFREECONNECT 14 +#define SQL_API_SQLFREEENV 15 +#define SQL_API_SQLFREESTMT 16 +#define SQL_API_SQLGETCURSORNAME 17 +#define SQL_API_SQLNUMRESULTCOLS 18 +#define SQL_API_SQLPREPARE 19 +#define SQL_API_SQLROWCOUNT 20 +#define SQL_API_SQLSETCURSORNAME 21 +#define SQL_API_SQLSETPARAM 22 +#define SQL_API_SQLTRANSACT 23 + +#define SQL_NUM_FUNCTIONS 23 + +#define SQL_EXT_API_START 40 + +#define SQL_API_SQLCOLUMNS 40 + +#define SQL_API_SQLDRIVERCONNECT 41 +#define SQL_API_SQLGETCONNECTOPTION 42 +#define SQL_API_SQLGETDATA 43 +#define SQL_API_SQLGETFUNCTIONS 44 +#define SQL_API_SQLGETINFO 45 +#define SQL_API_SQLGETSTMTOPTION 46 +#define SQL_API_SQLGETTYPEINFO 47 +#define SQL_API_SQLPARAMDATA 48 +#define SQL_API_SQLPUTDATA 49 +#define SQL_API_SQLSETCONNECTOPTION 50 +#define SQL_API_SQLSETSTMTOPTION 51 +#define SQL_API_SQLSPECIALCOLUMNS 52 +#define SQL_API_SQLSTATISTICS 53 +#define SQL_API_SQLTABLES 54 + +#define SQL_API_SQLBROWSECONNECT 55 +#define SQL_API_SQLCOLUMNPRIVILEGES 56 +#define SQL_API_SQLDATASOURCES 57 +#define SQL_API_SQLDESCRIBEPARAM 58 +#define SQL_API_SQLEXTENDEDFETCH 59 +#define SQL_API_SQLFOREIGNKEYS 60 +#define SQL_API_SQLMORERESULTS 61 +#define SQL_API_SQLNATIVESQL 62 +#define SQL_API_SQLNUMPARAMS 63 +#define SQL_API_SQLPARAMOPTIONS 64 +#define SQL_API_SQLPRIMARYKEYS 65 +#define SQL_API_SQLPROCEDURECOLUMNS 66 +#define SQL_API_SQLPROCEDURES 67 +#define SQL_API_SQLSETPOS 68 +#define SQL_API_SQLSETSCROLLOPTIONS 69 +#define SQL_API_SQLTABLEPRIVILEGES 70 + +#define SQL_API_SQLDRIVERS 71 +#define SQL_API_SQLBINDPARAMETER 72 #define SQL_EXT_API_LAST SQL_API_SQLBINDPARAMETER #define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST - SQL_EXT_API_START + 1) -#define SQL_API_ALL_FUNCTIONS 0 +#define SQL_API_ALL_FUNCTIONS 0 /* SQLGetInfo infor number */ -#define SQL_INFO_FIRST 0 -#define SQL_DRIVER_HDBC 3 -#define SQL_DRIVER_HENV 4 -#define SQL_DRIVER_HSTMT 5 -#define SQL_DRIVER_NAME 6 -#define SQL_ODBC_VER 10 -#define SQL_CURSOR_COMMIT_BEHAVIOR 23 -#define SQL_CURSOR_ROLLBACK_BEHAVIOR 24 -#define SQL_DEFAULT_TXN_ISOLATION 26 +#define SQL_INFO_FIRST 0 +#define SQL_DRIVER_HDBC 3 +#define SQL_DRIVER_HENV 4 +#define SQL_DRIVER_HSTMT 5 +#define SQL_DRIVER_NAME 6 +#define SQL_ODBC_VER 10 +#define SQL_CURSOR_COMMIT_BEHAVIOR 23 +#define SQL_CURSOR_ROLLBACK_BEHAVIOR 24 +#define SQL_DEFAULT_TXN_ISOLATION 26 -#define SQL_TXN_ISOLATION_OPTION 72 -#define SQL_NON_NULLABLE_COLUMNS 75 +#define SQL_TXN_ISOLATION_OPTION 72 +#define SQL_NON_NULLABLE_COLUMNS 75 -#define SQL_DRIVER_HLIB 76 -#define SQL_DRIVER_ODBC_VER 77 +#define SQL_DRIVER_HLIB 76 +#define SQL_DRIVER_ODBC_VER 77 -#define SQL_QUALIFIER_LOCATION 114 +#define SQL_QUALIFIER_LOCATION 114 -#define SQL_INFO_LAST SQL_QUALIFIER_LOCATION - -#define SQL_INFO_DRIVER_START 1000 +#define SQL_INFO_LAST SQL_QUALIFIER_LOCATION + +#define SQL_INFO_DRIVER_START 1000 /* SQL_TXN_ISOLATION_OPTION masks */ -#define SQL_TXN_READ_UNCOMMITTED 0x00000001L -#define SQL_TXN_READ_COMMITTED 0x00000002L -#define SQL_TXN_REPEATABLE_READ 0x00000004L -#define SQL_TXN_SERIALIZABLE 0x00000008L -#define SQL_TXN_VERSIONING 0x00000010L +#define SQL_TXN_READ_UNCOMMITTED 0x00000001L +#define SQL_TXN_READ_COMMITTED 0x00000002L +#define SQL_TXN_REPEATABLE_READ 0x00000004L +#define SQL_TXN_SERIALIZABLE 0x00000008L +#define SQL_TXN_VERSIONING 0x00000010L /* SQL_CURSOR_COMMIT_BEHAVIOR and SQL_CURSOR_ROLLBACK_BEHAVIOR values */ -#define SQL_CB_DELETE 0x0000 -#define SQL_CB_CLOSE 0x0001 -#define SQL_CB_PRESERVE 0x0002 +#define SQL_CB_DELETE 0x0000 +#define SQL_CB_CLOSE 0x0001 +#define SQL_CB_PRESERVE 0x0002 /* options for SQLGetStmtOption/SQLSetStmtOption */ -#define SQL_QUERY_TIMEOUT 0 -#define SQL_MAX_ROWS 1 -#define SQL_NOSCAN 2 -#define SQL_MAX_LENGTH 3 -#define SQL_ASYNC_ENABLE 4 -#define SQL_BIND_TYPE 5 -#define SQL_CURSOR_TYPE 6 -#define SQL_CONCURRENCY 7 -#define SQL_KEYSET_SIZE 8 -#define SQL_ROWSET_SIZE 9 -#define SQL_SIMULATE_CURSOR 10 -#define SQL_RETRIEVE_DATA 11 -#define SQL_USE_BOOKMARKS 12 -#define SQL_GET_BOOKMARK 13 /* GetStmtOption Only */ -#define SQL_ROW_NUMBER 14 /* GetStmtOption Only */ -#define SQL_STMT_OPT_MAX SQL_ROW_NUMBER - -#define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT +#define SQL_QUERY_TIMEOUT 0 +#define SQL_MAX_ROWS 1 +#define SQL_NOSCAN 2 +#define SQL_MAX_LENGTH 3 +#define SQL_ASYNC_ENABLE 4 +#define SQL_BIND_TYPE 5 +#define SQL_CURSOR_TYPE 6 +#define SQL_CONCURRENCY 7 +#define SQL_KEYSET_SIZE 8 +#define SQL_ROWSET_SIZE 9 +#define SQL_SIMULATE_CURSOR 10 +#define SQL_RETRIEVE_DATA 11 +#define SQL_USE_BOOKMARKS 12 +#define SQL_GET_BOOKMARK 13 /* GetStmtOption Only */ +#define SQL_ROW_NUMBER 14 /* GetStmtOption Only */ +#define SQL_STMT_OPT_MAX SQL_ROW_NUMBER + +#define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT /* * ODBC 3.0 renames the above to SQL_ATTR_ values. At this time I don't * know if they have also been renumbered or not, I will assume not. */ -#define SQL_ATTR_QUERY_TIMEOUT 0 -#define SQL_ATTR_MAX_ROWS 1 -#define SQL_ATTR_NOSCAN 2 -#define SQL_ATTR_MAX_LENGTH 3 -#define SQL_ATTR_ASYNC_ENABLE 4 -#define SQL_ATTR_BIND_TYPE 5 -#define SQL_ATTR_CURSOR_TYPE 6 -#define SQL_ATTR_CONCURRENCY 7 -#define SQL_ATTR_KEYSET_SIZE 8 -#define SQL_ATTR_ROWSET_SIZE 9 -#define SQL_ATTR_SIMULATE_CURSOR 10 -#define SQL_ATTR_RETRIEVE_DATA 11 -#define SQL_ATTR_USE_BOOKMARKS 12 -#define SQL_ATTR_GET_BOOKMARK 13 /* GetStmtOption Only */ -#define SQL_ATTR_ROW_NUMBER 14 /* GetStmtOption Only */ +#define SQL_ATTR_QUERY_TIMEOUT 0 +#define SQL_ATTR_MAX_ROWS 1 +#define SQL_ATTR_NOSCAN 2 +#define SQL_ATTR_MAX_LENGTH 3 +#define SQL_ATTR_ASYNC_ENABLE 4 +#define SQL_ATTR_BIND_TYPE 5 +#define SQL_ATTR_CURSOR_TYPE 6 +#define SQL_ATTR_CONCURRENCY 7 +#define SQL_ATTR_KEYSET_SIZE 8 +#define SQL_ATTR_ROWSET_SIZE 9 +#define SQL_ATTR_SIMULATE_CURSOR 10 +#define SQL_ATTR_RETRIEVE_DATA 11 +#define SQL_ATTR_USE_BOOKMARKS 12 +#define SQL_ATTR_GET_BOOKMARK 13 /* GetStmtOption Only */ +#define SQL_ATTR_ROW_NUMBER 14 /* GetStmtOption Only */ /* New in ODBC 3.0 */ -#define SQL_ATTR_APP_PARAM_DESC 15 -#define SQL_ATTR_APP_ROW_DESC 16 -#define SQL_ATTR_CURSOR_SCROLLABLE 17 -#define SQL_ATTR_CURSOR_SENSITITY 18 -#define SQL_ATTR_ENABLE_AUTO_IPD 19 -#define SQL_ATTR_FETCH_BOOKMARK_PTR 20 -#define SQL_ATTR_IMP_PARAM_DESC 21 -#define SQL_ATTR_IMP_ROW_DESC 22 -#define SQL_ATTR_METADATA_ID 23 +#define SQL_ATTR_APP_PARAM_DESC 15 +#define SQL_ATTR_APP_ROW_DESC 16 +#define SQL_ATTR_CURSOR_SCROLLABLE 17 +#define SQL_ATTR_CURSOR_SENSITITY 18 +#define SQL_ATTR_ENABLE_AUTO_IPD 19 +#define SQL_ATTR_FETCH_BOOKMARK_PTR 20 +#define SQL_ATTR_IMP_PARAM_DESC 21 +#define SQL_ATTR_IMP_ROW_DESC 22 +#define SQL_ATTR_METADATA_ID 23 #define SQL_ATTR_PARAM_BIND_OFFSET_PTR 24 -#define SQL_ATTR_PARAM_BIND_TYPE 25 +#define SQL_ATTR_PARAM_BIND_TYPE 25 #define SQL_ATTR_PARAM_OPERATION_PTR 26 -#define SQL_ATTR_PARAM_STATUS_PTR 27 +#define SQL_ATTR_PARAM_STATUS_PTR 27 #define SQL_ATTR_PARAMS_PROCESSED_PTR 28 -#define SQL_ATTR_PARAMSET_SIZE 29 -#define SQL_ATTR_ROW_ARRAY_SIZE 30 +#define SQL_ATTR_PARAMSET_SIZE 29 +#define SQL_ATTR_ROW_ARRAY_SIZE 30 #define SQL_ATTR_ROW_BIND_OFFSET_PTR 31 -#define SQL_ATTR_ROW_OPERATION_PTR 32 -#define SQL_ATTR_ROW_STATUS_PTR 33 -#define SQL_ATTR_ROWS_FETCHED_PTR 34 +#define SQL_ATTR_ROW_OPERATION_PTR 32 +#define SQL_ATTR_ROW_STATUS_PTR 33 +#define SQL_ATTR_ROWS_FETCHED_PTR 34 #define SQL_STMT_ATTR_MIN SQL_ATTR_QUERY_TIMEOUT #define SQL_STMT_ATTR_MAX SQL_ATTR_ROWS_FETCHED_PTR @@ -245,96 +245,96 @@ #define SQL_MAX_LENGTH_DEFAULT 0UL /* SQL_CONCURRENCY options */ -#define SQL_CONCUR_READ_ONLY 1 -#define SQL_CONCUR_LOCK 2 -#define SQL_CONCUR_ROWVER 3 -#define SQL_CONCUR_VALUES 4 +#define SQL_CONCUR_READ_ONLY 1 +#define SQL_CONCUR_LOCK 2 +#define SQL_CONCUR_ROWVER 3 +#define SQL_CONCUR_VALUES 4 /* options for SQLSetConnectOption/SQLGetConnectOption */ -#define SQL_ACCESS_MODE 101 -#define SQL_AUTOCOMMIT 102 -#define SQL_LOGIN_TIMEOUT 103 -#define SQL_OPT_TRACE 104 -#define SQL_OPT_TRACEFILE 105 -#define SQL_TRANSLATE_DLL 106 -#define SQL_TRANSLATE_OPTION 107 -#define SQL_TXN_ISOLATION 108 -#define SQL_CURRENT_QUALIFIER 109 -#define SQL_ODBC_CURSORS 110 -#define SQL_QUIET_MODE 111 -#define SQL_PACKET_SIZE 112 -#define SQL_CONN_OPT_MAX SQL_PACKET_SIZE +#define SQL_ACCESS_MODE 101 +#define SQL_AUTOCOMMIT 102 +#define SQL_LOGIN_TIMEOUT 103 +#define SQL_OPT_TRACE 104 +#define SQL_OPT_TRACEFILE 105 +#define SQL_TRANSLATE_DLL 106 +#define SQL_TRANSLATE_OPTION 107 +#define SQL_TXN_ISOLATION 108 +#define SQL_CURRENT_QUALIFIER 109 +#define SQL_ODBC_CURSORS 110 +#define SQL_QUIET_MODE 111 +#define SQL_PACKET_SIZE 112 +#define SQL_CONN_OPT_MAX SQL_PACKET_SIZE #define SQL_CONNECT_OPT_DRVR_START 1000 -#define SQL_CONN_OPT_MIN SQL_ACCESS_MODE +#define SQL_CONN_OPT_MIN SQL_ACCESS_MODE /* SQL_ACCESS_MODE options */ -#define SQL_MODE_READ_WRITE 0UL -#define SQL_MODE_READ_ONLY 1UL -#define SQL_MODE_DEFAULT SQL_MODE_READ_WRITE +#define SQL_MODE_READ_WRITE 0UL +#define SQL_MODE_READ_ONLY 1UL +#define SQL_MODE_DEFAULT SQL_MODE_READ_WRITE /* SQL_AUTOCOMMIT options */ -#define SQL_AUTOCOMMIT_OFF 0UL -#define SQL_AUTOCOMMIT_ON 1UL -#define SQL_AUTOCOMMIT_DEFAULT SQL_AUTOCOMMIT_ON +#define SQL_AUTOCOMMIT_OFF 0UL +#define SQL_AUTOCOMMIT_ON 1UL +#define SQL_AUTOCOMMIT_DEFAULT SQL_AUTOCOMMIT_ON /* SQL_LOGIN_TIMEOUT options */ #define SQL_LOGIN_TIMEOUT_DEFAULT 15UL /* SQL_OPT_TRACE options */ -#define SQL_OPT_TRACE_OFF 0UL -#define SQL_OPT_TRACE_ON 1UL -#define SQL_OPT_TRACE_DEFAULT SQL_OPT_TRACE_OFF +#define SQL_OPT_TRACE_OFF 0UL +#define SQL_OPT_TRACE_ON 1UL +#define SQL_OPT_TRACE_DEFAULT SQL_OPT_TRACE_OFF #define SQL_OPT_TRACE_FILE_DEFAULT "odbc.log" /* SQL_ODBC_CURSORS options */ -#define SQL_CUR_USE_IF_NEEDED 0UL -#define SQL_CUR_USE_ODBC 1UL -#define SQL_CUR_USE_DRIVER 2UL -#define SQL_CUR_DEFAULT SQL_CUR_USE_DRIVER +#define SQL_CUR_USE_IF_NEEDED 0UL +#define SQL_CUR_USE_ODBC 1UL +#define SQL_CUR_USE_DRIVER 2UL +#define SQL_CUR_DEFAULT SQL_CUR_USE_DRIVER /* Column types and scopes in SQLSpecialColumns. */ -#define SQL_BEST_ROWID 1 -#define SQL_ROWVER 2 +#define SQL_BEST_ROWID 1 +#define SQL_ROWVER 2 -#define SQL_SCOPE_CURROW 0 -#define SQL_SCOPE_TRANSACTION 1 -#define SQL_SCOPE_SESSION 2 +#define SQL_SCOPE_CURROW 0 +#define SQL_SCOPE_TRANSACTION 1 +#define SQL_SCOPE_SESSION 2 /* SQLExtendedFetch flag values */ -#define SQL_FETCH_NEXT 1 -#define SQL_FETCH_FIRST 2 -#define SQL_FETCH_LAST 3 -#define SQL_FETCH_PRIOR 4 -#define SQL_FETCH_ABSOLUTE 5 -#define SQL_FETCH_RELATIVE 6 -#define SQL_FETCH_BOOKMARK 8 +#define SQL_FETCH_NEXT 1 +#define SQL_FETCH_FIRST 2 +#define SQL_FETCH_LAST 3 +#define SQL_FETCH_PRIOR 4 +#define SQL_FETCH_ABSOLUTE 5 +#define SQL_FETCH_RELATIVE 6 +#define SQL_FETCH_BOOKMARK 8 /* Defines for SQLBindParameter/SQLProcedureColumns */ -#define SQL_PARAM_TYPE_UNKNOWN 0 +#define SQL_PARAM_TYPE_UNKNOWN 0 #define SQL_PARAM_INPUT 1 -#define SQL_PARAM_INPUT_OUTPUT 2 +#define SQL_PARAM_INPUT_OUTPUT 2 #define SQL_RESULT_COL 3 #define SQL_PARAM_OUTPUT 4 #define SQL_RETURN_VALUE 5 /* Defines used by Driver Manager for mapping SQLSetParam to SQLBindParameter */ -#define SQL_PARAM_TYPE_DEFAULT SQL_PARAM_INPUT_OUTPUT -#define SQL_SETPARAM_VALUE_MAX (-1L) +#define SQL_PARAM_TYPE_DEFAULT SQL_PARAM_INPUT_OUTPUT +#define SQL_SETPARAM_VALUE_MAX (-1L) /* SQLStatistics flag values */ -#define SQL_INDEX_UNIQUE 0 -#define SQL_INDEX_ALL 1 +#define SQL_INDEX_UNIQUE 0 +#define SQL_INDEX_ALL 1 -#define SQL_QUICK 0 -#define SQL_ENSURE 1 +#define SQL_QUICK 0 +#define SQL_ENSURE 1 /* SQLSetScrollOption flag values */ -#define SQL_SCROLL_FORWARD_ONLY 0L -#define SQL_SCROLL_KEYSET_DRIVEN (-1L) -#define SQL_SCROLL_DYNAMIC (-2L) -#define SQL_SCROLL_STATIC (-3L) +#define SQL_SCROLL_FORWARD_ONLY 0L +#define SQL_SCROLL_KEYSET_DRIVEN (-1L) +#define SQL_SCROLL_DYNAMIC (-2L) +#define SQL_SCROLL_STATIC (-3L) /* Everything below has been added to the original isqlext.h that comes * with iodbc. @@ -496,13 +496,13 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_CODE_HOUR_TO_SECOND #define SQL_CODE_MINUTE_TO_SECOND */ -#define SQL_INTERVAL_YEAR (-80) -#define SQL_INTERVAL_MONTH (-81) +#define SQL_INTERVAL_YEAR (-80) +#define SQL_INTERVAL_MONTH (-81) #define SQL_INTERVAL_YEAR_TO_MONTH (-82) -#define SQL_INTERVAL_DAY (-83) -#define SQL_INTERVAL_HOUR (-84) -#define SQL_INTERVAL_MINUTE (-85) -#define SQL_INTERVAL_SECOND (-86) +#define SQL_INTERVAL_DAY (-83) +#define SQL_INTERVAL_HOUR (-84) +#define SQL_INTERVAL_MINUTE (-85) +#define SQL_INTERVAL_SECOND (-86) #define SQL_INTERVAL_DAY_TO_HOUR (-87) #define SQL_INTERVAL_DAY_TO_MINUTE (-88) #define SQL_INTERVAL_DAY_TO_SECOND (-89) @@ -510,10 +510,10 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_INTERVAL_HOUR_TO_SECOND (-91) #define SQL_INTERVAL_MINUTE_TO_SECOND (-92) -#define SQL_UNICODE (-95) -#define SQL_UNICODE_VARCHAR (-96) +#define SQL_UNICODE (-95) +#define SQL_UNICODE_VARCHAR (-96) #define SQL_UNICODE_LONGVARCHAR (-97) -#define SQL_UNICODE_CHAR SQL_UNICODE +#define SQL_UNICODE_CHAR SQL_UNICODE /* C to SQL data types */ /* @@ -522,23 +522,23 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_C_TYPE_TIMESTAMP SQL_TYPE_TIMESTAMP #define SQL_C_GUID SQLGUID */ -#define SQL_C_INTERVAL_MONTH SQL_INTERVAL_MONTH -#define SQL_C_INTERVAL_YEAR SQL_INTERVAL_YEAR +#define SQL_C_INTERVAL_MONTH SQL_INTERVAL_MONTH +#define SQL_C_INTERVAL_YEAR SQL_INTERVAL_YEAR #define SQL_C_INTERVAL_YEAR_TO_MONTH SQL_INTERVAL_YEAR_TO_MONTH -#define SQL_C_INTERVAL_DAY SQL_INTERVAL_DAY -#define SQL_C_INTERVAL_HOUR SQL_INTERVAL_HOUR -#define SQL_C_INTERVAL_MINUTE SQL_INTERVAL_MINUTE -#define SQL_C_INTERVAL_SECOND SQL_INTERVAL_SECOND -#define SQL_C_INTERVAL_DAY_TO_HOUR SQL_INTERVAL_DAY_TO_HOUR +#define SQL_C_INTERVAL_DAY SQL_INTERVAL_DAY +#define SQL_C_INTERVAL_HOUR SQL_INTERVAL_HOUR +#define SQL_C_INTERVAL_MINUTE SQL_INTERVAL_MINUTE +#define SQL_C_INTERVAL_SECOND SQL_INTERVAL_SECOND +#define SQL_C_INTERVAL_DAY_TO_HOUR SQL_INTERVAL_DAY_TO_HOUR #define SQL_C_INTERVAL_DAY_TO_MINUTE SQL_INTERVAL_DAY_TO_MINUTE #define SQL_C_INTERVAL_DAY_TO_SECOND SQL_INTERVAL_DAY_TO_SECOND #define SQL_C_INTERVAL_HOUR_TO_MINUTE SQL_INTERVAL_HOUR_TO_MINUTE #define SQL_C_INTERVAL_HOUR_TO_SECOND SQL_INTERVAL_HOUR_TO_SECOND #define SQL_C_INTERVAL_MINUTE_TO_SECOND SQL_INTERVAL_MINUTE_TO_SECOND -#define SQL_C_NUMERIC SQL_NUMERIC -#define SQL_C_VARBOOKMARK SQL_C_BINARY -#define SQL_C_SBIGINT (SQL_BIGINT + SQL_SIGNED_OFFSET) -#define SQL_C_UBIGINT (SQL_BIGINT + SQL_UNSIGNED_OFFSET) +#define SQL_C_NUMERIC SQL_NUMERIC +#define SQL_C_VARBOOKMARK SQL_C_BINARY +#define SQL_C_SBIGINT (SQL_BIGINT + SQL_SIGNED_OFFSET) +#define SQL_C_UBIGINT (SQL_BIGINT + SQL_UNSIGNED_OFFSET) #define SQL_TRUE 1UL #define SQL_FALSE 0UL @@ -547,31 +547,31 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_NO_TOTAL (-4) /* SQLBindParameter */ -#define SQL_LEN_DATA_AT_EXEC_OFFSET (-100) +#define SQL_LEN_DATA_AT_EXEC_OFFSET (-100) #define SQL_LEN_DATA_AT_EXEC(length) (-length+SQL_LEN_DATA_AT_EXEC_OFFSET) -#define SQL_LEN_BINARY_ATTR_OFFSET (-100) -#define SQL_LEN_BINARY_ATTR(length) (-(length)+SQL_LEN_BINARY_ATTR_OFFSET) +#define SQL_LEN_BINARY_ATTR_OFFSET (-100) +#define SQL_LEN_BINARY_ATTR(length) (-(length)+SQL_LEN_BINARY_ATTR_OFFSET) /* SQLExtendedFetch - row status */ -#define SQL_ROW_SUCCESS 0 -#define SQL_ROW_DELETED 1 -#define SQL_ROW_UPDATED 2 -#define SQL_ROW_NOROW 3 -#define SQL_ROW_ADDED 4 -#define SQL_ROW_ERROR 5 +#define SQL_ROW_SUCCESS 0 +#define SQL_ROW_DELETED 1 +#define SQL_ROW_UPDATED 2 +#define SQL_ROW_NOROW 3 +#define SQL_ROW_ADDED 4 +#define SQL_ROW_ERROR 5 /* SQLForeignKeys - rule flags */ -#define SQL_CASCADE 0 -#define SQL_RESTRICT 1 -#define SQL_SET_NULL 2 -#define SQL_NO_ACTION 3 /* ODBC 3.0 */ -#define SQL_SET_DEFAULT 4 +#define SQL_CASCADE 0 +#define SQL_RESTRICT 1 +#define SQL_SET_NULL 2 +#define SQL_NO_ACTION 3 /* ODBC 3.0 */ +#define SQL_SET_DEFAULT 4 /* SQLForeignKeys - Deferrability (ODBC 3.0) */ #define SQL_INITIALLY_DEFERRED 5 #define SQL_INITIALLY_IMMEDIATE 6 -#define SQL_NOT_DEFFERABLE 2 +#define SQL_NOT_DEFFERABLE 2 /* Constants not in isqlext.h but needed by the driver. I have no idea * if these correspond correctly with those from Microsoft or not. I don't @@ -586,23 +586,23 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_ACTIVE_CONNECTIONS 0 #define SQL_ACTIVE_STATEMENTS 1 #define SQL_DATA_SOURCE_NAME 2 -#define SQL_DRIVER_VER 7 -#define SQL_FETCH_DIRECTION 8 +#define SQL_DRIVER_VER 7 +#define SQL_FETCH_DIRECTION 8 #define SQL_ODBC_API_CONFORMANCE 9 -#define SQL_ROW_UPDATES 11 -#define SQL_ODBC_SAG_CLI_CONFORMANCE 12 -#define SQL_SERVER_NAME 13 +#define SQL_ROW_UPDATES 11 +#define SQL_ODBC_SAG_CLI_CONFORMANCE 12 +#define SQL_SERVER_NAME 13 #define SQL_SEARCH_PATTERN_ESCAPE 14 #define SQL_ODBC_SQL_CONFORMANCE 15 -#define SQL_DBMS_NAME 17 -#define SQL_DBMS_VER 18 +#define SQL_DBMS_NAME 17 +#define SQL_DBMS_VER 18 #define SQL_ACCESSIBLE_TABLES 19 #define SQL_ACCESSIBLE_PROCEDURES 20 -#define SQL_PROCEDURES 21 +#define SQL_PROCEDURES 21 #define SQL_CONCAT_NULL_BEHAVIOR 22 #define SQL_DATA_SOURCE_READ_ONLY 25 #define SQL_EXPRESSIONS_IN_ORDERBY 27 -#define SQL_IDENTIFIER_CASE 28 +#define SQL_IDENTIFIER_CASE 28 #define SQL_IDENTIFIER_QUOTE_CHAR 29 #define SQL_MAX_COLUMN_NAME_LEN 30 #define SQL_MAX_CURSOR_NAME_LEN 31 @@ -612,69 +612,69 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_MAX_TABLE_NAME_LEN 35 #define SQL_MULT_RESULT_SETS 36 #define SQL_MULTIPLE_ACTIVE_TXN 37 -#define SQL_OUTER_JOINS 38 -#define SQL_OWNER_TERM 39 -#define SQL_PROCEDURE_TERM 40 -#define SQL_QUALIFIER_NAME_SEPARATOR 41 -#define SQL_QUALIFIER_TERM 42 +#define SQL_OUTER_JOINS 38 +#define SQL_OWNER_TERM 39 +#define SQL_PROCEDURE_TERM 40 +#define SQL_QUALIFIER_NAME_SEPARATOR 41 +#define SQL_QUALIFIER_TERM 42 #define SQL_SCROLL_CONCURRENCY 43 -#define SQL_SCROLL_OPTIONS 44 -#define SQL_TABLE_TERM 45 -#define SQL_TXN_CAPABLE 46 -#define SQL_USER_NAME 47 +#define SQL_SCROLL_OPTIONS 44 +#define SQL_TABLE_TERM 45 +#define SQL_TXN_CAPABLE 46 +#define SQL_USER_NAME 47 #define SQL_CONVERT_FUNCTIONS 48 #define SQL_NUMERIC_FUNCTIONS 49 #define SQL_STRING_FUNCTIONS 50 #define SQL_SYSTEM_FUNCTIONS 51 #define SQL_TIMEDATE_FUNCTIONS 52 -#define SQL_CONVERT_BIGINT 53 -#define SQL_CONVERT_BINARY 54 -#define SQL_CONVERT_BIT 55 -#define SQL_CONVERT_CHAR 56 -#define SQL_CONVERT_DATE 57 -#define SQL_CONVERT_DECIMAL 58 -#define SQL_CONVERT_DOUBLE 59 -#define SQL_CONVERT_FLOAT 60 -#define SQL_CONVERT_INTEGER 61 +#define SQL_CONVERT_BIGINT 53 +#define SQL_CONVERT_BINARY 54 +#define SQL_CONVERT_BIT 55 +#define SQL_CONVERT_CHAR 56 +#define SQL_CONVERT_DATE 57 +#define SQL_CONVERT_DECIMAL 58 +#define SQL_CONVERT_DOUBLE 59 +#define SQL_CONVERT_FLOAT 60 +#define SQL_CONVERT_INTEGER 61 #define SQL_CONVERT_LONGVARCHAR 62 -#define SQL_CONVERT_NUMERIC 63 -#define SQL_CONVERT_REAL 64 +#define SQL_CONVERT_NUMERIC 63 +#define SQL_CONVERT_REAL 64 #define SQL_CONVERT_SMALLINT 65 -#define SQL_CONVERT_TIME 66 +#define SQL_CONVERT_TIME 66 #define SQL_CONVERT_TIMESTAMP 67 -#define SQL_CONVERT_TINYINT 68 +#define SQL_CONVERT_TINYINT 68 #define SQL_CONVERT_VARBINARY 69 -#define SQL_CONVERT_VARCHAR 70 +#define SQL_CONVERT_VARCHAR 70 #define SQL_CONVERT_LONGVARBINARY 71 #define SQL_ODBC_SQL_OPT_IEF 73 #define SQL_CORRELATION_NAME 74 -#define SQL_LOCK_TYPES 78 -#define SQL_POS_OPERATIONS 79 +#define SQL_LOCK_TYPES 78 +#define SQL_POS_OPERATIONS 79 #define SQL_POSITIONED_STATEMENTS 80 #define SQL_GETDATA_EXTENSIONS 81 #define SQL_BOOKMARK_PERSISTENCE 82 #define SQL_STATIC_SENSITIVITY 83 -#define SQL_FILE_USAGE 84 -#define SQL_NULL_COLLATION 85 -#define SQL_ALTER_TABLE 86 -#define SQL_COLUMN_ALIAS 87 -#define SQL_GROUP_BY 88 -#define SQL_KEYWORDS 89 -#define SQL_ORDER_BY_COLUMNS_IN_SELECT 90 -#define SQL_OWNER_USAGE 91 -#define SQL_QUALIFIER_USAGE 92 +#define SQL_FILE_USAGE 84 +#define SQL_NULL_COLLATION 85 +#define SQL_ALTER_TABLE 86 +#define SQL_COLUMN_ALIAS 87 +#define SQL_GROUP_BY 88 +#define SQL_KEYWORDS 89 +#define SQL_ORDER_BY_COLUMNS_IN_SELECT 90 +#define SQL_OWNER_USAGE 91 +#define SQL_QUALIFIER_USAGE 92 #define SQL_QUOTED_IDENTIFIER_CASE 93 #define SQL_SPECIAL_CHARACTERS 94 -#define SQL_SUBQUERIES 95 -#define SQL_UNION 96 +#define SQL_SUBQUERIES 95 +#define SQL_UNION 96 #define SQL_MAX_COLUMNS_IN_GROUP_BY 97 #define SQL_MAX_COLUMNS_IN_INDEX 98 #define SQL_MAX_COLUMNS_IN_ORDER_BY 99 #define SQL_MAX_COLUMNS_IN_SELECT 100 #define SQL_MAX_COLUMNS_IN_TABLE 101 -#define SQL_MAX_INDEX_SIZE 102 -#define SQL_MAX_ROW_SIZE_INCLUDES_LONG 103 -#define SQL_MAX_ROW_SIZE 104 +#define SQL_MAX_INDEX_SIZE 102 +#define SQL_MAX_ROW_SIZE_INCLUDES_LONG 103 +#define SQL_MAX_ROW_SIZE 104 #define SQL_MAX_STATEMENT_LEN 105 #define SQL_MAX_TABLES_IN_SELECT 106 #define SQL_MAX_USER_NAME_LEN 107 @@ -685,9 +685,9 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_MAX_BINARY_LITERAL_LEN 112 #define SQL_LIKE_ESCAPE_CLAUSE 113 -#define SQL_OJ_CAPABILITIES 65003 +#define SQL_OJ_CAPABILITIES 65003 /* ODBC 3.0 alias */ -#define SQL_MAX_SCHEMA_NAME_LEN SQL_MAX_OWNER_NAME_LEN +#define SQL_MAX_SCHEMA_NAME_LEN SQL_MAX_OWNER_NAME_LEN /* Bit Masks describing the behaviour of the GetInfo functions named above */ /* @@ -701,7 +701,7 @@ typedef struct tagSQL_INTERVAL_STRUCT */ #define SQL_BP_CLOSE 0x00000001L #define SQL_BP_DELETE 0x00000002L -#define SQL_BP_DROP 0x00000004L +#define SQL_BP_DROP 0x00000004L #define SQL_BP_TRANSACTION 0x00000008L #define SQL_BP_UPDATE 0x00000010L #define SQL_BP_OTHER_HSTMT 0x00000020L @@ -715,24 +715,24 @@ typedef struct tagSQL_INTERVAL_STRUCT * is SQLUINTEGER, i.e. 4 bytes). Note that these masks are defined in * alphabetical order, I have no idea if this maps to MS's SDK. */ -#define SQL_CVT_CHAR 0x00000001L -#define SQL_CVT_NUMERIC 0x00000002L -#define SQL_CVT_DECIMAL 0x00000004L -#define SQL_CVT_INTEGER 0x00000008L -#define SQL_CVT_SMALLINT 0x00000010L -#define SQL_CVT_FLOAT 0x00000020L -#define SQL_CVT_REAL 0x00000040L -#define SQL_CVT_DOUBLE 0x00000080L -#define SQL_CVT_VARCHAR 0x00000100L -#define SQL_CVT_LONGVARCHAR 0x00000200L -#define SQL_CVT_BINARY 0x00000400L -#define SQL_CVT_VARBINARY 0x00000800L -#define SQL_CVT_BIT 0x00001000L -#define SQL_CVT_TINYINT 0x00002000L -#define SQL_CVT_BIGINT 0x00004000L -#define SQL_CVT_DATE 0x00008000L -#define SQL_CVT_TIME 0x00010000L -#define SQL_CVT_TIMESTAMP 0x00020000L +#define SQL_CVT_CHAR 0x00000001L +#define SQL_CVT_NUMERIC 0x00000002L +#define SQL_CVT_DECIMAL 0x00000004L +#define SQL_CVT_INTEGER 0x00000008L +#define SQL_CVT_SMALLINT 0x00000010L +#define SQL_CVT_FLOAT 0x00000020L +#define SQL_CVT_REAL 0x00000040L +#define SQL_CVT_DOUBLE 0x00000080L +#define SQL_CVT_VARCHAR 0x00000100L +#define SQL_CVT_LONGVARCHAR 0x00000200L +#define SQL_CVT_BINARY 0x00000400L +#define SQL_CVT_VARBINARY 0x00000800L +#define SQL_CVT_BIT 0x00001000L +#define SQL_CVT_TINYINT 0x00002000L +#define SQL_CVT_BIGINT 0x00004000L +#define SQL_CVT_DATE 0x00008000L +#define SQL_CVT_TIME 0x00010000L +#define SQL_CVT_TIMESTAMP 0x00020000L #define SQL_CVT_LONGVARBINARY 0x00040000L @@ -751,7 +751,7 @@ typedef struct tagSQL_INTERVAL_STRUCT */ #define SQL_CN_NONE 0x0000 #define SQL_CN_DIFFERENT 0x0001 -#define SQL_CN_ANY 0x0002 +#define SQL_CN_ANY 0x0002 /* * Fetch Direction. A SQLINTEGER bitmask enumerating the supported fetch @@ -762,10 +762,10 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_FD_FETCH_FIRST 0x00000002L #define SQL_FD_FETCH_LAST 0x00000004L #define SQL_FD_FETCH_PRIOR 0x00000008L -#define SQL_FD_FETCH_ABSOLUTE 0x00000010L -#define SQL_FD_FETCH_RELATIVE 0x00000020L +#define SQL_FD_FETCH_ABSOLUTE 0x00000010L +#define SQL_FD_FETCH_RELATIVE 0x00000020L #define SQL_FD_FETCH_RESUME 0x00000040L -#define SQL_FD_FETCH_BOOKMARK 0x00000080L +#define SQL_FD_FETCH_BOOKMARK 0x00000080L /* * Conversion bitmasks for testing which function conversions are supported by @@ -775,39 +775,39 @@ typedef struct tagSQL_INTERVAL_STRUCT * is SQLUINTEGER, i.e. 4 bytes). Note that these masks are defined in * alphabetical order, I have no idea if this maps to MS's SDK. */ -#define SQL_FN_CVT_CONVERT 0x00000001L -#define SQL_FN_CVT_CAST 0x00000002L +#define SQL_FN_CVT_CONVERT 0x00000001L +#define SQL_FN_CVT_CAST 0x00000002L /* * File Usage. A SQLUSMALLINT indicating how a singel-tier driver treats * files in a data source. */ #define SQL_FILE_NOT_SUPPORTED 0x0000 -#define SQL_FILE_TABLE 0x0001 -#define SQL_FILE_QUALIFIER 0x0002 -#define SQL_FILE_CATALOG SQL_FILE_CATALOG +#define SQL_FILE_TABLE 0x0001 +#define SQL_FILE_QUALIFIER 0x0002 +#define SQL_FILE_CATALOG SQL_FILE_CATALOG /* * GetData Extensions. A SQLUINTEGER(4 bytes) bitmask enumerating extensions * to SQLGetData. */ -#define SQL_GD_ANY_COLUMN 0x00000001L -#define SQL_GD_ANY_ORDER 0x00000002L -#define SQL_GD_BLOCK 0x00000004L -#define SQL_GD_BOUND 0x00000008L +#define SQL_GD_ANY_COLUMN 0x00000001L +#define SQL_GD_ANY_ORDER 0x00000002L +#define SQL_GD_BLOCK 0x00000004L +#define SQL_GD_BOUND 0x00000008L /* * Group By. A SQLUSMALLINT value specifying the relationship between the * columns in the GROUP BY clause and the non-aggregated columns in the * select list. */ -#define SQL_GB_NOT_SUPPORTED 0x0000 +#define SQL_GB_NOT_SUPPORTED 0x0000 #define SQL_GB_GROUP_BY_EQUALS_SELECT 0x0001 #define SQL_GB_GROUP_BY_CONTAINS_SELECT 0x0002 -#define SQL_GB_NO_RELATION 0x0003 +#define SQL_GB_NO_RELATION 0x0003 /* added in ODBC 3.0 */ -#define SQL_GB_COLLATE 0x0004 +#define SQL_GB_COLLATE 0x0004 /* * Identifier Case. A SQLUSMALLINT indicating how identifiers are handled. @@ -829,17 +829,17 @@ typedef struct tagSQL_INTERVAL_STRUCT * Non Nullable Columns. A SQLUSMALLINT value indicating if the data source * supports NOT NULL in columns. */ -#define SQL_NNC_NULL 0x0000 -#define SQL_NNC_NON_NULL 0x0001 +#define SQL_NNC_NULL 0x0000 +#define SQL_NNC_NON_NULL 0x0001 /* * Null Collation. A SQLUSMALLINT value specifying where NULLS are sorted in * a result set. */ -#define SQL_NC_HIGH 0x0001 -#define SQL_NC_LOW 0x0003 -#define SQL_NC_START 0x0002 -#define SQL_NC_END 0x0004 +#define SQL_NC_HIGH 0x0001 +#define SQL_NC_LOW 0x0003 +#define SQL_NC_START 0x0002 +#define SQL_NC_END 0x0004 /* * Numeric Functions. A SQLUINTEGER bitmask enumerating the scalar numeric @@ -876,9 +876,9 @@ typedef struct tagSQL_INTERVAL_STRUCT * Outer Join Capabilites. A SQLUINTEGER bitmask enumerating the types of * outer joins supported by the driver and data source. */ -#define SQL_OJ_LEFT 0x00000001L +#define SQL_OJ_LEFT 0x00000001L #define SQL_OJ_RIGHT 0x00000002L -#define SQL_OJ_FULL 0x00000004L +#define SQL_OJ_FULL 0x00000004L #define SQL_OJ_NESTED 0x00000008L #define SQL_OJ_NOT_ORDERED 0x00000010L #define SQL_OJ_INNER 0x00000020L @@ -888,24 +888,24 @@ typedef struct tagSQL_INTERVAL_STRUCT * ODBC API Conformance. A SQLSMALLINT value indicating a drivers ODBC * level conformance. Depreciated in 3.0. */ -#define SQL_OAC_NONE 0x0000 -#define SQL_OAC_LEVEL1 0x0001 -#define SQL_OAC_LEVEL2 0x0002 +#define SQL_OAC_NONE 0x0000 +#define SQL_OAC_LEVEL1 0x0001 +#define SQL_OAC_LEVEL2 0x0002 /* * ODBC SAG CLI Conformance. A SQLSMALLINT value indicating a drivers * SAG CLI conformance. */ #define SQL_OSCC_NOT_COMPLIANT 0x0000 -#define SQL_OSCC_COMPLIANT 0x0001 +#define SQL_OSCC_COMPLIANT 0x0001 /* * ODBC SQL Conformance. A SQLSMALLINT value indicating a drivers SQL * grammar support. Depreciated in 3.0. */ -#define SQL_OSC_MINIMUM 0x0000 -#define SQL_OSC_CORE 0x0001 -#define SQL_OSC_EXTENDED 0x0002 +#define SQL_OSC_MINIMUM 0x0000 +#define SQL_OSC_CORE 0x0001 +#define SQL_OSC_EXTENDED 0x0002 /* * Owner Usage. A SQLUINTEGER bitmask. @@ -934,7 +934,7 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_POS_REFRESH 0x00000002L #define SQL_POS_UPDATE 0x00000004L #define SQL_POS_DELETE 0x00000008L -#define SQL_POS_ADD 0x00000010L +#define SQL_POS_ADD 0x00000010L /* * SQLSetPos @@ -942,10 +942,10 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_ENTIRE_ROWSET 0 #define SQL_POSITION 0 -#define SQL_REFRESH 1 -#define SQL_UPDATE 2 -#define SQL_DELETE 3 -#define SQL_ADD 4 +#define SQL_REFRESH 1 +#define SQL_UPDATE 2 +#define SQL_DELETE 3 +#define SQL_ADD 4 /* * SQLSetPos Lock options @@ -978,8 +978,8 @@ typedef struct tagSQL_INTERVAL_STRUCT /* Qualifier Location. A SQLUSMALLINT value indicating the position of the * catalog in a qualified table name. */ -#define SQL_QL_START 0x0001 -#define SQL_QL_END 0x0002 +#define SQL_QL_START 0x0001 +#define SQL_QL_END 0x0002 /* * Qualifier Usage. A SQLUINTEGER bitmask. @@ -998,8 +998,8 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_CU_PRIVILEGE_DEFINITION SQL_QU_PRIVILEGE_DEFINITION /* ODBC 3.0 renamed the above to Catalog Location. */ -#define SQL_CL_START SQL_QL_START -#define SQL_CL_END SQL_QL_END +#define SQL_CL_START SQL_QL_START +#define SQL_CL_END SQL_QL_END /* * Scroll Concurrency. A SQLINTEGER bitmask enumerating the concurrency @@ -1016,7 +1016,7 @@ typedef struct tagSQL_INTERVAL_STRUCT * supported for scrollable cursors. */ #define SQL_SO_FORWARD_ONLY 0x00000001L -#define SQL_SO_KEYSET_DRIVEN 0x00000002L +#define SQL_SO_KEYSET_DRIVEN 0x00000002L #define SQL_SO_DYNAMIC 0x00000004L #define SQL_SO_MIXED 0x00000008L #define SQL_SO_STATIC 0x00000010L @@ -1046,11 +1046,11 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_FN_STR_REPLACE 0x00000100L #define SQL_FN_STR_RIGHT 0x00000200L #define SQL_FN_STR_RTRIM 0x00000400L -#define SQL_FN_STR_SUBSTRING 0x00000800L +#define SQL_FN_STR_SUBSTRING 0x00000800L #define SQL_FN_STR_UCASE 0x00001000L #define SQL_FN_STR_ASCII 0x00002000L #define SQL_FN_STR_CHAR 0x00004000L -#define SQL_FN_STR_DIFFERENCE 0x00008000L +#define SQL_FN_STR_DIFFERENCE 0x00008000L #define SQL_FN_STR_LOCATE_2 0x00010000L #define SQL_FN_STR_SOUNDEX 0x00020000L #define SQL_FN_STR_SPACE 0x00040000L @@ -1060,7 +1060,7 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_FN_STR_CHAR_LENGTH 0x00100000L #define SQL_FN_STR_CHARACTER_LENGTH 0x00200000L #define SQL_FN_STR_OCTET_LENGTH 0x00400000L -#define SQL_FN_STR_POSITION 0x00800000L +#define SQL_FN_STR_POSITION 0x00800000L /* * Subqueries. A SQLUINTEGER bitmask enumerating the predicates that support @@ -1068,7 +1068,7 @@ typedef struct tagSQL_INTERVAL_STRUCT */ #define SQL_SQ_COMPARISON 0x00000001L #define SQL_SQ_EXISTS 0x00000002L -#define SQL_SQ_IN 0x00000004L +#define SQL_SQ_IN 0x00000004L #define SQL_SQ_QUANTIFIED 0x00000008L #define SQL_SQ_CORRELATED_SUBQUERIES 0x00000010L @@ -1085,7 +1085,7 @@ typedef struct tagSQL_INTERVAL_STRUCT * timestamp intervals supported by the driver and associated data source * for the TIMESTAMPADD and TIMESTAMPDIFF scalar function. */ -#define SQL_FN_TSI_FRAC_SECOND 0x00000001L +#define SQL_FN_TSI_FRAC_SECOND 0x00000001L #define SQL_FN_TSI_SECOND 0x00000002L #define SQL_FN_TSI_MINUTE 0x00000004L #define SQL_FN_TSI_HOUR 0x00000008L @@ -1101,7 +1101,7 @@ typedef struct tagSQL_INTERVAL_STRUCT */ #define SQL_FN_TD_NOW 0x00000001L #define SQL_FN_TD_CURDATE 0x00000002L -#define SQL_FN_TD_DAYOFMONTH 0x00000004L +#define SQL_FN_TD_DAYOFMONTH 0x00000004L #define SQL_FN_TD_DAYOFWEEK 0x00000008L #define SQL_FN_TD_DAYOFYEAR 0x00000010L #define SQL_FN_TD_MONTH 0x00000020L @@ -1112,14 +1112,14 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_FN_TD_HOUR 0x00000400L #define SQL_FN_TD_MINUTE 0x00000800L #define SQL_FN_TD_SECOND 0x00001000L -#define SQL_FN_TD_TIMESTAMPADD 0x00002000L -#define SQL_FN_TD_TIMESTAMPDIFF 0x00004000L +#define SQL_FN_TD_TIMESTAMPADD 0x00002000L +#define SQL_FN_TD_TIMESTAMPDIFF 0x00004000L #define SQL_FN_TD_DAYNAME 0x00008000L #define SQL_FN_TD_MONTHNAME 0x00010000L /* Added in ODBC 3.0 */ -#define SQL_FN_TD_CURRENT_DATE 0x00020000L -#define SQL_FN_TD_CURRENT_TIME 0x00040000L +#define SQL_FN_TD_CURRENT_DATE 0x00020000L +#define SQL_FN_TD_CURRENT_TIME 0x00040000L #define SQL_FN_TD_CURRENT_TIMESTAMP 0x00080000L #define SQL_FN_TD_EXTRACT 0x00100000L @@ -1127,38 +1127,38 @@ typedef struct tagSQL_INTERVAL_STRUCT * Transaction Capable. A SQLUSMALLINT value describing the transaction * support in the driver or data source. */ -#define SQL_TC_NONE 0x0000 -#define SQL_TC_DML 0x0001 -#define SQL_TC_ALL 0x0002 -#define SQL_TC_DDL_COMMIT 0x0003 -#define SQL_TC_DDL_IGNORE 0x0004 +#define SQL_TC_NONE 0x0000 +#define SQL_TC_DML 0x0001 +#define SQL_TC_ALL 0x0002 +#define SQL_TC_DDL_COMMIT 0x0003 +#define SQL_TC_DDL_IGNORE 0x0004 /* * Unions. A SQLUINTEGER bitmask enumerating the support for the UNION * clause. */ -#define SQL_U_UNION 0x00000001L -#define SQL_U_UNION_ALL 0x00000002L +#define SQL_U_UNION 0x00000001L +#define SQL_U_UNION_ALL 0x00000002L /* SQLStatistics: Type, Smallint */ -#define SQL_TABLE_STAT 0 -#define SQL_INDEX_CLUSTERED 1 -#define SQL_INDEX_HASHED 2 -#define SQL_INDEX_OTHER 3 +#define SQL_TABLE_STAT 0 +#define SQL_INDEX_CLUSTERED 1 +#define SQL_INDEX_HASHED 2 +#define SQL_INDEX_OTHER 3 /* SQLProcedures: Type: Smallint */ -#define SQL_PT_UNKNOWN 0 -#define SQL_PT_PROCEDURE 1 -#define SQL_PT_FUNCTION 2 +#define SQL_PT_UNKNOWN 0 +#define SQL_PT_PROCEDURE 1 +#define SQL_PT_FUNCTION 2 /* SQLSpecialColumns: PSEUDO_COLUMN: Smallint */ -#define SQL_PC_UNKNOWN 0 -#define SQL_PC_PSEUDO 1 -#define SQL_PC_NOT_PSEUDO 2 +#define SQL_PC_UNKNOWN 0 +#define SQL_PC_PSEUDO 1 +#define SQL_PC_NOT_PSEUDO 2 /* SQLSet/Get/StmtOptions: ASYNC_ENABLE. A SQLUINTEGER */ -#define SQL_ASYNC_ENABLE_OFF 0UL +#define SQL_ASYNC_ENABLE_OFF 0UL #define SQL_ASYNC_ENABLE_ON 1UL #define SQL_ASYNC_ENABLE_DEFAULT SQL_ASYNC_ENABLE_OFF @@ -1172,17 +1172,17 @@ typedef struct tagSQL_INTERVAL_STRUCT * SQLSet/GetStmtOptions: CURSOR_SCROLLABLE. A SQLUINTEGER. Added in ODBC * 3.0. */ -#define SQL_NONSCROLLABLE 0UL -#define SQL_SCROLLABLE 1UL +#define SQL_NONSCROLLABLE 0UL +#define SQL_SCROLLABLE 1UL #define SQL_CURSOR_SCROLLABLE_DEFAULT SQL_NONSCROLLABLE /* * SQLSet/GetStmtOptions: CURSOR_SENSITITY. A SQLUINTEGER. Added in ODBC * 3.0. */ -#define SQL_UNSPECIFIED 0UL -#define SQL_INSENSITIVE 1UL -#define SQL_SENSITIVIE 2UL +#define SQL_UNSPECIFIED 0UL +#define SQL_INSENSITIVE 1UL +#define SQL_SENSITIVIE 2UL #define SQL_CURSOR_SENSITIVITY_DEFAULT SQL_UNSPECIFIED /* @@ -1191,9 +1191,9 @@ typedef struct tagSQL_INTERVAL_STRUCT */ #define SQL_CURSOR_FORWARD_ONLY 0UL #define SQL_CURSOR_KEYSET_DRIVEN 1UL -#define SQL_CURSOR_DYNAMIC 2UL -#define SQL_CURSOR_STATIC 3UL -#define SQL_CURSOR_DEFAULT SQL_CURSOR_FORWARD_ONLY +#define SQL_CURSOR_DYNAMIC 2UL +#define SQL_CURSOR_STATIC 3UL +#define SQL_CURSOR_DEFAULT SQL_CURSOR_FORWARD_ONLY /* * ENABLE_AUTO_IPD: A SQLUINTEGER, either SQL_TRUE or SQL_FALSE. Default @@ -1225,23 +1225,23 @@ typedef struct tagSQL_INTERVAL_STRUCT * SQLSet/GetStmtOptions: PARAM_STATUS: SQLUSMALLINT *. Added in ODBC 3.0 * */ -#define SQL_PARAM_SUCCESS 0 +#define SQL_PARAM_SUCCESS 0 #define SQL_PARAM_SUCCESS_WITH_INFO 6 -#define SQL_PARAM_ERROR 5 -#define SQL_PARAM_UNUSED 7 +#define SQL_PARAM_ERROR 5 +#define SQL_PARAM_UNUSED 7 #define SQL_PARAM_DIAG_UNAVAILABLE 1 /* * SQLSet/GetStmtOptions: RETRIEVE_DATA: SQLUINTEGER value. */ -#define SQL_RD_OFF 0UL -#define SQL_RD_ON 1UL -#define SQL_RD_DEFAULT SQL_RD_ON +#define SQL_RD_OFF 0UL +#define SQL_RD_ON 1UL +#define SQL_RD_DEFAULT SQL_RD_ON /* * SQLSet/GetStmtOptions: BIND_TYPE: SQLUINTEGER. sets binding orientation. */ -#define SQL_BIND_BY_COLUMN 0UL +#define SQL_BIND_BY_COLUMN 0UL #define SQL_BIND_TYPE_DEFAULT SQL_BIND_BY_COLUMN /* @@ -1273,18 +1273,18 @@ typedef struct tagSQL_INTERVAL_STRUCT * SQLSet/GetStmtOptions: USE_BOOKMARKS: SQLUINTEGER value that specifies * whether an application will use bookmarks with a cursor. */ -#define SQL_UB_OFF 0UL -#define SQL_UB_ON 1UL -#define SQL_UB_FIXED SQL_UB_ON /* Deprecated in ODBC 3.0 */ -#define SQL_UB_VARIABLE 2UL /* Added in ODBC 3.0 */ -#define SQL_UB_DEFAULT SQL_UB_OFF +#define SQL_UB_OFF 0UL +#define SQL_UB_ON 1UL +#define SQL_UB_FIXED SQL_UB_ON /* Deprecated in ODBC 3.0 */ +#define SQL_UB_VARIABLE 2UL /* Added in ODBC 3.0 */ +#define SQL_UB_DEFAULT SQL_UB_OFF /* Deprecated */ #define SQL_DATABASE_NAME 16 #define SQL_FD_FETCH_PREV SQL_FD_FETCH_PRIOR #define SQL_FETCH_PREV SQL_FETCH_PRIOR -#define SQL_CONCUR_TIMESTAMP SQL_CONCUR_ROWVER -#define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER +#define SQL_CONCUR_TIMESTAMP SQL_CONCUR_ROWVER +#define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER #define SQL_CC_DELETE SQL_CB_DELETE #define SQL_CR_DELETE SQL_CB_DELETE #define SQL_CC_CLOSE SQL_CB_CLOSE @@ -1292,10 +1292,10 @@ typedef struct tagSQL_INTERVAL_STRUCT #define SQL_CC_PRESERVE SQL_CB_PRESERVE #define SQL_CR_PRESERVE SQL_CB_PRESERVE #define SQL_FETCH_RESUME 7 -#define SQL_SCROLL_FORWARD_ONLY 0L -#define SQL_SCROLL_KEYSET_DRIVEN (-1L) -#define SQL_SCROLL_DYNAMIC (-2L) -#define SQL_SCROLL_STATIC (-3L) +#define SQL_SCROLL_FORWARD_ONLY 0L +#define SQL_SCROLL_KEYSET_DRIVEN (-1L) +#define SQL_SCROLL_DYNAMIC (-2L) +#define SQL_SCROLL_STATIC (-3L) /* * ODBC keywords diff --git a/src/interfaces/odbc/options.c b/src/interfaces/odbc/options.c index 2496077573..12151f0698 100644 --- a/src/interfaces/odbc/options.c +++ b/src/interfaces/odbc/options.c @@ -284,7 +284,7 @@ set_statement_option(ConnectionClass *conn, /* Implements only SQL_AUTOCOMMIT */ -RETCODE SQL_API +RETCODE SQL_API SQLSetConnectOption( HDBC hdbc, UWORD fOption, @@ -433,7 +433,7 @@ SQLSetConnectOption( /* - - - - - - - - - */ /* This function just can tell you whether you are in Autcommit mode or not */ -RETCODE SQL_API +RETCODE SQL_API SQLGetConnectOption( HDBC hdbc, UWORD fOption, @@ -510,7 +510,7 @@ SQLGetConnectOption( /* - - - - - - - - - */ -RETCODE SQL_API +RETCODE SQL_API SQLSetStmtOption( HSTMT hstmt, UWORD fOption, @@ -537,7 +537,7 @@ SQLSetStmtOption( /* - - - - - - - - - */ -RETCODE SQL_API +RETCODE SQL_API SQLGetStmtOption( HSTMT hstmt, UWORD fOption, diff --git a/src/interfaces/odbc/pgtypes.h b/src/interfaces/odbc/pgtypes.h index d2ba015b7b..39f2640f21 100644 --- a/src/interfaces/odbc/pgtypes.h +++ b/src/interfaces/odbc/pgtypes.h @@ -20,22 +20,22 @@ #define PG_TYPE_LO ????/* waiting for permanent type */ #endif -#define PG_TYPE_BOOL 16 -#define PG_TYPE_BYTEA 17 -#define PG_TYPE_CHAR 18 -#define PG_TYPE_NAME 19 -#define PG_TYPE_INT8 20 -#define PG_TYPE_INT2 21 -#define PG_TYPE_INT2VECTOR 22 -#define PG_TYPE_INT4 23 -#define PG_TYPE_REGPROC 24 -#define PG_TYPE_TEXT 25 -#define PG_TYPE_OID 26 -#define PG_TYPE_TID 27 -#define PG_TYPE_XID 28 -#define PG_TYPE_CID 29 -#define PG_TYPE_OIDVECTOR 30 -#define PG_TYPE_SET 32 +#define PG_TYPE_BOOL 16 +#define PG_TYPE_BYTEA 17 +#define PG_TYPE_CHAR 18 +#define PG_TYPE_NAME 19 +#define PG_TYPE_INT8 20 +#define PG_TYPE_INT2 21 +#define PG_TYPE_INT2VECTOR 22 +#define PG_TYPE_INT4 23 +#define PG_TYPE_REGPROC 24 +#define PG_TYPE_TEXT 25 +#define PG_TYPE_OID 26 +#define PG_TYPE_TID 27 +#define PG_TYPE_XID 28 +#define PG_TYPE_CID 29 +#define PG_TYPE_OIDVECTOR 30 +#define PG_TYPE_SET 32 #define PG_TYPE_CHAR2 409 #define PG_TYPE_CHAR4 410 #define PG_TYPE_CHAR8 411 @@ -55,19 +55,19 @@ #define PG_TYPE_OIDINT2 810 #define PG_TYPE_OIDINT4 910 #define PG_TYPE_OIDNAME 911 -#define PG_TYPE_BPCHAR 1042 -#define PG_TYPE_VARCHAR 1043 -#define PG_TYPE_DATE 1082 -#define PG_TYPE_TIME 1083 -#define PG_TYPE_DATETIME 1184 -#define PG_TYPE_TIMESTAMP 1296 -#define PG_TYPE_NUMERIC 1700 +#define PG_TYPE_BPCHAR 1042 +#define PG_TYPE_VARCHAR 1043 +#define PG_TYPE_DATE 1082 +#define PG_TYPE_TIME 1083 +#define PG_TYPE_DATETIME 1184 +#define PG_TYPE_TIMESTAMP 1296 +#define PG_TYPE_NUMERIC 1700 /* extern Int4 pgtypes_defined[]; */ extern Int2 sqlTypes[]; /* Defines for pgtype_precision */ -#define PG_STATIC -1 +#define PG_STATIC -1 Int4 sqltype_to_pgtype(Int2 fSqlType); diff --git a/src/interfaces/odbc/psqlodbc.c b/src/interfaces/odbc/psqlodbc.c index 9d1a38ccd3..60a808a47f 100644 --- a/src/interfaces/odbc/psqlodbc.c +++ b/src/interfaces/odbc/psqlodbc.c @@ -136,7 +136,7 @@ _fini(void) Driver Manager do this. Also, the ordinal values of the functions must match the value of fFunction in SQLGetFunctions() */ -RETCODE SQL_API +RETCODE SQL_API SQLDummyOrdinal(void) { return SQL_SUCCESS; diff --git a/src/interfaces/odbc/psqlodbc.h b/src/interfaces/odbc/psqlodbc.h index a7b6d026f5..8c7138d1a3 100644 --- a/src/interfaces/odbc/psqlodbc.h +++ b/src/interfaces/odbc/psqlodbc.h @@ -6,7 +6,7 @@ * * Comments: See "notice.txt" for copyright and license information. * - * $Id: psqlodbc.h,v 1.34 2001/02/11 05:13:51 momjian Exp $ + * $Id: psqlodbc.h,v 1.35 2001/02/11 05:58:41 momjian Exp $ */ #ifndef __PSQLODBC_H__ @@ -39,10 +39,10 @@ typedef UInt4 Oid; #define ODBCVER 0x0250 #define DRIVER_ODBC_VER "02.50" -#define DRIVERNAME "PostgreSQL ODBC" -#define DBMS_NAME "PostgreSQL" +#define DRIVERNAME "PostgreSQL ODBC" +#define DBMS_NAME "PostgreSQL" -#define POSTGRESDRIVERVERSION "07.01.0003" +#define POSTGRESDRIVERVERSION "07.01.0003" #ifdef WIN32 #define DRIVER_FILE_NAME "PSQLODBC.DLL" @@ -52,52 +52,52 @@ typedef UInt4 Oid; /* Limits */ #ifdef WIN32 -#define BLCKSZ 4096 +#define BLCKSZ 4096 #endif -#define MAX_MESSAGE_LEN 65536 /* This puts a limit on +#define MAX_MESSAGE_LEN 65536 /* This puts a limit on * query size but I don't */ /* see an easy way round this - DJP 24-1-2001 */ -#define MAX_CONNECT_STRING 4096 -#define ERROR_MSG_LENGTH 4096 -#define FETCH_MAX 100 /* default number of rows to cache - * for declare/fetch */ -#define TUPLE_MALLOC_INC 100 -#define SOCK_BUFFER_SIZE 4096 /* default socket buffer +#define MAX_CONNECT_STRING 4096 +#define ERROR_MSG_LENGTH 4096 +#define FETCH_MAX 100 /* default number of rows to cache + * for declare/fetch */ +#define TUPLE_MALLOC_INC 100 +#define SOCK_BUFFER_SIZE 4096 /* default socket buffer * size */ -#define MAX_CONNECTIONS 128 /* conns per environment - * (arbitrary) */ -#define MAX_FIELDS 512 -#define BYTELEN 8 -#define VARHDRSZ sizeof(Int4) +#define MAX_CONNECTIONS 128 /* conns per environment + * (arbitrary) */ +#define MAX_FIELDS 512 +#define BYTELEN 8 +#define VARHDRSZ sizeof(Int4) -#define MAX_TABLE_LEN 32 -#define MAX_COLUMN_LEN 32 -#define MAX_CURSOR_LEN 32 +#define MAX_TABLE_LEN 32 +#define MAX_COLUMN_LEN 32 +#define MAX_CURSOR_LEN 32 /* Registry length limits */ -#define LARGE_REGISTRY_LEN 4096 /* used for special cases */ -#define MEDIUM_REGISTRY_LEN 256 /* normal size for +#define LARGE_REGISTRY_LEN 4096 /* used for special cases */ +#define MEDIUM_REGISTRY_LEN 256 /* normal size for * user,database,etc. */ -#define SMALL_REGISTRY_LEN 10 /* for 1/0 settings */ +#define SMALL_REGISTRY_LEN 10 /* for 1/0 settings */ /* These prefixes denote system tables */ -#define POSTGRES_SYS_PREFIX "pg_" -#define KEYS_TABLE "dd_fkey" +#define POSTGRES_SYS_PREFIX "pg_" +#define KEYS_TABLE "dd_fkey" /* Info limits */ -#define MAX_INFO_STRING 128 -#define MAX_KEYPARTS 20 -#define MAX_KEYLEN 512 /* max key of the form - * "date+outlet+invoice" */ -#define MAX_ROW_SIZE 0 /* Unlimited rowsize with the Tuple - * Toaster */ -#define MAX_STATEMENT_LEN 0 /* Unlimited statement size with 7.0 */ +#define MAX_INFO_STRING 128 +#define MAX_KEYPARTS 20 +#define MAX_KEYLEN 512 /* max key of the form + * "date+outlet+invoice" */ +#define MAX_ROW_SIZE 0 /* Unlimited rowsize with the Tuple + * Toaster */ +#define MAX_STATEMENT_LEN 0 /* Unlimited statement size with 7.0 */ /* Previously, numerous query strings were defined of length MAX_STATEMENT_LEN */ /* Now that's 0, lets use this instead. DJP 24-1-2001 */ -#define STD_STATEMENT_LEN MAX_MESSAGE_LEN +#define STD_STATEMENT_LEN MAX_MESSAGE_LEN #define PG64 "6.4" diff --git a/src/interfaces/odbc/results.c b/src/interfaces/odbc/results.c index 661a1d07eb..7f873804f4 100644 --- a/src/interfaces/odbc/results.c +++ b/src/interfaces/odbc/results.c @@ -43,7 +43,7 @@ extern GLOBAL_VALUES globals; -RETCODE SQL_API +RETCODE SQL_API SQLRowCount( HSTMT hstmt, SDWORD FAR *pcrow) @@ -113,7 +113,7 @@ SQLRowCount( /* attached to "hstmt". */ -RETCODE SQL_API +RETCODE SQL_API SQLNumResultCols( HSTMT hstmt, SWORD FAR *pccol) @@ -176,7 +176,7 @@ SQLNumResultCols( /* Return information about the database column the user wants */ /* information about. */ -RETCODE SQL_API +RETCODE SQL_API SQLDescribeCol( HSTMT hstmt, UWORD icol, @@ -375,7 +375,7 @@ SQLDescribeCol( /* Returns result column descriptor information for a result set. */ -RETCODE SQL_API +RETCODE SQL_API SQLColAttributes( HSTMT hstmt, UWORD icol, @@ -651,7 +651,7 @@ SQLColAttributes( /* Returns result data for a single column in the current row. */ -RETCODE SQL_API +RETCODE SQL_API SQLGetData( HSTMT hstmt, UWORD icol, @@ -836,7 +836,7 @@ SQLGetData( /* Returns data for bound columns in the current row ("hstmt->iCursor"), */ /* advances the cursor. */ -RETCODE SQL_API +RETCODE SQL_API SQLFetch( HSTMT hstmt) { @@ -906,7 +906,7 @@ SQLFetch( /* This fetchs a block of data (rowset). */ -RETCODE SQL_API +RETCODE SQL_API SQLExtendedFetch( HSTMT hstmt, UWORD fFetchType, @@ -1202,7 +1202,7 @@ SQLExtendedFetch( /* the "hstmt". */ /* CC: return SQL_NO_DATA_FOUND since we do not support multiple result sets */ -RETCODE SQL_API +RETCODE SQL_API SQLMoreResults( HSTMT hstmt) { @@ -1211,7 +1211,7 @@ SQLMoreResults( /* This positions the cursor within a rowset, that was positioned using SQLExtendedFetch. */ /* This will be useful (so far) only when using SQLGetData after SQLExtendedFetch. */ -RETCODE SQL_API +RETCODE SQL_API SQLSetPos( HSTMT hstmt, UWORD irow, @@ -1279,7 +1279,7 @@ SQLSetPos( /* Sets options that control the behavior of cursors. */ -RETCODE SQL_API +RETCODE SQL_API SQLSetScrollOptions( HSTMT hstmt, UWORD fConcurrency, @@ -1295,7 +1295,7 @@ SQLSetScrollOptions( /* Set the cursor name on a statement handle */ -RETCODE SQL_API +RETCODE SQL_API SQLSetCursorName( HSTMT hstmt, UCHAR FAR *szCursor, @@ -1329,7 +1329,7 @@ SQLSetCursorName( /* Return the cursor name for a statement handle */ -RETCODE SQL_API +RETCODE SQL_API SQLGetCursorName( HSTMT hstmt, UCHAR FAR *szCursor, diff --git a/src/interfaces/odbc/socket.h b/src/interfaces/odbc/socket.h index 48ef197ff2..c706510fb4 100644 --- a/src/interfaces/odbc/socket.h +++ b/src/interfaces/odbc/socket.h @@ -41,16 +41,16 @@ typedef unsigned int in_addr_t; #include "psqlodbc.h" -#define SOCKET_ALREADY_CONNECTED 1 -#define SOCKET_HOST_NOT_FOUND 2 -#define SOCKET_COULD_NOT_CREATE_SOCKET 3 -#define SOCKET_COULD_NOT_CONNECT 4 -#define SOCKET_READ_ERROR 5 -#define SOCKET_WRITE_ERROR 6 -#define SOCKET_NULLPOINTER_PARAMETER 7 -#define SOCKET_PUT_INT_WRONG_LENGTH 8 -#define SOCKET_GET_INT_WRONG_LENGTH 9 -#define SOCKET_CLOSED 10 +#define SOCKET_ALREADY_CONNECTED 1 +#define SOCKET_HOST_NOT_FOUND 2 +#define SOCKET_COULD_NOT_CREATE_SOCKET 3 +#define SOCKET_COULD_NOT_CONNECT 4 +#define SOCKET_READ_ERROR 5 +#define SOCKET_WRITE_ERROR 6 +#define SOCKET_NULLPOINTER_PARAMETER 7 +#define SOCKET_PUT_INT_WRONG_LENGTH 8 +#define SOCKET_GET_INT_WRONG_LENGTH 9 +#define SOCKET_CLOSED 10 struct SocketClass_ diff --git a/src/interfaces/odbc/statement.c b/src/interfaces/odbc/statement.c index 86e52191af..d730e1b640 100644 --- a/src/interfaces/odbc/statement.c +++ b/src/interfaces/odbc/statement.c @@ -85,7 +85,7 @@ static struct }; -RETCODE SQL_API +RETCODE SQL_API SQLAllocStmt(HDBC hdbc, HSTMT FAR *phstmt) { @@ -139,7 +139,7 @@ SQLAllocStmt(HDBC hdbc, } -RETCODE SQL_API +RETCODE SQL_API SQLFreeStmt(HSTMT hstmt, UWORD fOption) { diff --git a/src/interfaces/odbc/statement.h b/src/interfaces/odbc/statement.h index 9907c28ae9..a9359c5925 100644 --- a/src/interfaces/odbc/statement.h +++ b/src/interfaces/odbc/statement.h @@ -50,38 +50,38 @@ typedef enum STMT_EXECUTING /* statement execution is still going on */ } STMT_Status; -#define STMT_TRUNCATED -2 -#define STMT_INFO_ONLY -1 /* not an error message, just a +#define STMT_TRUNCATED (-2) +#define STMT_INFO_ONLY (-1) /* not an error message, just a * notification to be returned by SQLError */ -#define STMT_OK 0 /* will be interpreted as "no error +#define STMT_OK 0 /* will be interpreted as "no error * pending" */ -#define STMT_EXEC_ERROR 1 -#define STMT_STATUS_ERROR 2 -#define STMT_SEQUENCE_ERROR 3 -#define STMT_NO_MEMORY_ERROR 4 -#define STMT_COLNUM_ERROR 5 -#define STMT_NO_STMTSTRING 6 -#define STMT_ERROR_TAKEN_FROM_BACKEND 7 -#define STMT_INTERNAL_ERROR 8 -#define STMT_STILL_EXECUTING 9 -#define STMT_NOT_IMPLEMENTED_ERROR 10 +#define STMT_EXEC_ERROR 1 +#define STMT_STATUS_ERROR 2 +#define STMT_SEQUENCE_ERROR 3 +#define STMT_NO_MEMORY_ERROR 4 +#define STMT_COLNUM_ERROR 5 +#define STMT_NO_STMTSTRING 6 +#define STMT_ERROR_TAKEN_FROM_BACKEND 7 +#define STMT_INTERNAL_ERROR 8 +#define STMT_STILL_EXECUTING 9 +#define STMT_NOT_IMPLEMENTED_ERROR 10 #define STMT_BAD_PARAMETER_NUMBER_ERROR 11 -#define STMT_OPTION_OUT_OF_RANGE_ERROR 12 +#define STMT_OPTION_OUT_OF_RANGE_ERROR 12 #define STMT_INVALID_COLUMN_NUMBER_ERROR 13 #define STMT_RESTRICTED_DATA_TYPE_ERROR 14 #define STMT_INVALID_CURSOR_STATE_ERROR 15 -#define STMT_OPTION_VALUE_CHANGED 16 -#define STMT_CREATE_TABLE_ERROR 17 -#define STMT_NO_CURSOR_NAME 18 -#define STMT_INVALID_CURSOR_NAME 19 -#define STMT_INVALID_ARGUMENT_NO 20 -#define STMT_ROW_OUT_OF_RANGE 21 -#define STMT_OPERATION_CANCELLED 22 -#define STMT_INVALID_CURSOR_POSITION 23 -#define STMT_VALUE_OUT_OF_RANGE 24 -#define STMT_OPERATION_INVALID 25 -#define STMT_PROGRAM_TYPE_OUT_OF_RANGE 26 -#define STMT_BAD_ERROR 27 +#define STMT_OPTION_VALUE_CHANGED 16 +#define STMT_CREATE_TABLE_ERROR 17 +#define STMT_NO_CURSOR_NAME 18 +#define STMT_INVALID_CURSOR_NAME 19 +#define STMT_INVALID_ARGUMENT_NO 20 +#define STMT_ROW_OUT_OF_RANGE 21 +#define STMT_OPERATION_CANCELLED 22 +#define STMT_INVALID_CURSOR_POSITION 23 +#define STMT_VALUE_OUT_OF_RANGE 24 +#define STMT_OPERATION_INVALID 25 +#define STMT_PROGRAM_TYPE_OUT_OF_RANGE 26 +#define STMT_BAD_ERROR 27 /* statement types */ enum diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README index ec12fd8f74..5a5f4e1a77 100644 --- a/src/tools/pgindent/README +++ b/src/tools/pgindent/README @@ -27,3 +27,6 @@ We get the list of typedef's included in pgindent by running: /src/tools/find_typedef +Make sure to do the pgsql/bin directory, and the src/interfaces/odbc +directory. Merge the output of these and remove duplicates. + diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index dcd88479b2..069cf41380 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -37,6 +37,10 @@ do indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l75 \ -lp -nip -npro $EXTRA_OPTS \ -TFAR \ +-TDWORD \ +-TBOOL \ +-TRETCODE \ +-TSQL_API \ -TA_Const \ -TA_Expr \ -TA_Indices \