odbc install directive moves into odbc-sub-module; client_to_env when SQL_CHAR in SQLExecDirect

cmake/install.inc

@@ -20,20 +20,12 @@ ELSEIF (TD_WINDOWS)
   INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
   INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver)
   INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)
-  if(FLEX_FOUND)
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/todbc.lib DESTINATION driver)
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/todbc.exp DESTINATION driver)
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/todbc.dll DESTINATION driver)
-  endif ()
 
   IF (TD_POWER)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/power.exe DESTINATION .)
   ELSE ()
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosdemo.exe DESTINATION .)
-    if(FLEX_FOUND)
-      INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/todbcinst.exe DESTINATION .)
-    endif ()
   ENDIF ()
 
   #INSTALL(TARGETS taos RUNTIME DESTINATION driver)

src/connector/odbc/src/CMakeLists.txt

@@ -47,4 +47,8 @@ IF (TD_WINDOWS_64)
                         /DEF:todbc.def)
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /GL")
   SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GL")
+
+  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/todbc.lib DESTINATION driver)
+  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/todbc.exp DESTINATION driver)
+  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/todbc.dll DESTINATION driver)
 ENDIF ()

src/connector/odbc/src/todbc.c

@@ -792,13 +792,13 @@ static SQLRETURN doSQLExecDirect(SQLHSTMT StatementHandle,
 
   SQLRETURN r = SQL_SUCCESS;
   stack_buffer_t buffer; buffer.next = 0;
-  tsdb_conv_t *client_to_server = tsdb_conn_client_to_server(conn);
+  tsdb_conv_t *client_to_env = tsdb_conn_client_to_env(conn);
   const char *stxt = NULL;
   do {
-    TSDB_CONV_CODE code = tsdb_conv(client_to_server, &buffer, (const char*)StatementText, (size_t)TextLength, &stxt, NULL);
+    TSDB_CONV_CODE code = tsdb_conv(client_to_env, &buffer, (const char*)StatementText, (size_t)TextLength, &stxt, NULL);
     r = do_exec_direct(sql, code, stxt);
   } while (0);
-  tsdb_conv_free(client_to_server, stxt, &buffer, (const char*)StatementText);
+  tsdb_conv_free(client_to_env, stxt, &buffer, (const char*)StatementText);
 
   return r;
 }

src/connector/odbc/tools/CMakeLists.txt

@@ -8,4 +8,5 @@ ENDIF ()
 IF (TD_WINDOWS_64)
   ADD_EXECUTABLE(todbcinst main.c)
   TARGET_LINK_LIBRARIES(todbcinst odbc32 odbccp32 user32 legacy_stdio_definitions os)
+  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/todbcinst.exe DESTINATION .)
 ENDIF ()