fix CI

Author: NyxCode

.github/workflows/examples.yml

@@ -8,13 +8,13 @@ on:
       - '*-dev'
 
 jobs:
-  mysql:
-    name: MySQL Example
+  mariadb:
+    name: MariaDB Example
     runs-on: ubuntu-latest
 
     services:
       mysql:
-        image: mysql:latest
+        image: mariadb:latest
         env:
           MYSQL_ROOT_PASSWORD: password
         ports:
@@ -25,19 +25,19 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          key: mysql-examples
+          key: mariadb-examples
 
       - name: Install sqlx-cli
         run: cargo install sqlx-cli
 
       - name: Setup
-        working-directory: example-mysql
+        working-directory: example-mariadb
         env:
           DATABASE_URL: mysql://root:password@localhost:3306/ormx?ssl-mode=disabled
         run: sqlx db setup
 
       - name: Run
-        working-directory: example-mysql
+        working-directory: example-mariadb
         env:
           DATABASE_URL: mysql://root:password@localhost:3306/ormx?ssl-mode=disabled
         run: cargo run

Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-members = ["ormx-macros", "ormx", "example-postgres", "example-mysql"]
+members = ["ormx-macros", "ormx", "example-postgres", "example-mariadb"]
 resolver = "2"

example-mysql/Cargo.toml renamed to example-mariadb/Cargo.toml

@@ -1,10 +1,7 @@
-CONTAINER_ID=$(
-  docker run -it --rm --name ormx-test-mariadb-db \
-    -e MYSQL_DATABASE=ormx \
-    -e MYSQL_ROOT_PASSWORD=admin \
-    -v $(pwd)/scripts/mysql-schema.sql:/docker-entrypoint-initdb.d/schema.sql \
-    -d mariadb
-)
-CONTAINER_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $CONTAINER_ID)
-echo "DATABASE_URL=mysql://root:admin@$CONTAINER_IP/ormx" > .env
-docker attach $CONTAINER_ID
+echo "DATABASE_URL=mysql://root:admin@127.0.0.1/ormx" > .env
+
+docker run -it --rm --name ormx-test-mariadb-db \
+  -e MYSQL_DATABASE=ormx \
+  -e MYSQL_ROOT_PASSWORD=admin \
+  -p 3306:3306 \
+  mariadb:latest

example-mysql/migrations/20240908062140_schema.sql renamed to example-mariadb/migrations/20240908062140_schema.sql

@@ -1,11 +1,9 @@
-CONTAINER_ID=$(
-  docker run -it --rm --name ormx-test-postgres-db \
-    -e POSTGRES_DB=ormx \
-    -e POSTGRES_USER=postgres \
-    -e POSTGRES_PASSWORD=admin \
-    -v $(pwd)/scripts/postgres-schema.sql:/docker-entrypoint-initdb.d/schema.sql \
-    -d postgres
-)
-CONTAINER_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $CONTAINER_ID)
-echo "DATABASE_URL=postgres://postgres:admin@$CONTAINER_IP/ormx" > .env
-docker attach $CONTAINER_ID
+echo "DATABASE_URL=postgres://postgres:admin@127.0.0.1/ormx" > .env
+
+docker run -it --rm --name ormx-test-postgres-db \
+  -e POSTGRES_DB=ormx \
+  -e POSTGRES_USER=postgres \
+  -e POSTGRES_PASSWORD=admin \
+  -p 5432:5432 \
+  postgres:latest \
+  -c log_statement=all