.github/dependabot.yml

@@ -1,11 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "monthly"

.github/workflows/cmake.yml

@@ -1,8 +1,8 @@
-name: Build & Test
+name: Build Drogon
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
   workflow_dispatch:
 
@@ -21,10 +21,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        link: ["STATIC", "SHARED"]
+        link: [ 'STATIC', 'SHARED' ]
     steps:
       - name: Checkout Drogon source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           submodules: true
           fetch-depth: 0
@@ -64,123 +64,124 @@ jobs:
         shell: bash
         run: ./test.sh -w
 
-  macos:
+  unix:
-    name: macos/clang
-    runs-on: macos-latest
-    steps:
-      - name: Checkout Drogon source code
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-          fetch-depth: 0
-
-      - name: Install dependencies
-        # Already installed: brotli, zlib, postgresql@14, lz4, sqlite3
-        run: brew install ninja jsoncpp mariadb hiredis redis
-
-      - name: Create Build Environment & Configure Cmake
-        # Some projects don't allow in-source building, so create a separate build directory
-        # We'll use this as our working directory for all subsequent commands
-        run: |
-          cmake -B build -G Ninja          \
-            -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-            -DBUILD_TESTING=on             \
-            -DBUILD_SHARED_LIBS=OFF
-
-      - name: Build
-        working-directory: ./build
-        # Execute the build.  You can specify a specific target with "--target <NAME>"
-        run: ninja && sudo ninja install
-
-      - name: Prepare for testing
-        run: |
-          brew tap homebrew/services
-          brew services restart postgresql@14
-          brew services start mariadb
-          brew services start redis
-          sleep 4
-          mariadb -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('')"
-          mariadb -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost'"
-          mariadb -e "FLUSH PRIVILEGES"
-          brew services restart mariadb
-          sleep 4
-          psql -c 'create user postgres superuser;' postgres
-
-      - name: Test
-        # Execute tests defined by the CMake configuration.
-        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: ./test.sh -t
-
-  ubuntu:
     name: ${{ matrix.buildname }}
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - buildname: "ubuntu-22.04/gcc"
+          - os: ubuntu-22.04
+            buildname: 'ubuntu-22.04/gcc'
             link: SHARED
-          - buildname: "ubuntu-22.04/gcc"
+            triplet: x64-linux
+            compiler: gcc_64
+          - os: ubuntu-22.04
+            buildname: 'ubuntu-22.04/gcc'
             link: STATIC
-          - buildname: "ubuntu-22.04/coroutines"
+            triplet: x64-linux
+            compiler: gcc_64
+          - os: ubuntu-22.04
+            buildname: 'ubuntu-22.04/gcc-10'
             link: STATIC
+            triplet: x64-linux
+          - os: macos-latest
+            buildname: 'macos/clang'
+            link: STATIC
+            triplet: x64-osx
+            compiler: clang_64
     steps:
-      - name: Checkout Drogon source code
+    - name: Checkout Drogon source code
-        uses: actions/checkout@v3
+      uses: actions/checkout@v2
-        with:
+      with:
-          submodules: true
+        submodules: true
-          fetch-depth: 0
+        fetch-depth: 0
 
-      - name: Install dependencies
+    - name: (macOS) Install dependencies
-        run: |
+      if: runner.os == 'macOS'
-          # Installing packages might fail as the github image becomes outdated
+      # Already installed: brotli, zlib, postgresql@14, lz4, sqlite3
-          sudo apt update
+      run: brew install jsoncpp mariadb hiredis redis
-          # These aren't available or don't work well in vcpkg
-          sudo apt-get install -y libjsoncpp-dev uuid-dev libssl-dev zlib1g-dev libsqlite3-dev
-          sudo apt-get install -y ninja-build libbrotli-dev
 
-      - name: Install postgresql
+    - name: (Linux) Install dependencies
-        run: |
+      if: runner.os == 'Linux'
-          sudo apt-get --purge remove postgresql postgresql-doc postgresql-common postgresql-client-common
+      run: |
-          sudo apt-get -y install postgresql-all
+        # Installing packages might fail as the github image becomes outdated
+        sudo apt update
+        # These aren't available or don't work well in vcpkg
+        sudo apt-get install -y libjsoncpp-dev uuid-dev libssl-dev zlib1g-dev libsqlite3-dev
+        sudo apt-get install -y libbrotli-dev
+    - name: (Linux) Install gcc-10
+      if: matrix.buildname == 'ubuntu-22.04/gcc-10'
+      run: sudo apt-get install -y gcc-10 g++-10
 
