Fix #256 and #280

.github/workflows/tests.yaml

@@ -70,6 +70,12 @@ jobs:
 
   integration-tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        scripts: [
+          "integration-tests",
+          "integration-tests-mysql",
+        ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
@@ -81,8 +87,7 @@ jobs:
       - run: sudo apt install docker-compose -y
       - run: docker-compose -f .test-utils/docker-compose.yml up -d
       - run: sleep 30
-      - run: .scripts/integration-tests.sh
-
+      - run: .scripts/${{ matrix.scripts }}.sh
 
   internal-tests-0:
     runs-on: ubuntu-latest

.gitignore

@@ -7,6 +7,7 @@
 **/rustc-ice-*.txt
 **/target
 boringssl
+callgrind*
 mdbook-target
 wtx-docs/book
 wtx-fuzz/artifacts

.scripts/boringssl.sh

@@ -0,0 +1,9 @@
+set -euxo pipefail
+
+if [ ! -d "./boringssl" ]; then
+    git clone --depth 1 --branch 0.20241209.0 https://github.com/google/boringssl
+fi
+
+cargo build --bin boringssl --features tls
+cd boringssl/ssl/test/runner
+go test -shim-path "target/ssl/test/bssl_shim" -num-workers 1

.scripts/h2load.sh

@@ -11,4 +11,4 @@ cargo build --bin h2load --features="wtx/http2,wtx/nightly" --profile deploy
 cargo run --bin h2load --features="wtx/http2,wtx/nightly" --profile deploy &
 sleep 1
 
-h2load -c100 -m10 -n100000 --no-tls-proto=h2c http://localhost:9000
+h2load -c100 --log-file=/tmp/h2load.txt -m10 -n100000 --no-tls-proto=h2c http://localhost:9000

.scripts/integration-tests-mysql.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+export DATABASE_URI_MYSQL='mysql://wtx:wtx@localhost:3307/wtx'
+
+cargo test --features mysql,_integration-tests --release -- --test-threads=1
+
+export DATABASE_URI_MYSQL='mysql://wtx:wtx@localhost:3308/wtx'
+
+cargo test --features mysql,_integration-tests --release -- --test-threads=1

.scripts/integration-tests.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-export DATABASE_URI='postgres://wtx_scram:wtx@localhost:5432/wtx'
+export DATABASE_URI_MYSQL='mysql://wtx:wtx@localhost:3306/wtx'
+export DATABASE_URI_POSTGRESQL='postgres://wtx_scram:wtx@localhost:5432/wtx'
 
 cargo test --all-features --release -- --test-threads=1
 

.scripts/internal-tests-0.sh

@@ -54,7 +54,6 @@ $rt test-with-features wtx sha2
 $rt test-with-features wtx simdutf8
 $rt test-with-features wtx std
 $rt test-with-features wtx tokio
-$rt test-with-features wtx tokio-rustls
 $rt test-with-features wtx tracing
 $rt test-with-features wtx uuid
 $rt test-with-features wtx web-socket

.scripts/podman-rm.sh

@@ -1 +1,2 @@
+podman container rm -fi wtx_mysql
 podman container rm -fi wtx_postgres_scram

.scripts/podman-start.sh

@@ -1,3 +1,14 @@
+podman run \
+    -d \
+    --name wtx_mysql \
+    -e MYSQL_DATABASE=wtx \
+    -e MYSQL_PASSWORD=wtx \
+    -e MYSQL_ROOT_HOST='%' \
+    -e MYSQL_ROOT_PASSWORD=wtx \
+    -e MYSQL_USER=wtx \
+    -p 3306:3306 \
+    docker.io/library/mysql:9
+
 podman run \
     -d \
     --name wtx_postgres_scram \

.test-utils/docker-compose.yml

@@ -1,6 +1,41 @@
 version: "3"
 
 services:
+    # MySQL
+
+    mariadb_11:
+        environment:
+            MYSQL_DATABASE: wtx
+            MYSQL_PASSWORD: wtx
+            MYSQL_ROOT_PASSWORD: wtx
+            MYSQL_USER: wtx
+        image: mariadb:11
+        ports:
+            - 3306:3306
+
+    mysql_9:
+        environment:
+            MYSQL_DATABASE: wtx
+            MYSQL_PASSWORD: wtx
+            MYSQL_ROOT_HOST: '%'
+            MYSQL_ROOT_PASSWORD: wtx
+            MYSQL_USER: wtx
+        image: mysql:9
+        ports:
+            - 3307:3306
+
+    percona_9:
+        environment:
+            MYSQL_DATABASE: wtx
+            MYSQL_PASSWORD: wtx
+            MYSQL_ROOT_PASSWORD: wtx
+            MYSQL_USER: wtx
+        image: percona:8
+        ports:
+            - 3308:3306
+
+    # PostgreSQL
+
     postgres_scram:
         environment:
             POSTGRES_DB: wtx
@@ -9,4 +44,4 @@ services:
         ports:
             - 5432:5432
         volumes:
-            - ./../.test-utils/postgres.sh:/docker-entrypoint-initdb.d/setup.sh
+            - ./../.test-utils/postgres.sh:/docker-entrypoint-initdb.d/setup.sh