Changeset: 1574d2b620c1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1574d2b620c1
Modified Files:
clients/odbc/winsetup/resource.h
clients/odbc/winsetup/setup.c
clients/odbc/winsetup/setup.rc
Branch: odbc-tls
Log Message:
Extend ODBC Data Source config dialog with new connection options. WIP
diffs (117 lines):
diff --git a/clients/odbc/winsetup/resource.h b/clients/odbc/winsetup/resource.h
--- a/clients/odbc/winsetup/resource.h
+++ b/clients/odbc/winsetup/resource.h
@@ -23,6 +23,18 @@
#define IDC_EDIT_PORT 2005
#define IDC_EDIT_DATABASE 2006
#define IDC_EDIT_LOGFILE 2007
+// new from Jun2024
+#define IDC_EDIT_AUTOCOMMIT 2011
+#define IDC_EDIT_REPLYSIZE 2012
+#define IDC_EDIT_SCHEMA 2013
+#define IDC_EDIT_TIMEZONE 2014
+// Secure connections using TLS
+#define IDC_EDIT_TLS 2021
+#define IDC_EDIT_SERVERCERT 2022
+#define IDC_EDIT_SERVERCERTHASH 2023
+#define IDC_EDIT_CLIENTKEY 2024
+#define IDC_EDIT_CLIENTCERT 2025
+
#define IDC_BUTTON_CANCEL 2008
// Next default values for new objects
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
@@ -96,7 +96,17 @@ struct data {
char *host;
char *port;
char *database;
+ char *schema;
+ bool autocommit = true;
+ long replysize;
+ long timezone;
char *logfile;
+ // TLS settings
+ bool use_tls = false;
+ char *servercert;
+ char *servercerthash;
+ char *clientkey;
+ char *clientcert;
HWND parent;
WORD request;
};
@@ -235,6 +245,18 @@ ConfigDSN(HWND parent, WORD request, LPC
data.port = NULL;
data.database = NULL;
data.logfile = NULL;
+ data.schema = NULL;
+ data.autocommit = true;
+// data.replysize = 1000;
+// data.timezone;
+ data.logfile = NULL;
+ // TLS settings
+ data.use_tls = false;
+ data.servercert = NULL;
+ data.servercerthash = NULL;
+ data.clientkey = NULL;
+ data.clientcert = NULL;
+
data.parent = parent;
data.request = request;
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -103,27 +103,45 @@ END
// Dialog
//
-IDD_SETUP_DIALOG DIALOGEX 0, 0, 210, 179
+IDD_SETUP_DIALOG DIALOGEX 0, 0, 210, 323
STYLE DS_MODALFRAME | WS_CAPTION
CAPTION "MonetDB Data Source Configuration"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
EDITTEXT IDC_EDIT_DSN,75,40,128,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_UID,75,56,128,14,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_PWD,75,72,128,14,ES_PASSWORD | ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_PWD,75,72,128,14,ES_AUTOHSCROLL | ES_PASSWORD
EDITTEXT IDC_EDIT_HOST,75,88,128,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_PORT,75,104,128,14,ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_EDIT_DATABASE,75,120,128,14,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_LOGFILE,75,136,128,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_SCHEMA,75,136,128,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_AUTOCOMMIT,75,152,128,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_REPLYSIZE,75,168,128,14,ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_EDIT_TIMEZONE,75,184,128,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_LOGFILE,75,200,128,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_TLS,75,216,128,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_SERVERCERT,75,232,128,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_SERVERCERTHASH,75,248,128,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_CLIENTKEY,75,264,128,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_CLIENTCERT,75,280,128,14,ES_AUTOHSCROLL
LTEXT "Data Source Name",IDC_STATIC,7,42,63,8
LTEXT "User Name",IDC_STATIC,7,58,36,8
LTEXT "Password",IDC_STATIC,7,74,32,8
LTEXT "Host",IDC_STATIC,7,90,16,8
LTEXT "Port",IDC_STATIC,7,106,14,8
LTEXT "Database",IDC_STATIC,7,122,32,8
- LTEXT "Logfile",IDC_STATIC,7,138,32,8
- DEFPUSHBUTTON "OK",IDOK,7,157,50,14
- PUSHBUTTON "Cancel",IDCANCEL,153,157,50,14
+ LTEXT "Schema",IDC_STATIC,7,138,32,8
+ LTEXT "Autocommit On/Off",IDC_STATIC,7,154,63,8
+ LTEXT "Reply Size",IDC_STATIC,7,170,32,8
+ LTEXT "Timezone",IDC_STATIC,7,186,32,8
+ LTEXT "Logfile",IDC_STATIC,7,202,32,8
+ LTEXT "TLS Encrypt On/Off",IDC_STATIC,7,218,66,8
+ LTEXT "Server Certificate",IDC_STATIC,7,234,66,8
+ LTEXT "Server Certificate Hash",IDC_STATIC,7,250,70,8
+ LTEXT "Client Key",IDC_STATIC,7,266,36,8
+ LTEXT "Client Certificate",IDC_STATIC,7,282,66,8
+ DEFPUSHBUTTON "OK",IDOK,7,301,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,153,301,50,14
CONTROL 2000,IDC_STATIC,"Static",SS_BITMAP,0,0,240,37
END
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
