Changeset: a1e33da300d6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a1e33da300d6
Modified Files:
clients/odbc/winsetup/install.c
clients/odbc/winsetup/setup.c
Branch: Jun2023
Log Message:
Trying to get the ODBC installer to work again.
diffs (41 lines):
diff --git a/clients/odbc/winsetup/install.c b/clients/odbc/winsetup/install.c
--- a/clients/odbc/winsetup/install.c
+++ b/clients/odbc/winsetup/install.c
@@ -164,7 +164,7 @@ static void
CreateAttributeString(char *attrs, size_t len, const char *dsn)
{
snprintf(attrs, len,
-
"DSN=%s;Server=localhost;Database=;UID=monetdb;PWD=monetdb;",
+
"DSN=%s;Server=localhost;Database=;UID=monetdb;PWD=monetdb;Logfile=;",
dsn);
for (; *attrs; attrs++)
diff --git a/clients/odbc/winsetup/setup.c b/clients/odbc/winsetup/setup.c
--- a/clients/odbc/winsetup/setup.c
+++ b/clients/odbc/winsetup/setup.c
@@ -387,8 +387,7 @@ ConfigDSN(HWND parent, WORD request, LPC
!SQLWritePrivateProfileString(data.dsn, "pwd", data.pwd,
"odbc.ini") ||
!SQLWritePrivateProfileString(data.dsn, "host", data.host,
"odbc.ini") ||
!SQLWritePrivateProfileString(data.dsn, "port", data.port,
"odbc.ini") ||
- !SQLWritePrivateProfileString(data.dsn, "database", data.database,
"odbc.ini") ||
- !SQLWritePrivateProfileString(data.dsn, "logfile", data.logfile,
"odbc.ini")) {
+ !SQLWritePrivateProfileString(data.dsn, "database", data.database,
"odbc.ini")) {
rc = FALSE;
if (parent)
MessageBox(parent,
@@ -400,6 +399,15 @@ ConfigDSN(HWND parent, WORD request, LPC
goto finish;
}
+ if (!SQLWritePrivateProfileString(data.dsn, "logfile", data.logfile,
"odbc.ini")) {
+ if (parent)
+ MessageBox(parent,
+ "Error writing logfile configuration data to
registry",
+ NULL,
+ MB_ICONERROR);
+ goto finish;
+ }
+
finish:
if (data.dsn)
free(data.dsn);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
