fix mysql 8.0

TarsCloud · Feb 22, 2024 · 4a8a27c · 4a8a27c
1 parent 2399ef0
commit 4a8a27c
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 3 deletions.
diff --git a/cmake/Thirdparty.cmake b/cmake/Thirdparty.cmake
@@ -272,7 +272,7 @@ if (TARS_MYSQL)
                 DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/download
                 PREFIX ${CMAKE_BINARY_DIR}
                 INSTALL_DIR ${CMAKE_SOURCE_DIR}
-                CONFIGURE_COMMAND ${CMAKE_COMMAND} . -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src/mysql -DBUILD_CONFIG=mysql_release
+                CONFIGURE_COMMAND ${CMAKE_COMMAND} . -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src/mysql -DBUILD_CONFIG=mysql_release -DDEFAULT_CHARSET=utf8mb4 -DDEFAULT_COLLATION=utf8mb4_general_ci
                 SOURCE_DIR ${CMAKE_BINARY_DIR}/src/mysql-lib
                 BUILD_IN_SOURCE 1
                 BUILD_COMMAND ${CMAKE_COMMAND} --build . --config release
@@ -288,7 +288,7 @@ if (TARS_MYSQL)
                 DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/download
                 PREFIX ${CMAKE_BINARY_DIR}
                 INSTALL_DIR ${CMAKE_SOURCE_DIR}
-                CONFIGURE_COMMAND ${CMAKE_COMMAND} .  -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src/mysql -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci -DDISABLE_SHARED=1  -DSTACK_DIRECTION=1 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                CONFIGURE_COMMAND ${CMAKE_COMMAND} .  -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src/mysql -DDEFAULT_CHARSET=utf8mb4 -DDEFAULT_COLLATION=utf8mb4_general_ci -DDISABLE_SHARED=1  -DSTACK_DIRECTION=1 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                 SOURCE_DIR ${CMAKE_BINARY_DIR}/src/mysql-lib
                 BUILD_IN_SOURCE 1
                 BUILD_COMMAND make mysqlclient

diff --git a/examples/QuickStartDemo/HelloServer/Client/main.cpp b/examples/QuickStartDemo/HelloServer/Client/main.cpp
@@ -172,9 +172,10 @@ void syncTupCall(int c)
 
             rsp.decode(package.sBuffer.data(), package.sBuffer.size());
 
-            int ret = rsp.get<int>("");            
+            int ret = rsp.get<int>("");
             string sRsp = rsp.get<string>("sRsp");
 
+            cout << "ret:" << ret << ", rsp:" << sRsp << endl;
 			// assert(ret == 0);
 			// assert(sRsp == buffer);
 		}

diff --git a/unit-test/CMakeLists.txt b/unit-test/CMakeLists.txt
@@ -13,4 +13,8 @@ build_tars_server("unit-test" "")
 add_definitions(-DCMAKE_SOURCE_DIR="${PROJECT_SOURCE_DIR}")
 target_link_libraries(unit-test ${LIB_GTEST})
 
+if(TARS_MYSQL)
+    target_link_libraries(unit-test ${LIB_MYSQL})
+endif()
+
 add_dependencies(unit-test FRAMEWORK-PROTOCOL)
diff --git a/unit-test/util/test_tc_mysql.cpp b/unit-test/util/test_tc_mysql.cpp
@@ -0,0 +1,62 @@
+#include "util/tc_common.h"
+#include "util/tc_mysql.h"
+#include "gtest/gtest.h"
+
+#include <iostream>
+#include <vector>
+
+using namespace std;
+using namespace tars;
+
+class UtilMysqlTest : public testing::Test
+{
+public:
+	//添加日志
+	static void SetUpTestCase()
+	{
+	}
+	static void TearDownTestCase()
+	{
+	}
+	virtual void SetUp()   //TEST跑之前会执行SetUp
+	{
+	}
+	virtual void TearDown() //TEST跑完之后会执行TearDown
+	{
+	}
+};
+
+#ifdef TARS_MYSQL
+
+TEST_F(UtilMysqlTest, test80)
+{
+    try
+    {
+        TC_Mysql mysql;
+
+        mysql.init("127.0.0.1", "root", "123456", "", "utf8", 3307, 0);
+
+        mysql.queryRecord("select 1");
+    }
+    catch(exception &ex)
+    {
+        cerr << ex.what() << endl;
+    }
+
+    try
+    {
+        TC_Mysql mysql;
+
+        mysql.init("127.0.0.1", "root", "tars@12345", "", "utf8", 3306, 0);
+
+        mysql.queryRecord("select 1");
+
+        cout << "success" << endl;
+    }
+    catch(exception &ex)
+    {
+        cerr << ex.what() << endl;
+    }
+}
+
+#endif
diff --git a/util/src/tc_mysql.cpp b/util/src/tc_mysql.cpp
@@ -114,6 +114,9 @@ void TC_Mysql::connect()
         }
     }
 
+    unsigned int i = 1;
+
+    mysql_options(_pstMql, MYSQL_OPT_SSL_MODE, &i);
 
     if (mysql_real_connect(_pstMql, _dbConf._host.c_str(), _dbConf._user.c_str(), _dbConf._password.c_str(), _dbConf._database.c_str(), _dbConf._port, NULL, _dbConf._flag) == NULL) 
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,6 +114,9 @@ void TC_Mysql::connect() @@
             }
         }
+        unsigned int i = 1;
+        mysql_options(_pstMql, MYSQL_OPT_SSL_MODE, &i);
         if (mysql_real_connect(_pstMql, _dbConf._host.c_str(), _dbConf._user.c_str(), _dbConf._password.c_str(), _dbConf._database.c_str(), _dbConf._port, NULL, _dbConf._flag) == NULL)
         {
@@ Expand Down @@