Merge branch 'main' into prerelease

sfu-db · Aug 27, 2023 · 07aa75c · 07aa75c
2 parents 569978d + 21bca8f
commit 07aa75c
Show file tree

Hide file tree

Showing 17 changed files with 2,234 additions and 1,134 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.65.0
+          toolchain: 1.71.1
           components: rustfmt
           default: true
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,127 +10,127 @@ on:
       - main
 
 jobs:
-  rust:
-    runs-on: ubuntu-latest
-    container: ubuntu:20.04
-    services:
-      # Label used to access the service container
-      postgres:
-        # Docker Hub image
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: postgres
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      # mysql
-      mysql:
-        image: ghcr.io/wangxiaoying/mysql:latest
-        env:
-          MYSQL_DATABASE: mysql
-          MYSQL_ROOT_PASSWORD: mysql
-          LANG: C.UTF-8
-        ports:
-          - 3306:3306
-        options: >-
-          --health-cmd "mysqladmin ping"
-          --health-interval 10s
-          --health-timeout 10s
-          --health-retries 5
-      mssql:
-        image: mcr.microsoft.com/mssql/server:2019-latest
-        env:
-          ACCEPT_EULA: y
-          SA_PASSWORD: mssql!Password
-        ports:
-          - 1433:1433
-        options: >-
-          --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P \"$SA_PASSWORD\" -Q 'SELECT 1' || exit 1"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 20
-    steps:
-      - uses: actions/checkout@v2
+  # rust:
+  #   runs-on: ubuntu-latest
+  #   container: ubuntu:20.04
+  #   services:
+  #     # Label used to access the service container
+  #     postgres:
+  #       # Docker Hub image
+  #       image: postgres
+  #       env:
+  #         POSTGRES_PASSWORD: postgres
+  #       # Set health checks to wait until postgres has started
+  #       options: >-
+  #         --health-cmd pg_isready
+  #         --health-interval 10s
+  #         --health-timeout 5s
+  #         --health-retries 5
+  #     # mysql
+  #     mysql:
+  #       image: ghcr.io/wangxiaoying/mysql:latest
+  #       env:
+  #         MYSQL_DATABASE: mysql
+  #         MYSQL_ROOT_PASSWORD: mysql
+  #         LANG: C.UTF-8
+  #       ports:
+  #         - 3306:3306
+  #       options: >-
+  #         --health-cmd "mysqladmin ping"
+  #         --health-interval 10s
+  #         --health-timeout 10s
+  #         --health-retries 5
+  #     mssql:
+  #       image: mcr.microsoft.com/mssql/server:2019-latest
+  #       env:
+  #         ACCEPT_EULA: y
+  #         SA_PASSWORD: mssql!Password
+  #       ports:
+  #         - 1433:1433
+  #       options: >-
+  #         --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P \"$SA_PASSWORD\" -Q 'SELECT 1' || exit 1"
+  #         --health-interval 10s
+  #         --health-timeout 5s
+  #         --health-retries 20
+  #   steps:
+  #     - uses: actions/checkout@v2
 
-      - name: Install tools
-        run: |
-          apt-get update
-          apt-get install -y curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client python3 python3-pip libicu66 libkrb5-dev libclang-dev
-          pip3 install mssql-cli
-          pip3 install cli-helpers==2.2.0
-          ln -s /usr/bin/python3 /usr/bin/python
-          echo "Cache Version ${{ secrets.CACHE_VERSION }}"
-        env:
-          DEBIAN_FRONTEND: noninteractive
+  #     - name: Install tools
+  #       run: |
+  #         apt-get update
+  #         apt-get install -y curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client python3 python3-pip libicu66 libkrb5-dev libclang-dev
+  #         pip3 install mssql-cli
+  #         pip3 install cli-helpers==2.2.0
+  #         ln -s /usr/bin/python3 /usr/bin/python
+  #         echo "Cache Version ${{ secrets.CACHE_VERSION }}"
+  #       env:
+  #         DEBIAN_FRONTEND: noninteractive
 
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.65.0
-          components: rustfmt
-          default: true
+  #     - name: Install Rust
+  #       uses: actions-rs/toolchain@v1
+  #       with:
+  #         toolchain: 1.71.1
+  #         components: rustfmt
+  #         default: true
 
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
+  #     - uses: actions/cache@v2
+  #       with:
+  #         path: |
+  #           ~/.cargo/bin/
+  #           ~/.cargo/registry/index/
+  #           ~/.cargo/registry/cache/
+  #           ~/.cargo/git/db/
+  #           target/
+  #         key: ${{ runner.os }}-cargo-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Install other dependent tools
-        run: |
-          if [ ! -f "$HOME/.cargo/bin/just" ]; then curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to ~/.cargo/bin; fi
+  #     - name: Install other dependent tools
+  #       run: |
+  #         if [ ! -f "$HOME/.cargo/bin/just" ]; then curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to ~/.cargo/bin; fi
 
