I decided to give this a go after all :-) The attached patch does the

following but it does *not* check whether the user is connected to
PostgreSQL 7.0.x or 7.1 first (as would be required for some of the
features) - the driver doesn't do this at all afaik and it's beyond my
capabilities to implement such checking in code that doesn't look like it
was written by my 1 year old daughter!

1) The driver now reports no maximum query length (SQL_MAX_QUERY_SIZE).
2) The driver now reports no maximum row length (SQL_MAX_ROW_SIZE).
3) The driver now reports that Outer Joins are supported (SQL_OUTER_JOINS),
but still does not report oj capabilities (SQL_OJ_CAPABILITIES).
4) The version number has been incremented to 7.1.0000 in psqlodbc.h *and*
psqlodbc.rc

Regards,

Dave Page

diff --git a/src/interfaces/odbc/info.c b/src/interfaces/odbc/info.c
index cebc305da3eca01fd8bf8b7c51ac00204bb280c9..f412d2423e990ac4d385ac2c342734498bd950cd 100644 (file)
--- a/src/interfaces/odbc/info.c
+++ b/src/interfaces/odbc/info.c
@@ -337,7 +337,7 @@ RETCODE result;
 
     case SQL_MAX_ROW_SIZE: /* ODBC 2.0 */
                len = 4;
-        value = BLCKSZ;
+        value = MAX_ROW_SIZE;
         break;
 
     case SQL_MAX_ROW_SIZE_INCLUDES_LONG: /* ODBC 2.0 */
@@ -422,7 +422,7 @@ RETCODE result;
         break;
 
     case SQL_OUTER_JOINS: /* ODBC 1.0 */
-               p = "N";
+               p = "Y";
         break;
 
     case SQL_OWNER_TERM: /* ODBC 1.0 */

diff --git a/src/interfaces/odbc/psqlodbc.h b/src/interfaces/odbc/psqlodbc.h
index aabded2a1c1e9a40f769fa17ca632b632cb46948..056e718d547e3bf4bd66f1cd1f1719ab31756e33 100644 (file)
--- a/src/interfaces/odbc/psqlodbc.h
+++ b/src/interfaces/odbc/psqlodbc.h
@@ -40,8 +40,8 @@ typedef UInt4 Oid;
 #define DRIVERNAME             "PostgreSQL ODBC"
 #define DBMS_NAME              "PostgreSQL"
 
-#define DBMS_VERSION           "06.40.0009 PostgreSQL 6.4/6.5"
-#define POSTGRESDRIVERVERSION  "06.40.0009"
+#define DBMS_VERSION           "7.1.0000 PostgreSQL 7.1"
+#define POSTGRESDRIVERVERSION  "7.1.0000"
 
 #ifdef WIN32
 #define DRIVER_FILE_NAME               "PSQLODBC.DLL"
@@ -54,8 +54,9 @@ typedef UInt4 Oid;
 #define BLCKSZ                      4096
 #endif
 
-#define MAX_QUERY_SIZE                         (BLCKSZ*2)
-#define MAX_MESSAGE_LEN                                MAX_QUERY_SIZE
+#define MAX_ROW_SIZE                           0 /* Unlimited rowsize with the Tuple Toaster */
+#define MAX_QUERY_SIZE                         0 /* Unlimited query length from v7.0(?) */
+#define MAX_MESSAGE_LEN                                (2*BLCKSZ)
 #define MAX_CONNECT_STRING                     4096
 #define ERROR_MSG_LENGTH                       4096
 #define FETCH_MAX                                      100             /* default number of rows to cache for declare/fetch */

diff --git a/src/interfaces/odbc/psqlodbc.rc b/src/interfaces/odbc/psqlodbc.rc
index 401661c1d64255b9484bbc6f315de7602209c511..f8e27f8da64262c20a08f16218c9ee2819a38b9c 100644 (file)
--- a/src/interfaces/odbc/psqlodbc.rc
+++ b/src/interfaces/odbc/psqlodbc.rc
@@ -204,8 +204,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,40,0,9
- PRODUCTVERSION 6,40,0,9
+ FILEVERSION 7,1,0,0
+ PRODUCTVERSION 7,1,0,0
  FILEFLAGSMASK 0x3L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -220,15 +220,18 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "Comments", "PostgreSQL ODBC driver for Windows 95\0"
+            VALUE "Comments", "PostgreSQL ODBC driver\0"
             VALUE "CompanyName", "Insight Distribution Systems\0"
             VALUE "FileDescription", "PostgreSQL Driver\0"
-            VALUE "FileVersion", " 6.40.0009\0"
+            VALUE "FileVersion", " 7.1.0000\0"
             VALUE "InternalName", "psqlodbc\0"
+            VALUE "LegalCopyright", "\0"
             VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation.  Microsoft® is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0"
             VALUE "OriginalFilename", "psqlodbc.dll\0"
+            VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Microsoft Open Database Connectivity\0"
-            VALUE "ProductVersion", " 6.40.0009\0"
+            VALUE "ProductVersion", " 7.1.0000\0"
+            VALUE "SpecialBuild", "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/src/interfaces/odbc/resource.h b/src/interfaces/odbc/resource.h
index 33323f54786531536a61299bbef8ebd1c498ce10..81e3c9961ff0c92eacef4408b5e59e2b81e86557 100644 (file)
--- a/src/interfaces/odbc/resource.h
+++ b/src/interfaces/odbc/resource.h
@@ -1,7 +1,7 @@
-/*{{NO_DEPENDENCIES}} */
-/* Microsoft Developer Studio generated include file. */
-/* Used by psqlodbc.rc */
-/* */
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by psqlodbc.rc
+//
 #define IDS_BADDSN                      1
 #define IDS_MSGTITLE                    2
 #define DLG_OPTIONS_DRV                 102
@@ -50,8 +50,8 @@
 #define DS_PG64                         1057
 #define DS_PG63                         1058
 
-/* Next default values for new objects */
-/*  */
+// Next default values for new objects
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        104