Merge pull request #157 from Jacyking/master

fix pg compiler error on clang
qicosmos · Apr 8, 2024 · b40b27f · b40b27f
2 parents df340f6 + a3c3bd3
commit b40b27f
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 32 deletions.
diff --git a/.github/workflows/ci-mysql.yml b/.github/workflows/ci-mysql.yml
@@ -25,13 +25,13 @@ jobs:
           database: test_ormppdb
 
       - name: Configure cmake
-        run:  cmake -B${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DENABLE_MYSQL=ON
+        run : cmake -B${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DENABLE_MYSQL=ON
 
       - name: Build
-        run:  cmake --build ${{github.workspace}}/build --config ${{ matrix.configuration }}
+        run : cmake --build ${{ github.workspace }}/build --config ${{ matrix.configuration }}
 
       - name: Test
-        working-directory: ${{github.workspace}}/build
-        env:
+        working-directory: ${{ github.workspace }}/build
+        env :
           CTEST_OUTPUT_ON_FAILURE: 1
-        run: ctest -C ${{ matrix.configuration }} -j `nproc` -V
+        run : ctest -C ${{ matrix.configuration }} -j 1 -V
diff --git a/.github/workflows/ci-pgsql.yml b/.github/workflows/ci-pgsql.yml
@@ -5,14 +5,24 @@ on: [ push, pull_request ]
 jobs:
   build-and-test:
 
-    name: ${{ matrix.os }} (${{ matrix.configuration }})
+    name: ${{ matrix.os }} (${{ matrix.configuration }}) (${{ matrix.compiler }})
     runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
+        compiler: [ gcc, clang ]
         configuration: [ Debug, Release ]
         os: [ ubuntu-latest ] # macos-latest, ubuntu-latest, windows-latest
+        include:
+          - os: ubuntu-latest
+            compiler: gcc
+            cc: gcc
+            cxx: g++
+          - os: ubuntu-latest
+            compiler: clang
+            cc: clang
+            cxx: clang++
 
     services:
       postgres:
@@ -34,13 +44,16 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Configure cmake
-        run:  cmake -B${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DENABLE_PG=ON
+        env : 
+          CC: ${{ matrix.cc }}
+          CXX: ${{ matrix.cxx }}
+        run : cmake -B${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DENABLE_PG=ON
 
       - name: Build
-        run:  cmake --build ${{github.workspace}}/build --config ${{ matrix.configuration }}
+        run : cmake --build ${{ github.workspace }}/build --config ${{ matrix.configuration }}
 
       - name: Test
-        working-directory: ${{github.workspace}}/build
-        env:
+        working-directory: ${{ github.workspace }}/build
+        env :
           CTEST_OUTPUT_ON_FAILURE: 1
-        run: ctest -C ${{ matrix.configuration }} -j `nproc` -V
+        run : ctest -C ${{ matrix.configuration }} -j 1 -V
diff --git a/.github/workflows/ci-sqlite.yml b/.github/workflows/ci-sqlite.yml
@@ -19,13 +19,13 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Configure cmake
-        run:  cmake -B${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DENABLE_SQLITE3=ON
+        run : cmake -B${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DENABLE_SQLITE3=ON
 
       - name: Build
-        run:  cmake --build ${{github.workspace}}/build --config ${{ matrix.configuration }}
+        run : cmake --build ${{ github.workspace }}/build --config ${{ matrix.configuration }}
 
       - name: Test
-        working-directory: ${{github.workspace}}/build
-        env:
+        working-directory: ${{ github.workspace }}/build
+        env :
           CTEST_OUTPUT_ON_FAILURE: 1
-        run: ctest -C ${{ matrix.configuration }} -j `nproc` -V
+        run : ctest -C ${{ matrix.configuration }} -j 1 -V
diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -13,10 +13,10 @@ jobs:
           fetch-depth: 0
 
       - name: install clang-format
-        run:  sudo apt install clang-format
+        run : sudo apt install clang-format
 
       - name: check-diff
-        run: |
+        run : |
           diff=`git-clang-format --diff HEAD^`
           if ! [[ "$diff" = "no modified files to format" || "$diff" = "clang-format did not modify any files" ]]; then
               echo "The diff you sent is not formatted correctly."

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -20,19 +20,19 @@ jobs:
         database: test_ormppdb
 
     - name: Verify MySQL
-      run:  mysql -uroot -e'show databases;'
+      run : mysql -uroot -e'show databases;'
 
     - name: Configure cmake
-      run:  cmake -B${{github.workspace}}/build -DCOVERAGE_TEST=ON -DENABLE_MYSQL=ON -DCMAKE_BUILD_TYPE=Debug
+      run : cmake -B${{ github.workspace }}/build -DCOVERAGE_TEST=ON -DENABLE_MYSQL=ON -DCMAKE_BUILD_TYPE=Debug
 
     - name: Build
-      run:  cmake --build ${{github.workspace}}/build --config Debug
+      run : cmake --build ${{ github.workspace }}/build --config Debug
 
     - name: Test
-      working-directory: ${{github.workspace}}/build
-      env:
+      working-directory: ${{ github.workspace }}/build
+      env :
         CTEST_OUTPUT_ON_FAILURE: 1
-      run: ctest -C Debug -j `nproc` -V
+      run : ctest -C Debug -j `nproc` -V
 
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1
diff --git a/ormpp/postgresql.hpp b/ormpp/postgresql.hpp
@@ -64,7 +64,7 @@ class postgresql {
   bool ping() { return (PQstatus(con_) == CONNECTION_OK); }
 
   template <typename T, typename... Args>
-  constexpr auto create_datatable(Args &&...args) {
+  bool create_datatable(Args &&...args) {
     std::string sql = generate_createtb_sql<T>(std::forward<Args>(args)...);
 #ifdef ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;
@@ -200,8 +200,8 @@ class postgresql {
   }
 
   template <typename T, typename... Args>
-  constexpr std::enable_if_t<!iguana::is_reflection_v<T>, std::vector<T>>
-  query_s(const std::string &sql, Args &&...args) {
+  std::enable_if_t<!iguana::is_reflection_v<T>, std::vector<T>> query_s(
+      const std::string &sql, Args &&...args) {
     static_assert(iguana::is_tuple<T>::value);
 #ifdef ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;
@@ -289,7 +289,7 @@ class postgresql {
   }
 
   template <typename T, typename Arg, typename... Args>
-  constexpr std::enable_if_t<!iguana::is_reflection_v<T>, std::vector<T>> query(
+  std::enable_if_t<!iguana::is_reflection_v<T>, std::vector<T>> query(
       const Arg &s, Args &&...args) {
     static_assert(iguana::is_tuple<T>::value);
     constexpr auto SIZE = std::tuple_size_v<T>;
@@ -342,7 +342,7 @@ class postgresql {
   }
 
   // just support execute string sql without placeholders
-  auto execute(const std::string &sql) {
+  bool execute(const std::string &sql) {
 #ifdef ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;
 #endif
@@ -649,8 +649,8 @@ class postgresql {
   }
 
   template <typename T>
-  constexpr void set_param_values(std::vector<std::vector<char>> &param_values,
-                                  T &&value) {
+  void set_param_values(std::vector<std::vector<char>> &param_values,
+                        T &&value) {
     using U = std::remove_const_t<std::remove_reference_t<T>>;
     if constexpr (is_optional_v<U>::value) {
       if (value.has_value()) {
@@ -667,7 +667,10 @@ class postgresql {
     }
     else if constexpr (std::is_integral_v<U> && !iguana::is_int64_v<U>) {
       std::vector<char> temp(20, 0);
-      if constexpr (iguana::is_char_type<U>::value) {
+      if constexpr (std::is_same_v<char, U>) {
+        temp.front() = value;
+      }
+      else if constexpr (iguana::is_char_type<U>::value) {
         itoa_fwd(value, temp.data());
       }
       else {