-      - name: Seed the database
-        run: just seed-db
-        env:
-          POSTGRES_URL: "postgresql://postgres:postgres@postgres:5432/postgres"
-          SQLITE_URL: "sqlite:///tmp/test.db"
-          MYSQL_HOST: mysql
-          MYSQL_PORT: 3306
-          MYSQL_DB: mysql
-          MYSQL_USER: root
-          MYSQL_PASSWORD: mysql
-          MSSQL_HOST: mssql
-          MSSQL_PORT: 1433
-          MSSQL_DB: tempdb
-          MSSQL_USER: sa
-          MSSQL_PASSWORD: mssql!Password
+  #     - name: Seed the database
+  #       run: just seed-db
+  #       env:
+  #         POSTGRES_URL: "postgresql://postgres:postgres@postgres:5432/postgres"
+  #         SQLITE_URL: "sqlite:///tmp/test.db"
+  #         MYSQL_HOST: mysql
+  #         MYSQL_PORT: 3306
+  #         MYSQL_DB: mysql
+  #         MYSQL_USER: root
+  #         MYSQL_PASSWORD: mysql
+  #         MSSQL_HOST: mssql
+  #         MSSQL_PORT: 1433
+  #         MSSQL_DB: tempdb
+  #         MSSQL_USER: sa
+  #         MSSQL_PASSWORD: mssql!Password
 
-      - name: Is the code formatted?
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check -q
+  #     - name: Is the code formatted?
+  #       uses: actions-rs/cargo@v1
+  #       with:
+  #         command: fmt
+  #         args: --all -- --check -q
 
-      - name: Clippy linting
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --features all
+  #     - name: Clippy linting
+  #       uses: actions-rs/cargo@v1
+  #       with:
+  #         command: clippy
+  #         args: --features all
 
-      - name: Check each feature gate
-        run: just test-feature-gate
+  #     - name: Check each feature gate
+  #       run: just test-feature-gate
 
-      - name: Run tests
-        run: cargo clean && just test
-        env:
-          POSTGRES_URL: "postgresql://postgres:postgres@postgres:5432/postgres"
-          SQLITE_URL: "sqlite:///tmp/test.db"
-          MYSQL_URL: "mysql://root:mysql@mysql:3306/mysql"
-          MSSQL_URL: "mssql://sa:mssql!Password@mssql:1433/tempdb"
+  #     - name: Run tests
+  #       run: cargo clean && just test
+  #       env:
+  #         POSTGRES_URL: "postgresql://postgres:postgres@postgres:5432/postgres"
+  #         SQLITE_URL: "sqlite:///tmp/test.db"
+  #         MYSQL_URL: "mysql://root:mysql@mysql:3306/mysql"
+  #         MSSQL_URL: "mssql://sa:mssql!Password@mssql:1433/tempdb"
 
-      - name: Test build docs
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --no-deps --features all
+  #     - name: Test build docs
+  #       uses: actions-rs/cargo@v1
+  #       with:
+  #         command: doc
+  #         args: --no-deps --features all
 
   python:
     runs-on: ubuntu-latest
@@ -191,7 +191,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.65.0
+          toolchain: 1.71.1
           components: rustfmt
           default: true
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.65.0
+          toolchain: 1.71.1
           components: rustfmt
           default: true
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.65.0
+          toolchain: 1.71.1
           components: rustfmt
           target: aarch64-unknown-linux-gnu
           default: true
@@ -44,7 +44,7 @@ jobs:
 
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.65.0
+          rust-toolchain: 1.71.1
           maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
@@ -58,7 +58,7 @@ jobs:
       # rebuild the wheel to incorporate j4rs dependencies
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.65.0
+          rust-toolchain: 1.71.1
           maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
@@ -101,7 +101,7 @@ jobs:
 
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.65.0
+          toolchain: 1.71.1
           components: rustfmt
           default: true
 
@@ -117,7 +117,7 @@ jobs:
 
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.65.0
+          rust-toolchain: 1.71.1
           maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
@@ -131,7 +131,7 @@ jobs:
       # rebuild the wheel to incorporate j4rs dependencies
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.65.0
+          rust-toolchain: 1.71.1
           maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
@@ -161,7 +161,7 @@ jobs:
 
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.65.0
+          toolchain: 1.71.1
           components: rustfmt
           target: aarch64-apple-darwin
           default: true
@@ -178,7 +178,7 @@ jobs:
 
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.65.0
+          rust-toolchain: 1.71.1
           maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release  --features integrated-auth-gssapi
@@ -192,7 +192,7 @@ jobs:
       # rebuild the wheel to incorporate j4rs dependencies
       - uses: PyO3/maturin-action@v1
         with:
-          rust-toolchain: 1.65.0
+          rust-toolchain: 1.71.1
           maturin-version: v0.14.15
           command: build
           args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release  --features integrated-auth-gssapi