NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commite937156

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 recentrevisions.Regards, Dave Page

1 parent8f17e53 commite937156Copy full SHA for e937156

File tree

4 files changed

+71

-72

lines changed

src/interfaces/odbc

4 files changed

+71

-72

lines changed

`‎src/interfaces/odbc/info.c`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,8 @@ SQLGetInfo(`
`201`	`201`
`202`	`202`	`/*`
`203`	`203`	`* The ODBC spec wants ##.##.#### ...whatever... so prepend`
`204`		`- * the driver`
	`204`	`+ * the driver version number to the dbms version string`
`205`	`205`	`*/`
`206`		`-/* version number to the dbms version string */`
`207`	`206`	`sprintf(tmp,"%s %s",POSTGRESDRIVERVERSION,conn->pg_version);`
`208`	`207`	`p=tmp;`
`209`	`208`	`break;`

`‎src/interfaces/odbc/psqlodbc.h`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Comments:See "notice.txt" for copyright and license information.`
`8`	`8`	`*`
`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 $`
`10`	`10`	`*/`
`11`	`11`
`12`	`12`	`#ifndef__PSQLODBC_H__`
`@@ -42,7 +42,7 @@ typedef UInt4 Oid;`
`42`	`42`	`#defineDRIVERNAME "PostgreSQL ODBC"`
`43`	`43`	`#defineDBMS_NAME "PostgreSQL"`
`44`	`44`
`45`		`-#definePOSTGRESDRIVERVERSION "07.01.0002"`
	`45`	`+#definePOSTGRESDRIVERVERSION "07.01.0003"`
`46`	`46`
`47`	`47`	`#ifdefWIN32`
`48`	`48`	`#defineDRIVER_FILE_NAME"PSQLODBC.DLL"`

`‎src/interfaces/odbc/psqlodbc.rc`

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ BEGIN`
`133`	`133`	`PUSHBUTTON "Defaults",IDDEFAULTS,185,205,50,15`
`134`	`134`	`END`
`135`	`135`
`136`		`-DLG_OPTIONS_DS DIALOG DISCARDABLE 0, 0, 267,161`
	`136`	`+DLG_OPTIONS_DS DIALOG DISCARDABLE 0, 0, 267,125`
`137`	`137`	`STYLE DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU`
`138`	`138`	`CAPTION "Advanced Options (DataSource)"`
`139`	`139`	`FONT 8, "MS Sans Serif"`
`@@ -144,16 +144,16 @@ BEGIN`
`144`	`144`	`BS_AUTOCHECKBOX \| WS_TABSTOP,130,10,85,10`
`145`	`145`	`CONTROL "Show System &Tables",DS_SHOWSYSTEMTABLES,"Button",`
`146`	`146`	`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`
`148`	`148`	`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`
`150`	`150`	`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 \|`
`154`	`154`	`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`
`157`	`157`	`END`
`158`	`158`
`159`	`159`
`@@ -184,7 +184,7 @@ BEGIN`
`184`	`184`	`RIGHTMARGIN, 260`
`185`	`185`	`VERTGUIDE, 55`
`186`	`186`	`TOPMARGIN, 7`
`187`		`- BOTTOMMARGIN,154`
	`187`	`+ BOTTOMMARGIN,118`
`188`	`188`	`END`
`189`	`189`	`END`
`190`	`190`	`#endif // APSTUDIO_INVOKED`
`@@ -197,8 +197,8 @@ END`
`197`	`197`	`//`
`198`	`198`
`199`	`199`	`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`
`202`	`202`	`FILEFLAGSMASK 0x3L`
`203`	`203`	`#ifdef _DEBUG`
`204`	`204`	`FILEFLAGS 0x1L`
`@@ -216,14 +216,14 @@ BEGIN`
`216`	`216`	`VALUE "Comments", "PostgreSQL ODBC driver\0"`
`217`	`217`	`VALUE "CompanyName", "Insight Distribution Systems\0"`
`218`	`218`	`VALUE "FileDescription", "PostgreSQL Driver\0"`
`219`		`- VALUE "FileVersion", " 07.01.0002\0"`
	`219`	`+ VALUE "FileVersion", " 07.01.0003\0"`
`220`	`220`	`VALUE "InternalName", "psqlodbc\0"`
`221`	`221`	`VALUE "LegalCopyright", "\0"`
`222`	`222`	`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"`
`223`	`223`	`VALUE "OriginalFilename", "psqlodbc.dll\0"`
`224`	`224`	`VALUE "PrivateBuild", "\0"`
`225`	`225`	`VALUE "ProductName", "Microsoft Open Database Connectivity\0"`
`226`		`- VALUE "ProductVersion", " 07.01.0002\0"`
	`226`	`+ VALUE "ProductVersion", " 07.01.0003\0"`
`227`	`227`	`VALUE "SpecialBuild", "\0"`
`228`	`228`	`END`
`229`	`229`	`END`

`‎src/interfaces/odbc/resource.h`

Lines changed: 55 additions & 55 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,60 +1,60 @@`
`1`		`-/* {{NO_DEPENDENCIES}} */`
`2`		`-/* Microsoft Developer Studio generated include file. */`
`3`		`-/* Used by psqlodbc.rc */`
`4`		`-`
`5`		`-#defineIDS_BADDSN1`
`6`		`-#defineIDS_MSGTITLE2`
`7`		`-#defineDLG_OPTIONS_DRV102`
`8`		`-#defineDLG_OPTIONS_DS103`
`9`		`-#defineIDC_DSNAME400`
`10`		`-#defineIDC_DSNAMETEXT401`
`11`		`-#defineIDC_DESC404`
`12`		`-#defineIDC_SERVER407`
`13`		`-#defineIDC_DATABASE408`
`14`		`-#defineDLG_CONFIG1001`
`15`		`-#defineIDC_PORT1002`
`16`		`-#defineIDC_USER1006`
`17`		`-#defineIDC_PASSWORD1009`
`18`		`-#defineDS_READONLY1011`
`19`		`-#defineDS_SHOWOIDCOLUMN1012`
`20`		`-#defineDS_FAKEOIDINDEX1013`
`21`		`-#defineDRV_COMMLOG1014`
`22`		`-#defineIDC_DATASOURCE1018`
`23`		`-#defineDRV_OPTIMIZER1019`
`24`		`-#defineDS_CONNSETTINGS1020`
`25`		`-#defineIDC_DRIVER1021`
`26`		`-#defineDRV_CONNSETTINGS1031`
`27`		`-#defineDRV_UNIQUEINDEX1032`
`28`		`-#defineDRV_UNKNOWN_MAX1035`
`29`		`-#defineDRV_UNKNOWN_DONTKNOW1036`
`30`		`-#defineDRV_READONLY1037`
`31`		`-#defineIDC_DESCTEXT1039`
`32`		`-#defineDRV_MSG_LABEL1040`
`33`		`-#defineDRV_UNKNOWN_LONGEST1041`
`34`		`-#defineDRV_TEXT_LONGVARCHAR1043`
`35`		`-#defineDRV_UNKNOWNS_LONGVARCHAR1044`
`36`		`-#defineDRV_CACHE_SIZE1045`
`37`		`-#defineDRV_VARCHAR_SIZE1046`
`38`		`-#defineDRV_LONGVARCHAR_SIZE1047`
`39`		`-#defineIDDEFAULTS1048`
`40`		`-#defineDRV_USEDECLAREFETCH1049`
`41`		`-#defineDRV_BOOLS_CHAR1050`
`42`		`-#defineDS_SHOWSYSTEMTABLES1051`
`43`		`-#defineDRV_EXTRASYSTABLEPREFIXES1051`
`44`		`-#defineDS_ROWVERSIONING1052`
`45`		`-#defineDRV_PARSE1052`
`46`		`-#defineDRV_CANCELASFREESTMT1053`
`47`		`-#defineIDC_OPTIONS1054`
`48`		`-#defineDRV_KSQO1055`
`49`		`-#defineDS_PG641057`
`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`	`+#defineIDS_BADDSN 1`
	`6`	`+#defineIDS_MSGTITLE 2`
	`7`	`+#defineDLG_OPTIONS_DRV 102`
	`8`	`+#defineDLG_OPTIONS_DS 103`
	`9`	`+#defineIDC_DSNAME 400`
	`10`	`+#defineIDC_DSNAMETEXT 401`
	`11`	`+#defineIDC_DESC 404`
	`12`	`+#defineIDC_SERVER 407`
	`13`	`+#defineIDC_DATABASE 408`
	`14`	`+#defineDLG_CONFIG 1001`
	`15`	`+#defineIDC_PORT 1002`
	`16`	`+#defineIDC_USER 1006`
	`17`	`+#defineIDC_PASSWORD 1009`
	`18`	`+#defineDS_READONLY 1011`
	`19`	`+#defineDS_SHOWOIDCOLUMN 1012`
	`20`	`+#defineDS_FAKEOIDINDEX 1013`
	`21`	`+#defineDRV_COMMLOG 1014`
	`22`	`+#defineIDC_DATASOURCE 1018`
	`23`	`+#defineDRV_OPTIMIZER 1019`
	`24`	`+#defineDS_CONNSETTINGS 1020`
	`25`	`+#defineIDC_DRIVER 1021`
	`26`	`+#defineDRV_CONNSETTINGS 1031`
	`27`	`+#defineDRV_UNIQUEINDEX 1032`
	`28`	`+#defineDRV_UNKNOWN_MAX 1035`
	`29`	`+#defineDRV_UNKNOWN_DONTKNOW 1036`
	`30`	`+#defineDRV_READONLY 1037`
	`31`	`+#defineIDC_DESCTEXT 1039`
	`32`	`+#defineDRV_MSG_LABEL 1040`
	`33`	`+#defineDRV_UNKNOWN_LONGEST 1041`
	`34`	`+#defineDRV_TEXT_LONGVARCHAR 1043`
	`35`	`+#defineDRV_UNKNOWNS_LONGVARCHAR 1044`
	`36`	`+#defineDRV_CACHE_SIZE 1045`
	`37`	`+#defineDRV_VARCHAR_SIZE 1046`
	`38`	`+#defineDRV_LONGVARCHAR_SIZE 1047`
	`39`	`+#defineIDDEFAULTS 1048`
	`40`	`+#defineDRV_USEDECLAREFETCH 1049`
	`41`	`+#defineDRV_BOOLS_CHAR 1050`
	`42`	`+#defineDS_SHOWSYSTEMTABLES 1051`
	`43`	`+#defineDRV_EXTRASYSTABLEPREFIXES 1051`
	`44`	`+#defineDS_ROWVERSIONING 1052`
	`45`	`+#defineDRV_PARSE 1052`
	`46`	`+#defineDRV_CANCELASFREESTMT 1053`
	`47`	`+#defineIDC_OPTIONS 1054`
	`48`	`+#defineDRV_KSQO 1055`
	`49`	`+#defineDS_PG64 1057`
`52`	`50`
	`51`	`+// Next default values for new objects`
	`52`	`+//`
`53`	`53`	`#ifdefAPSTUDIO_INVOKED`
`54`	`54`	`#ifndefAPSTUDIO_READONLY_SYMBOLS`
`55`		`-#define_APS_NEXT_RESOURCE_VALUE104`
`56`		`-#define_APS_NEXT_COMMAND_VALUE40001`
`57`		`-#define_APS_NEXT_CONTROL_VALUE1060`
`58`		`-#define_APS_NEXT_SYMED_VALUE101`
	`55`	`+#define_APS_NEXT_RESOURCE_VALUE104`
	`56`	`+#define_APS_NEXT_COMMAND_VALUE40001`
	`57`	`+#define_APS_NEXT_CONTROL_VALUE1060`
	`58`	`+#define_APS_NEXT_SYMED_VALUE101`
`59`	`59`	`#endif`
`60`	`60`	`#endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite937156

File tree

4 files changed

4 files changed

`‎src/interfaces/odbc/info.c`

`‎src/interfaces/odbc/psqlodbc.h`

`‎src/interfaces/odbc/psqlodbc.rc`

`‎src/interfaces/odbc/resource.h`

0 commit comments