Added connection string SOCKET for connecting to unix sockets

Added cmake option DIRECT_LINK_TESTS to link tests directly against the connector
mariadb-corporation · Mar 16, 2015 · 2e8fc0c · 2e8fc0c
1 parent f7a63dc
commit 2e8fc0c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/cmake/FindDM.cmake b/cmake/FindDM.cmake
@@ -59,7 +59,6 @@ ELSE()
     MESSAGE(STATUS "Found ODBC Driver Manager includes: ${ODBC_INCLUDE_DIR}")
   ENDIF()
 
-
   # Try to find DM libraries, giving precedence to special variables
   FIND_PATH(ODBC_LIB_DIR libodbc.so
       HINTS ${DM_LIB_DIR}

diff --git a/ma_connection.c b/ma_connection.c
@@ -434,6 +434,12 @@ MADB_Dbc *MADB_DbcInit(SQLHANDLE OutputHandle)
   Connection->Environment->Dbcs= list_add(Connection->Environment->Dbcs, &Connection->ListItem);
   LeaveCriticalSection(&Connection->cs);
 
+  if (!(Connection->mariadb= mysql_init(NULL)))
+  {
+    MADB_SetError(&Connection->Error, MADB_ERR_HY001, NULL, 0);
+    goto cleanup;
+  }
+
   return Connection;      
 cleanup:
   if (Connection)
@@ -546,12 +552,6 @@ SQLRETURN MADB_DbcConnectDB(MADB_Dbc *Connection,
 
   MADB_CLEAR_ERROR(&Connection->Error);
 
-  if (!(Connection->mariadb= mysql_init(NULL)))
-  {
-    MADB_SetError(&Connection->Error, MADB_ERR_HY001, NULL, 0);
-    goto end;
-  }
-
   /* If a client character set was specified in DSN, we will always use it.
      Otherwise for ANSI applications we will use the current character set,
      for unicode connections we use utf8
@@ -611,9 +611,15 @@ SQLRETURN MADB_DbcConnectDB(MADB_Dbc *Connection,
   /* enable truncation reporting */
   mysql_options(Connection->mariadb, MYSQL_REPORT_DATA_TRUNCATION, &ReportDataTruncation);
 
+  if (Dsn->Socket)
+  {
+    int protocol= MYSQL_PROTOCOL_SOCKET;
+    mysql_options(Connection->mariadb, MYSQL_OPT_PROTOCOL, (void*)&protocol);
+  }
+
   if (!mysql_real_connect(Connection->mariadb,
-        Dsn->ServerName, Dsn->UserName, Dsn->Password,
-        Dsn->Catalog && Dsn->Catalog[0] ? Dsn->Catalog : NULL, Dsn->Port, NULL, client_flags))
+      Dsn->Socket ? "localhost" : Dsn->ServerName, Dsn->UserName, Dsn->Password,
+        Dsn->Catalog && Dsn->Catalog[0] ? Dsn->Catalog : NULL, Dsn->Port, Dsn->Socket, client_flags))
   {
     goto err;
   }

diff --git a/ma_dsn.c b/ma_dsn.c
@@ -43,6 +43,7 @@ MADB_DsnKey DsnKeys[]=
   {"PASSWORD", offsetof(MADB_Dsn, Password), DSN_TYPE_STRING,0,1},
   {"DB", offsetof(MADB_Dsn, Catalog), DSN_TYPE_COMBO,0,1},
   {"OPTION", offsetof(MADB_Dsn, Options), DSN_TYPE_INT, 0,1},
+  {"SOCKET", offsetof(MADB_Dsn, Socket), DSN_TYPE_STRING,0,0},
   {NULL, 0, DSN_TYPE_BOOL}
 };
 

diff --git a/ma_odbc.h b/ma_odbc.h
@@ -388,6 +388,7 @@ typedef struct st_madb_dsn
   my_bool MultiStatements;
   /* TRUE means "no prompt" */
   my_bool ConnectPrompt;
+  char *Socket;
   /* --- Internal --- */
   int isPrompt;
   MADB_DsnKey *Keys;

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -10,7 +10,11 @@ SET (ODBC_TESTS
 
 FOREACH (ODBC_TEST ${ODBC_TESTS})
   ADD_EXECUTABLE(${ODBC_TEST} ${ODBC_TEST}.c tap.h)
-  TARGET_LINK_LIBRARIES(${ODBC_TEST} ${ODBC_LIBS} ${MARIADB_LIB})
+  IF (DIRECT_LINK_TESTS)
+    TARGET_LINK_LIBRARIES(${ODBC_TEST} maodbc ${MARIADB_LIB})
+  ELSE()
+    TARGET_LINK_LIBRARIES(${ODBC_TEST} ${ODBC_LIBS} ${MARIADB_LIB})
+  ENDIF()
   ADD_TEST(${ODBC_TEST} ${EXECUTABLE_OUTPUT_PATH}/${ODBC_TEST})
   SET_TESTS_PROPERTIES(${ODBC_TEST} PROPERTIES TIMEOUT 120)
 ENDFOREACH()  

diff --git a/test/tap.h b/test/tap.h
@@ -114,7 +114,7 @@ unsigned long my_options= 67108866;
 SQLHANDLE Env, Connection, Stmt;
 
 unsigned int my_port= 3306;
-char ma_strport[]= ";PORT=3306";
+char ma_strport[12]= ";PORT=3306";
 
 /* To use in tests for conversion of strings to (sql)wchar strings */
 SQLWCHAR sqlwchar_buff[1024], sqlwchar_empty[]= {0};