Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit be12768

Browse files
committed
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
1 parent 4e45005 commit be12768

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

src/interfaces/odbc/info.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ RETCODE result;
337337

338338
case SQL_MAX_ROW_SIZE: /* ODBC 2.0 */
339339
len = 4;
340-
value = BLCKSZ;
340+
value = MAX_ROW_SIZE;
341341
break;
342342

343343
case SQL_MAX_ROW_SIZE_INCLUDES_LONG: /* ODBC 2.0 */
@@ -422,7 +422,7 @@ RETCODE result;
422422
break;
423423

424424
case SQL_OUTER_JOINS: /* ODBC 1.0 */
425-
p = "N";
425+
p = "Y";
426426
break;
427427

428428
case SQL_OWNER_TERM: /* ODBC 1.0 */

src/interfaces/odbc/psqlodbc.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ typedef UInt4 Oid;
4040
#define DRIVERNAME "PostgreSQL ODBC"
4141
#define DBMS_NAME "PostgreSQL"
4242

43-
#define DBMS_VERSION "06.40.0009 PostgreSQL 6.4/6.5"
44-
#define POSTGRESDRIVERVERSION "06.40.0009"
43+
#define DBMS_VERSION "7.1.0000 PostgreSQL 7.1"
44+
#define POSTGRESDRIVERVERSION "7.1.0000"
4545

4646
#ifdef WIN32
4747
#define DRIVER_FILE_NAME "PSQLODBC.DLL"
@@ -54,8 +54,9 @@ typedef UInt4 Oid;
5454
#define BLCKSZ 4096
5555
#endif
5656

57-
#define MAX_QUERY_SIZE (BLCKSZ*2)
58-
#define MAX_MESSAGE_LEN MAX_QUERY_SIZE
57+
#define MAX_ROW_SIZE 0 /* Unlimited rowsize with the Tuple Toaster */
58+
#define MAX_QUERY_SIZE 0 /* Unlimited query length from v7.0(?) */
59+
#define MAX_MESSAGE_LEN (2*BLCKSZ)
5960
#define MAX_CONNECT_STRING 4096
6061
#define ERROR_MSG_LENGTH 4096
6162
#define FETCH_MAX 100 /* default number of rows to cache for declare/fetch */

src/interfaces/odbc/psqlodbc.rc

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ END
204204
//
205205

206206
VS_VERSION_INFO VERSIONINFO
207-
FILEVERSION 6,40,0,9
208-
PRODUCTVERSION 6,40,0,9
207+
FILEVERSION 7,1,0,0
208+
PRODUCTVERSION 7,1,0,0
209209
FILEFLAGSMASK 0x3L
210210
#ifdef _DEBUG
211211
FILEFLAGS 0x1L
@@ -220,15 +220,18 @@ BEGIN
220220
BEGIN
221221
BLOCK "040904e4"
222222
BEGIN
223-
VALUE "Comments", "PostgreSQL ODBC driver for Windows 95\0"
223+
VALUE "Comments", "PostgreSQL ODBC driver\0"
224224
VALUE "CompanyName", "Insight Distribution Systems\0"
225225
VALUE "FileDescription", "PostgreSQL Driver\0"
226-
VALUE "FileVersion", " 6.40.0009\0"
226+
VALUE "FileVersion", " 7.1.0000\0"
227227
VALUE "InternalName", "psqlodbc\0"
228+
VALUE "LegalCopyright", "\0"
228229
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"
229230
VALUE "OriginalFilename", "psqlodbc.dll\0"
231+
VALUE "PrivateBuild", "\0"
230232
VALUE "ProductName", "Microsoft Open Database Connectivity\0"
231-
VALUE "ProductVersion", " 6.40.0009\0"
233+
VALUE "ProductVersion", " 7.1.0000\0"
234+
VALUE "SpecialBuild", "\0"
232235
END
233236
END
234237
BLOCK "VarFileInfo"

src/interfaces/odbc/resource.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/*{{NO_DEPENDENCIES}} */
2-
/* Microsoft Developer Studio generated include file. */
3-
/* Used by psqlodbc.rc */
4-
/* */
1+
//{{NO_DEPENDENCIES}}
2+
// Microsoft Developer Studio generated include file.
3+
// Used by psqlodbc.rc
4+
//
55
#define IDS_BADDSN 1
66
#define IDS_MSGTITLE 2
77
#define DLG_OPTIONS_DRV 102
@@ -50,8 +50,8 @@
5050
#define DS_PG64 1057
5151
#define DS_PG63 1058
5252

53-
/* Next default values for new objects */
54-
/* */
53+
// Next default values for new objects
54+
//
5555
#ifdef APSTUDIO_INVOKED
5656
#ifndef APSTUDIO_READONLY_SYMBOLS
5757
#define _APS_NEXT_RESOURCE_VALUE 104

0 commit comments

Comments
 (0)