Skip to content

Commit e937156

Browse files
bmomjianbmomjian
committed
The attached patch does the following:
1) Tidies up the Datasource Dialogue now the version options are gone. 2) Tidies a comment in info.c. 3) Increments all version numbers to 07.01.0003 to take account of recent revisions. Regards, Dave Page
1 parent 8f17e53 commit e937156

File tree

4 files changed

+71
-72
lines changed

4 files changed

+71
-72
lines changed

‎src/interfaces/odbc/info.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,8 @@ SQLGetInfo(
201201

202202
/*
203203
* The ODBC spec wants ##.##.#### ...whatever... so prepend
204-
* the driver
204+
* the driver version number to the dbms version string
205205
*/
206-
/* version number to the dbms version string */
207206
sprintf(tmp, "%s %s", POSTGRESDRIVERVERSION, conn->pg_version);
208207
p = tmp;
209208
break;

‎src/interfaces/odbc/psqlodbc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Comments: See "notice.txt" for copyright and license information.
88
*
9-
* $Id: psqlodbc.h,v 1.32 2001/02/10 07:01:19 momjian Exp $
9+
* $Id: psqlodbc.h,v 1.33 2001/02/11 02:01:22 momjian Exp $
1010
*/
1111

1212
#ifndef __PSQLODBC_H__
@@ -42,7 +42,7 @@ typedef UInt4 Oid;
4242
#define DRIVERNAME "PostgreSQL ODBC"
4343
#define DBMS_NAME "PostgreSQL"
4444

45-
#define POSTGRESDRIVERVERSION "07.01.0002"
45+
#define POSTGRESDRIVERVERSION "07.01.0003"
4646

4747
#ifdef WIN32
4848
#define DRIVER_FILE_NAME "PSQLODBC.DLL"

‎src/interfaces/odbc/psqlodbc.rc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ BEGIN
133133
PUSHBUTTON "Defaults",IDDEFAULTS,185,205,50,15
134134
END
135135

136-
DLG_OPTIONS_DS DIALOG DISCARDABLE 0, 0, 267, 161
136+
DLG_OPTIONS_DS DIALOG DISCARDABLE 0, 0, 267, 125
137137
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
138138
CAPTION "Advanced Options (DataSource)"
139139
FONT 8, "MS Sans Serif"
@@ -144,16 +144,16 @@ BEGIN
144144
BS_AUTOCHECKBOX | WS_TABSTOP,130,10,85,10
145145
CONTROL "Show System &Tables",DS_SHOWSYSTEMTABLES,"Button",
146146
BS_AUTOCHECKBOX | WS_TABSTOP,25,25,85,10
147-
GROUPBOX "OID Options",IDC_STATIC,15,70,180,25
147+
GROUPBOX "OID Options",IDC_STATIC,39,41,180,25
148148
CONTROL "Show &Column",DS_SHOWOIDCOLUMN,"Button",BS_AUTOCHECKBOX |
149-
WS_GROUP | WS_TABSTOP,25,81,59,10
149+
WS_GROUP | WS_TABSTOP,62,51,59,10
150150
CONTROL "Fake &Index",DS_FAKEOIDINDEX,"Button",BS_AUTOCHECKBOX |
151-
WS_GROUP | WS_TABSTOP,115,81,51,10
152-
RTEXT "Connect &Settings:",IDC_STATIC,10,105,35,25
153-
EDITTEXT DS_CONNSETTINGS,50,105,200,20,ES_MULTILINE |
151+
WS_GROUP | WS_TABSTOP,151,51,51,10
152+
RTEXT "Connect &Settings:",IDC_STATIC,11,73,35,25
153+
EDITTEXT DS_CONNSETTINGS,49,73,200,20,ES_MULTILINE |
154154
ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
155-
DEFPUSHBUTTON "OK",IDOK,71,135,50,14,WS_GROUP
156-
PUSHBUTTON "Cancel",IDCANCEL,146,135,50,14
155+
DEFPUSHBUTTON "OK",IDOK,71,103,50,14,WS_GROUP
156+
PUSHBUTTON "Cancel",IDCANCEL,145,103,50,14
157157
END
158158

159159

@@ -184,7 +184,7 @@ BEGIN
184184
RIGHTMARGIN, 260
185185
VERTGUIDE, 55
186186
TOPMARGIN, 7
187-
BOTTOMMARGIN, 154
187+
BOTTOMMARGIN, 118
188188
END
189189
END
190190
#endif // APSTUDIO_INVOKED
@@ -197,8 +197,8 @@ END
197197
//
198198

199199
VS_VERSION_INFO VERSIONINFO
200-
FILEVERSION 7,1,0,2
201-
PRODUCTVERSION 7,1,0,2
200+
FILEVERSION 7,1,0,3
201+
PRODUCTVERSION 7,1,0,3
202202
FILEFLAGSMASK 0x3L
203203
#ifdef _DEBUG
204204
FILEFLAGS 0x1L
@@ -216,14 +216,14 @@ BEGIN
216216
VALUE "Comments", "PostgreSQL ODBC driver\0"
217217
VALUE "CompanyName", "Insight Distribution Systems\0"
218218
VALUE "FileDescription", "PostgreSQL Driver\0"
219-
VALUE "FileVersion", " 07.01.0002\0"
219+
VALUE "FileVersion", " 07.01.0003\0"
220220
VALUE "InternalName", "psqlodbc\0"
221221
VALUE "LegalCopyright", "\0"
222222
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"
223223
VALUE "OriginalFilename", "psqlodbc.dll\0"
224224
VALUE "PrivateBuild", "\0"
225225
VALUE "ProductName", "Microsoft Open Database Connectivity\0"
226-
VALUE "ProductVersion", " 07.01.0002\0"
226+
VALUE "ProductVersion", " 07.01.0003\0"
227227
VALUE "SpecialBuild", "\0"
228228
END
229229
END

‎src/interfaces/odbc/resource.h

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
/* {{NO_DEPENDENCIES}} */
2-
/* Microsoft Developer Studio generated include file. */
3-
/* Used by psqlodbc.rc */
4-
5-
#define IDS_BADDSN 1
6-
#define IDS_MSGTITLE 2
7-
#define DLG_OPTIONS_DRV 102
8-
#define DLG_OPTIONS_DS 103
9-
#define IDC_DSNAME 400
10-
#define IDC_DSNAMETEXT 401
11-
#define IDC_DESC 404
12-
#define IDC_SERVER 407
13-
#define IDC_DATABASE 408
14-
#define DLG_CONFIG 1001
15-
#define IDC_PORT 1002
16-
#define IDC_USER 1006
17-
#define IDC_PASSWORD 1009
18-
#define DS_READONLY 1011
19-
#define DS_SHOWOIDCOLUMN 1012
20-
#define DS_FAKEOIDINDEX 1013
21-
#define DRV_COMMLOG 1014
22-
#define IDC_DATASOURCE 1018
23-
#define DRV_OPTIMIZER 1019
24-
#define DS_CONNSETTINGS 1020
25-
#define IDC_DRIVER 1021
26-
#define DRV_CONNSETTINGS 1031
27-
#define DRV_UNIQUEINDEX 1032
28-
#define DRV_UNKNOWN_MAX 1035
29-
#define DRV_UNKNOWN_DONTKNOW 1036
30-
#define DRV_READONLY 1037
31-
#define IDC_DESCTEXT 1039
32-
#define DRV_MSG_LABEL 1040
33-
#define DRV_UNKNOWN_LONGEST 1041
34-
#define DRV_TEXT_LONGVARCHAR 1043
35-
#define DRV_UNKNOWNS_LONGVARCHAR 1044
36-
#define DRV_CACHE_SIZE 1045
37-
#define DRV_VARCHAR_SIZE 1046
38-
#define DRV_LONGVARCHAR_SIZE 1047
39-
#define IDDEFAULTS 1048
40-
#define DRV_USEDECLAREFETCH 1049
41-
#define DRV_BOOLS_CHAR 1050
42-
#define DS_SHOWSYSTEMTABLES 1051
43-
#define DRV_EXTRASYSTABLEPREFIXES 1051
44-
#define DS_ROWVERSIONING 1052
45-
#define DRV_PARSE 1052
46-
#define DRV_CANCELASFREESTMT 1053
47-
#define IDC_OPTIONS 1054
48-
#define DRV_KSQO 1055
49-
#define DS_PG64 1057
50-
51-
/* Next default values for new objects */
1+
//{{NO_DEPENDENCIES}}
2+
// Microsoft Developer Studio generated include file.
3+
// Used by psqlodbc.rc
4+
//
5+
#define IDS_BADDSN 1
6+
#define IDS_MSGTITLE 2
7+
#define DLG_OPTIONS_DRV 102
8+
#define DLG_OPTIONS_DS 103
9+
#define IDC_DSNAME 400
10+
#define IDC_DSNAMETEXT 401
11+
#define IDC_DESC 404
12+
#define IDC_SERVER 407
13+
#define IDC_DATABASE 408
14+
#define DLG_CONFIG 1001
15+
#define IDC_PORT 1002
16+
#define IDC_USER 1006
17+
#define IDC_PASSWORD 1009
18+
#define DS_READONLY 1011
19+
#define DS_SHOWOIDCOLUMN 1012
20+
#define DS_FAKEOIDINDEX 1013
21+
#define DRV_COMMLOG 1014
22+
#define IDC_DATASOURCE 1018
23+
#define DRV_OPTIMIZER 1019
24+
#define DS_CONNSETTINGS 1020
25+
#define IDC_DRIVER 1021
26+
#define DRV_CONNSETTINGS 1031
27+
#define DRV_UNIQUEINDEX 1032
28+
#define DRV_UNKNOWN_MAX 1035
29+
#define DRV_UNKNOWN_DONTKNOW 1036
30+
#define DRV_READONLY 1037
31+
#define IDC_DESCTEXT 1039
32+
#define DRV_MSG_LABEL 1040
33+
#define DRV_UNKNOWN_LONGEST 1041
34+
#define DRV_TEXT_LONGVARCHAR 1043
35+
#define DRV_UNKNOWNS_LONGVARCHAR 1044
36+
#define DRV_CACHE_SIZE 1045
37+
#define DRV_VARCHAR_SIZE 1046
38+
#define DRV_LONGVARCHAR_SIZE 1047
39+
#define IDDEFAULTS 1048
40+
#define DRV_USEDECLAREFETCH 1049
41+
#define DRV_BOOLS_CHAR 1050
42+
#define DS_SHOWSYSTEMTABLES 1051
43+
#define DRV_EXTRASYSTABLEPREFIXES 1051
44+
#define DS_ROWVERSIONING 1052
45+
#define DRV_PARSE 1052
46+
#define DRV_CANCELASFREESTMT 1053
47+
#define IDC_OPTIONS 1054
48+
#define DRV_KSQO 1055
49+
#define DS_PG64 1057
5250

51+
// Next default values for new objects
52+
//
5353
#ifdef APSTUDIO_INVOKED
5454
#ifndef APSTUDIO_READONLY_SYMBOLS
55-
#define _APS_NEXT_RESOURCE_VALUE 104
56-
#define _APS_NEXT_COMMAND_VALUE 40001
57-
#define _APS_NEXT_CONTROL_VALUE 1060
58-
#define _APS_NEXT_SYMED_VALUE 101
55+
#define _APS_NEXT_RESOURCE_VALUE 104
56+
#define _APS_NEXT_COMMAND_VALUE 40001
57+
#define _APS_NEXT_CONTROL_VALUE 1060
58+
#define _APS_NEXT_SYMED_VALUE 101
5959
#endif
6060
#endif

0 commit comments

Comments
 (0)