-      - name: Export `shared`
+    - name: (Linux) Install postgresql
-        run: |
+      if: matrix.os == 'ubuntu-22.04'
-          [[ ${{ matrix.link }} == "SHARED" ]] && shared="ON" || shared="OFF"
+      run: |
-          echo "shared=$shared" >> $GITHUB_ENV
+        sudo apt-get --purge remove postgresql postgresql-doc postgresql-common postgresql-client-common
+        sudo apt-get -y install postgresql-all
+    - name: Export `shared`
+      run: |
+        [[ ${{ matrix.link }} == "SHARED" ]] && shared="ON" || shared="OFF"
+        echo "shared=$shared" >> $GITHUB_ENV
 
-      - name: Create Build Environment & Configure Cmake
+    - name: Create Build Environment & Configure Cmake
-        # Some projects don't allow in-source building, so create a separate build directory
+      # Some projects don't allow in-source building, so create a separate build directory
-        # We'll use this as our working directory for all subsequent commands
+      # We'll use this as our working directory for all subsequent commands
-        if: matrix.buildname != 'ubuntu-22.04/coroutines'
+      if: matrix.buildname != 'ubuntu-22.04/gcc-10'
-        run: |
+      run: |
-          cmake -B build -G Ninja          \
+        cmake -B build                   \
-            -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+          -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-            -DBUILD_TESTING=on             \
+          -DBUILD_TESTING=on             \
-            -DBUILD_SHARED_LIBS=$shared
+          -DBUILD_SHARED_LIBS=$shared
-      - name: Create Build Environment & Configure Cmake (coroutines)
-        # Some projects don't allow in-source building, so create a separate build directory
-        # We'll use this as our working directory for all subsequent commands
-        if: matrix.buildname == 'ubuntu-22.04/coroutines'
-        run: |
-          cmake -B build -G Ninja            \
-            -DCMAKE_BUILD_TYPE=$BUILD_TYPE   \
-            -DBUILD_TESTING=on               \
-            -DCMAKE_CXX_FLAGS="-fcoroutines" \
-            -DBUILD_SHARED_LIBS=$shared
 
-      - name: Build
+    - name: Create Build Environment & Configure Cmake (gcc-10)
-        working-directory: ./build
+      # Some projects don't allow in-source building, so create a separate build directory
-        # Execute the build.  You can specify a specific target with "--target <NAME>"
+      # We'll use this as our working directory for all subsequent commands
-        run: ninja && sudo ninja install
+      if: matrix.buildname == 'ubuntu-22.04/gcc-10'
+      run: |
+        cmake -B build                     \
+          -DCMAKE_BUILD_TYPE=$BUILD_TYPE   \
+          -DBUILD_TESTING=on               \
+          -DCMAKE_CXX_FLAGS="-fcoroutines" \
+          -DBUILD_SHARED_LIBS=$shared
+      env:
+        CC: gcc-10
+        CXX: g++-10
 
-      - name: Prepare for testing
+    - name: Build
-        run: |
+      working-directory: ./build
-          sudo systemctl start postgresql
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
-          sleep 1
+      run: make -j $(nproc) && sudo make install
-          sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '12345'" postgres
 
-      - name: Test
+    - name: (macOS) Prepare for testing
-        # Execute tests defined by the CMake configuration.
+      if: runner.os == 'macOS'
-        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: |
-        run: ./test.sh -t
+        brew tap homebrew/services
+        brew services restart postgresql@14
+        brew services start mariadb
+        brew services start redis
+        sleep 4
+        mariadb -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('')"
+        mariadb -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost'"
+        mariadb -e "FLUSH PRIVILEGES"
+        brew services restart mariadb
+        sleep 4
+        psql -c 'create user postgres superuser;' postgres
+
+    - name: (Linux) Prepare for testing
+      if: runner.os == 'Linux'
+      run: |
+        sudo systemctl start postgresql
+        sleep 1
+        sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '12345'" postgres
+
+    - name: Test
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ./test.sh -t
+
+    - name: Lint
+      if: matrix.os == 'ubuntu-22.04'
+      run: |
+        sudo apt install -y dos2unix
+        ./format.sh && git diff --exit-code

.github/workflows/codeql.yml

@@ -9,10 +9,6 @@ on:
   schedule:
     - cron: '46 7 * * 5'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
@@ -40,7 +36,7 @@ jobs:
 
     steps:
     - name: Checkout Drogon source code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         submodules: true
         fetch-depth: 0
