merge with master (#2048)

Author: marty1885

.github/workflows/codespell.yml

@@ -12,4 +12,4 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - run: pip install --user codespell[toml]
-    - run: codespell --ignore-words-list="coo,folx,ot,statics,xwindows,indexs,NotIn" --skip="*.csp"
+    - run: codespell --ignore-words-list="coo,folx,ot,statics,xwindows,NotIn," --skip="*.csp"

lib/src/HttpAppFrameworkImpl.cc

@@ -959,7 +959,7 @@ void HttpAppFrameworkImpl::addDbClient(
                                         userName,
                                         password,
                                         connectionNum,
-                                        userName,
+                                        name,
                                         isFast,
                                         characterSet,
                                         timeout,

lib/tests/integration_test/server/a-directory/page.html

@@ -115,7 +115,7 @@ <h2 id="a-very-simple-example">A very simple example</h2>
 }
 ```</p>
 
-<p><strong>Most of the above programs can be automatically generated by the command line tool <code>drogon_ctl</code> provided by drogon</strong> (The command <code>drogon_ctl create controller TestCtrl</code>). All the user needs to do is add their own business logic. In the example, the controller returns a <code>Hello, world!</code> string when the client accesses the <code>http://ip/test</code> URL.</p>
+<p><strong>Most of the above programs can be automatically generated by the command line tool <code>drogon_ctl</code> provided by drogon</strong> (The command is <code>drogon_ctl create controller TestCtrl</code>). All the user needs to do is add their own business logic. In the example, the controller returns a <code>Hello, world!</code> string when the client accesses the <code>http://ip/test</code> URL.</p>
 
 <p>For JSON format response, we create the controller as follows:</p>
 

orm_lib/tests/CMakeLists.txt

@@ -41,6 +41,10 @@ add_executable(conn_options_test
 		conn_options_test.cc
         )
 
+add_executable(db_api_test
+		db_api_test.cc
+        )
+
 set_property(TARGET db_test PROPERTY CXX_STANDARD ${DROGON_CXX_STANDARD})
 set_property(TARGET db_test PROPERTY CXX_STANDARD_REQUIRED ON)
 set_property(TARGET db_test PROPERTY CXX_EXTENSIONS OFF)
@@ -56,3 +60,7 @@ set_property(TARGET db_listener_test PROPERTY CXX_EXTENSIONS OFF)
 set_property(TARGET conn_options_test PROPERTY CXX_STANDARD ${DROGON_CXX_STANDARD})
 set_property(TARGET conn_options_test PROPERTY CXX_STANDARD_REQUIRED ON)
 set_property(TARGET conn_options_test PROPERTY CXX_EXTENSIONS OFF)
+
+set_property(TARGET db_api_test PROPERTY CXX_STANDARD ${DROGON_CXX_STANDARD})
+set_property(TARGET db_api_test PROPERTY CXX_STANDARD_REQUIRED ON)
+set_property(TARGET db_api_test PROPERTY CXX_EXTENSIONS OFF)

test.sh

@@ -222,6 +222,14 @@ function do_db_test()
             exit -1
         fi
     fi
+    if [ -f "./orm_lib/tests/db_api_test" ]; then
+        echo "Test getDbClient() api"
+        ./orm_lib/tests/db_api_test -s
+        if [ $? -ne 0 ]; then
+            echo "Error in testing"
+            exit -1
+        fi
+    fi
     if [ -f "./nosql_lib/redis/tests/redis_test" ]; then
         echo "Test redis"
         ./nosql_lib/redis/tests/redis_test -s