mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug about the handling of CX parameter of the connection string

Browse Source 
reported by Sergey Smirnov.
This commit is contained in:
Hiroshi Inoue 2002-07-26 08:45:54 +00:00
parent 40c44166dc
commit c3fdf8925e
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/interfaces/odbc/connection.c
View File

@ -112,6 +112,7 @@ PGAPI_Connect(
make_string(szDSN, cbDSN, ci->dsn); make_string(szDSN, cbDSN, ci->dsn);
/* get the values for the DSN from the registry */ /* get the values for the DSN from the registry */
memcpy(&ci->drivers, &globals, sizeof(globals));
getDSNinfo(ci, CONN_OVERWRITE); getDSNinfo(ci, CONN_OVERWRITE);
logs_on_off(1, ci->drivers.debug, ci->drivers.commlog); logs_on_off(1, ci->drivers.debug, ci->drivers.commlog);
/* initialize pg_version from connInfo.protocol */ /* initialize pg_version from connInfo.protocol */

1
src/interfaces/odbc/dlg_specific.c
View File

@ -421,7 +421,6 @@ getDSNinfo(ConnInfo *ci, char overwrite)
* If a driver keyword was present, then dont use a DSN and return. * If a driver keyword was present, then dont use a DSN and return.
* If DSN is null and no driver, then use the default datasource. * If DSN is null and no driver, then use the default datasource.
*/ */
memcpy(&ci->drivers, &globals, sizeof(globals));
if (DSN[0] == '\0') if (DSN[0] == '\0')
{ {
if (ci->driver[0] != '\0') if (ci->driver[0] != '\0')

6
src/interfaces/odbc/psqlodbc.rc
View File

@ -62,8 +62,8 @@ FONT 10, "Terminal"
BEGIN BEGIN
RTEXT "&Data Source",IDC_DSNAMETEXT,5,11,50,12,NOT WS_GROUP RTEXT "&Data Source",IDC_DSNAMETEXT,5,11,50,12,NOT WS_GROUP
EDITTEXT IDC_DSNAME,57,10,72,12,ES_AUTOHSCROLL | WS_GROUP EDITTEXT IDC_DSNAME,57,10,72,12,ES_AUTOHSCROLL | WS_GROUP
RTEXT "Des&cription",IDC_DESCTEXT,134,11,39,12,NOT WS_GROUP RTEXT "Des&cription",IDC_DESCTEXT,129,10,45,12,NOT WS_GROUP
EDITTEXT IDC_DESC,175,10,108,12,ES_AUTOHSCROLL EDITTEXT IDC_DESC,176,10,107,12,ES_AUTOHSCROLL
RTEXT "Data&base",IDC_STATIC,16,26,38,12,NOT WS_GROUP RTEXT "Data&base",IDC_STATIC,16,26,38,12,NOT WS_GROUP
EDITTEXT IDC_DATABASE,57,25,72,12,ES_AUTOHSCROLL EDITTEXT IDC_DATABASE,57,25,72,12,ES_AUTOHSCROLL
RTEXT "&Server",IDC_STATIC,26,41,29,12,NOT WS_GROUP RTEXT "&Server",IDC_STATIC,26,41,29,12,NOT WS_GROUP
@ -171,7 +171,7 @@ BEGIN
WS_TABSTOP,227,95,29,10 WS_TABSTOP,227,95,29,10
GROUPBOX "Protocol",IDC_STATIC,5,115,277,25 GROUPBOX "Protocol",IDC_STATIC,5,115,277,25
CONTROL "7.X,6.4+",DS_PG64,"Button",BS_AUTORADIOBUTTON | CONTROL "7.X,6.4+",DS_PG64,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,44,126,35,10 WS_GROUP,44,126,49,10
CONTROL "6.3",DS_PG63,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, CONTROL "6.3",DS_PG63,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,
117,126,26,10 117,126,26,10
CONTROL "6.2",DS_PG62,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, CONTROL "6.2",DS_PG62,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,

2
src/interfaces/odbc/setup.c
View File

@ -27,6 +27,7 @@
#define INTFUNC __stdcall #define INTFUNC __stdcall
extern HINSTANCE NEAR s_hModule; /* Saved module handle. */ extern HINSTANCE NEAR s_hModule; /* Saved module handle. */
extern GLOBAL_VALUES globals;
/* Constants */ /* Constants */
#define MIN(x,y) ((x) < (y) ? (x) : (y)) #define MIN(x,y) ((x) < (y) ? (x) : (y))
@ -217,6 +218,7 @@ ConfigDlgProc(HWND hdlg,
*/ */
/* override settings in ODBC.INI */ /* override settings in ODBC.INI */
memcpy(&ci->drivers, &globals, sizeof(globals));
/* Get the rest of the common attributes */ /* Get the rest of the common attributes */
getDSNinfo(ci, CONN_DONT_OVERWRITE); getDSNinfo(ci, CONN_DONT_OVERWRITE);