From 557aa20d32eaed71809935443e11b212325b4c24 Mon Sep 17 00:00:00 2001
From: freemine <freemine@yeah.net>
Date: Sat, 7 Nov 2020 10:41:30 +0800
Subject: [PATCH] 1. setup dll functions (ConfigDSN ...) compiled and exported
 only on windows 2. add 'Server' key in Odbc.ini to allow connecting server
 other than localhost    via DSN

---
 src/connector/odbc/src/install.sh |  5 +--
 src/connector/odbc/src/todbc.c    | 59 ++++++++++++++++---------------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/connector/odbc/src/install.sh b/src/connector/odbc/src/install.sh
index 6f45ce4357..02f31de70e 100755
--- a/src/connector/odbc/src/install.sh
+++ b/src/connector/odbc/src/install.sh
@@ -9,14 +9,15 @@ rm -f "${BLD_DIR}/template.dsn"
 
 cat > "${BLD_DIR}/template.ini" <<EOF
 [TAOS]
-Description = taos odbc driver
-Driver = ${BLD_DIR}/build/lib/libtodbc.so
+Description=taos odbc driver
+Driver=${BLD_DIR}/build/lib/libtodbc.so
 EOF
 
 cat > "${BLD_DIR}/template.dsn" <<EOF
 [TAOS_DSN]
 Description=Connection to TAOS
 Driver=TAOS
+Server=localhost:6030
 EOF
 
 # better remove first ?
diff --git a/src/connector/odbc/src/todbc.c b/src/connector/odbc/src/todbc.c
index 6a52146239..efd4570d77 100644
--- a/src/connector/odbc/src/todbc.c
+++ b/src/connector/odbc/src/todbc.c
@@ -555,50 +555,48 @@ static SQLRETURN doSQLConnect(SQLHDBC ConnectionHandle,
   }
 
   tsdb_conv_t *client_to_server = tsdb_conn_client_to_server(conn);
-  const char *serverName = NULL;
-  const char *userName   = NULL;
-  const char *auth       = NULL;
+  const char *dsn = NULL;
+  const char *uid = NULL;
+  const char *pwd = NULL;
+  const char *svr = NULL;
+  char server[4096]; server[0] = '\0';
 
   do {
-    D("server: %s", serverName);
-    D("user: %s", userName);
-    D("auth: %s", auth);
-    tsdb_conv(client_to_server, &buffer, (const char*)ServerName,     (size_t)NameLength1, &serverName, NULL);
-    tsdb_conv(client_to_server, &buffer, (const char*)UserName,       (size_t)NameLength2, &userName,   NULL);
-    tsdb_conv(client_to_server, &buffer, (const char*)Authentication, (size_t)NameLength3, &auth,       NULL);
-    D("server: %s", serverName);
-    D("user: %s", userName);
-    D("auth: %s", auth);
-    char sbuf[4096]; sbuf[0] = '\0';
-    int n = SQLGetPrivateProfileString(serverName, "Server", "null", sbuf, sizeof(sbuf)-1, "Odbc.ini");
-    D("n: %d", n);
-    D("sbuf: [%s]", sbuf);
-    if (n==0) snprintf(sbuf, sizeof(sbuf), "localhost:6030");
-    char *ip         = NULL;
-    int   port       = 0;
-    char *p = strchr(sbuf, ':');
-    if (p) {
-      ip = strndup(sbuf, (size_t)(p-sbuf));
-      port = atoi(p+1);
+    tsdb_conv(client_to_server, &buffer, (const char*)ServerName,     (size_t)NameLength1, &dsn, NULL);
+    tsdb_conv(client_to_server, &buffer, (const char*)UserName,       (size_t)NameLength2, &uid, NULL);
+    tsdb_conv(client_to_server, &buffer, (const char*)Authentication, (size_t)NameLength3, &pwd, NULL);
+    int n = SQLGetPrivateProfileString(dsn, "Server", "", server, sizeof(server)-1, "Odbc.ini");
+    if (n<=0) {
+      snprintf(server, sizeof(server), "localhost:6030"); // all 7-bit ascii
     }
+    tsdb_conv(client_to_server, &buffer, (const char*)server, (size_t)strlen(server), &svr, NULL);
 
-    if ((!serverName) || (!userName) || (!auth)) {
+    if ((!dsn) || (!uid) || (!pwd) || (!svr)) {
       SET_ERROR(conn, "HY001", TSDB_CODE_ODBC_OOM, "");
       break;
     }
 
+    char *ip         = NULL;
+    int   port       = 0;
+    char *p = strchr(svr, ':');
+    if (p) {
+      ip = strndup(svr, (size_t)(p-svr));
+      port = atoi(p+1);
+    }
+
     // TODO: data-race
     // TODO: shall receive ip/port from odbc.ini
-    conn->taos = taos_connect(ip, userName, auth, NULL, port);
+    conn->taos = taos_connect(ip, uid, pwd, NULL, (uint16_t)port);
     if (!conn->taos) {
-      SET_ERROR(conn, "08001", terrno, "failed to connect to data source");
+      SET_ERROR(conn, "08001", terrno, "failed to connect to data source for DSN[%s] @[%s:%d]", dsn, ip, port);
       break;
     }
   } while (0);
 
-  tsdb_conv_free(client_to_server, serverName, &buffer, (const char*)ServerName);
-  tsdb_conv_free(client_to_server, userName,   &buffer, (const char*)UserName);
-  tsdb_conv_free(client_to_server, auth,       &buffer, (const char*)Authentication);
+  tsdb_conv_free(client_to_server, dsn, &buffer, (const char*)ServerName);
+  tsdb_conv_free(client_to_server, uid, &buffer, (const char*)UserName);
+  tsdb_conv_free(client_to_server, pwd, &buffer, (const char*)Authentication);
+  tsdb_conv_free(client_to_server, svr, &buffer, (const char*)server);
 
   return conn->taos ? SQL_SUCCESS : SQL_ERROR;
 }
@@ -2877,6 +2875,8 @@ SQLRETURN SQL_API SQLSetStmtAttr(SQLHSTMT StatementHandle,
   return r;
 }
 
+#ifdef _MSC_VER
+
 #define LOG(fmt, ...)                                \
 do {                                                 \
   FILE *fout = fopen("C:\\test\\test.log", "ab+");   \
@@ -3125,6 +3125,7 @@ BOOL INSTAPI ConfigDriver(HWND hwndParent, WORD fRequest, LPCSTR lpszDriver, LPC
   return FALSE;
 }
 
+#endif // _MSC_VER
 
 
 static void init_routine(void) {
-- 
GitLab