@@ -49,13 +45,13 @@ jobs:
       run: |
         sudo apt update
         sudo apt-get install -y libjsoncpp-dev uuid-dev libssl-dev zlib1g-dev libsqlite3-dev
-        sudo apt-get install -y ninja-build libbrotli-dev
+        sudo apt-get install -y libbrotli-dev
 
     - name: Create Build Environment & Configure Cmake
       run: |
-        cmake -B build -G Ninja          \
+        cmake -B build \
           -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-          -DBUILD_TESTING=on             \
+          -DBUILD_TESTING=on \
           -DBUILD_SHARED_LIBS=$SHARED
 
     # Initializes the CodeQL tools for scanning.
@@ -72,7 +68,7 @@ jobs:
 
     - name: Build
       working-directory: ./build
-      run: ninja && sudo ninja install
+      run: make -j $(nproc) && sudo make install
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/cpp.yml

@@ -1,21 +0,0 @@
-name: C++
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  format:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install dos2unix
-        run: sudo apt-get install -y dos2unix
-
-      - name: Check formatting
-        run: ./format.sh && git diff --exit-code

drogon_ctl/templates/demoMain.csp

@@ -1,7 +1,7 @@
 #include <drogon/drogon.h>
 int main() {
     //Set HTTP listener address and port
-    drogon::app().addListener("0.0.0.0", 5555);
+    drogon::app().addListener("0.0.0.0",80);
     //Load config file
     //drogon::app().loadConfigFile("../config.json");
     //drogon::app().loadConfigFile("../config.yaml");

drogon_ctl/templates/model_h.csp

@@ -508,7 +508,7 @@ if(@@.get<std::string>("rdbms")=="postgresql")
                 if(@@.get<std::string>("rdbms")=="postgresql")
                 {
 %>
-            n = snprintf(placeholderStr,sizeof(placeholderStr),"$%d,",placeholder++);
+            n = sprintf(placeholderStr,"$%d,",placeholder++);
             sql.append(placeholderStr, n);
 <%c++
                 }else

orm_lib/tests/postgresql/Users.h

@@ -352,67 +352,43 @@ class Users
         size_t n = 0;
         if (dirtyFlag_[0])
         {
-            n = snprintf(placeholderStr,
+            n = sprintf(placeholderStr, "$%d,", placeholder++);
-                         sizeof(placeholderStr),
-                         "$%d,",
-                         placeholder++);
             sql.append(placeholderStr, n);
         }
         if (dirtyFlag_[1])
         {
-            n = snprintf(placeholderStr,
+            n = sprintf(placeholderStr, "$%d,", placeholder++);
-                         sizeof(placeholderStr),
-                         "$%d,",
-                         placeholder++);
             sql.append(placeholderStr, n);
         }
         if (dirtyFlag_[2])
         {
-            n = snprintf(placeholderStr,
+            n = sprintf(placeholderStr, "$%d,", placeholder++);
-                         sizeof(placeholderStr),
-                         "$%d,",
-                         placeholder++);
             sql.append(placeholderStr, n);
         }
         if (dirtyFlag_[3])
         {
-            n = snprintf(placeholderStr,
+            n = sprintf(placeholderStr, "$%d,", placeholder++);
-                         sizeof(placeholderStr),
-                         "$%d,",
-                         placeholder++);
             sql.append(placeholderStr, n);
         }
         if (dirtyFlag_[4])
         {
-            n = snprintf(placeholderStr,
+            n = sprintf(placeholderStr, "$%d,", placeholder++);
-                         sizeof(placeholderStr),
-                         "$%d,",
-                         placeholder++);
             sql.append(placeholderStr, n);
         }
         if (dirtyFlag_[5])
         {
-            n = snprintf(placeholderStr,
+            n = sprintf(placeholderStr, "$%d,", placeholder++);
-                         sizeof(placeholderStr),
-                         "$%d,",
-                         placeholder++);
             sql.append(placeholderStr, n);
         }
         sql += "default,";
         if (dirtyFlag_[7])
         {
-            n = snprintf(placeholderStr,
+            n = sprintf(placeholderStr, "$%d,", placeholder++);
-                         sizeof(placeholderStr),
-                         "$%d,",
-                         placeholder++);
             sql.append(placeholderStr, n);
         }
         if (dirtyFlag_[8])
         {
-            n = snprintf(placeholderStr,
+            n = sprintf(placeholderStr, "$%d,", placeholder++);
-                         sizeof(placeholderStr),
-                         "$%d,",
-                         placeholder++);
             sql.append(placeholderStr, n);
         }
         else