Mini update to fix SQLGetInfo to work properly (truncation, NULL)

src/interfaces/odbc/connection.h

@@ -63,6 +63,7 @@ typedef enum {
 #define CONN_UNABLE_TO_LOAD_DLL 212
 
 #define CONN_OPTION_VALUE_CHANGED 213
+#define CONN_VALUE_OUT_OF_RANGE 214
 
 /* Conn_status defines */
 #define CONN_IN_AUTOCOMMIT 0x01

src/interfaces/odbc/environ.c

@@ -187,6 +187,9 @@ int status;
                     strcpy(szSqlState, "S1109");
                     break;
                 
+				case STMT_VALUE_OUT_OF_RANGE:
+					strcpy(szSqlState, "22003");
+					break;
 				default:
                     strcpy(szSqlState, "S1000");
                     // also a general error
@@ -238,6 +241,10 @@ int status;
 				case CONN_OPTION_VALUE_CHANGED:
                     strcpy(szSqlState, "01S02");
 					break;
+                case STMT_TRUNCATED:
+                    strcpy(szSqlState, "01004");
+                    // data truncated
+                    break;
                 case CONN_INIREAD_ERROR:
                     strcpy(szSqlState, "IM002");
                     // data source not found
@@ -277,6 +284,12 @@ int status;
 				case STMT_NOT_IMPLEMENTED_ERROR:
                     strcpy(szSqlState, "S1C00");
                     break;
+
+				case CONN_VALUE_OUT_OF_RANGE:
+				case STMT_VALUE_OUT_OF_RANGE:
+					strcpy(szSqlState, "22003");
+					break;
+
                 default:
                     strcpy(szSqlState, "S1000");
                     // general error

src/interfaces/odbc/misc.h

@@ -26,7 +26,7 @@
 	portion of the registry.  You may have to manually add this key.
 	This logfile is intended for development use, not for an end user!
 */
-#define MY_LOG
+// #define MY_LOG
 
 
 /*	Uncomment Q_LOG to compile in the qlog() statements (Communications log, i.e. CommLog).

src/interfaces/odbc/psqlodbc.h

@@ -33,7 +33,20 @@ typedef double SDOUBLE;
 
 typedef UInt4 Oid;
 
-# define ODBCVER   0x0200
+/* Driver stuff */
+#define ODBCVER				0x0200
+#define DRIVER_ODBC_VER		"02.00"
+
+#define DRIVERNAME             "PostgreSQL ODBC"
+#define DBMS_NAME              "PostgreSQL"
+#define DBMS_VERSION           "06.40.0002 PostgreSQL 6.4"
+#define POSTGRESDRIVERVERSION  "06.40.0002"
+
+#ifdef WIN32
+#define DRIVER_FILE_NAME		"PSQLODBC.DLL"
+#else
+#define DRIVER_FILE_NAME		"libpsqlodbc.so"
+#endif
 
 /* Limits */
 #define MAX_MESSAGE_LEN				8192
@@ -67,17 +80,6 @@ typedef UInt4 Oid;
 #define MAX_KEYLEN			512			//	max key of the form "date+outlet+invoice"
 #define MAX_STATEMENT_LEN	MAX_MESSAGE_LEN
 
-/* Driver stuff */
-#define DRIVERNAME             "PostgreSQL ODBC"
-#define DBMS_NAME              "PostgreSQL"
-#define DBMS_VERSION           "06.40.0002 PostgreSQL 6.4"
-#define POSTGRESDRIVERVERSION  "06.40.0002"
-
-#ifdef WIN32
-#define DRIVER_FILE_NAME		"PSQLODBC.DLL"
-#else
-#define DRIVER_FILE_NAME		"libpsqlodbc.so"
-#endif
 
 #define PG62	"6.2"		/* "Protocol" key setting to force Postgres 6.2 */
 #define PG63	"6.3"		/* "Protocol" key setting to force postgres 6.3 */

src/interfaces/odbc/statement.h

@@ -70,6 +70,7 @@ typedef enum {
 #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
 
 /* statement types */
 enum {