integration: geometry

.github/workflows/test-query-engine.yml

@@ -33,6 +33,10 @@ jobs:
             single_threaded: true
             connector: 'postgres'
             version: '15'
+          - name: 'postgis15'
+            single_threaded: true
+            connector: 'postgres'
+            version: '15-postgis'
           - name: 'mssql_2022'
             single_threaded: false
             connector: 'sqlserver'
@@ -41,6 +45,10 @@ jobs:
             single_threaded: false
             connector: 'sqlite'
             version: '3'
+          - name: 'spatialite'
+            single_threaded: false
+            connector: 'sqlite'
+            version: '3-spatialite'
           - name: 'mongodb_4_2'
             single_threaded: true
             connector: 'mongodb'
@@ -57,6 +65,22 @@ jobs:
             single_threaded: false
             connector: 'cockroachdb'
             version: '22.1'
+          - name: 'mysql_5_6'
+            single_threaded: true
+            connector: 'mysql'
+            version: '5.6'
+          - name: 'mysql_5_7'
+            single_threaded: true
+            connector: 'mysql'
+            version: '5.7'
+          - name: 'mysql_8'
+            single_threaded: true
+            connector: 'mysql'
+            version: '8'
+          - name: 'mysql_mariadb'
+            single_threaded: true
+            connector: 'mysql'
+            version: 'mariadb'
         engine_protocol: [graphql, json]
 
     env:
@@ -93,12 +117,18 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
+      - name: Install Spatialite
+        if: ${{ matrix.database.name == 'spatialite' }}
+        run: sudo apt install -y libsqlite3-mod-spatialite
+
       - run: export WORKSPACE_ROOT=$(pwd) && cargo test --package query-engine-tests -- --test-threads=1
         if: ${{ matrix.database.single_threaded }}
         env:
           CLICOLOR_FORCE: 1
+          SPATIALITE_PATH: ${{ matrix.database.name == 'spatialite' && 'mod_spatialite' || null }}
 
       - run: export WORKSPACE_ROOT=$(pwd) && cargo test --package query-engine-tests -- --test-threads=8
         if: ${{ !matrix.database.single_threaded }}
         env:
           CLICOLOR_FORCE: 1
+          SPATIALITE_PATH: ${{ matrix.database.name == 'spatialite' && 'mod_spatialite' || null }}

.github/workflows/test-schema-engine.yml

@@ -86,6 +86,8 @@ jobs:
             url: 'postgresql://postgres:prisma@localhost:5437'
           - name: postgres15
             url: 'postgresql://postgres:prisma@localhost:5438'
+          - name: postgis15
+            url: 'postgresql://postgres:prisma@localhost:5439'
           - name: cockroach_23_1
             url: 'postgresql://prisma@localhost:26260'
           - name: cockroach_22_2
@@ -94,6 +96,8 @@ jobs:
             url: 'postgresql://prisma@localhost:26257'
           - name: sqlite
             url: sqlite
+          - name: spatialite
+            url: sqlite
           - name: vitess_8_0
             url: 'mysql://root:prisma@localhost:33807/test'
             shadow_database_url: 'mysql://root:prisma@localhost:33808/shadow'
@@ -116,6 +120,10 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Install Spatialite
+        if: ${{ matrix.database.name == 'spatialite' }}
+        run: sudo apt install -y libsqlite3-mod-spatialite
+
       - name: 'Start ${{ matrix.database.name }}'
         run: make start-${{ matrix.database.name }}
 
@@ -124,25 +132,29 @@ jobs:
         env:
           CLICOLOR_FORCE: 1
           TEST_DATABASE_URL: ${{ matrix.database.url }}
+          SPATIALITE_PATH: ${{ matrix.database.name == 'spatialite' && 'mod_spatialite' || null }}
 
       - run: cargo test -p sql-schema-describer
         if: ${{ !matrix.database.single_threaded }}
         env:
           CLICOLOR_FORCE: 1
           TEST_DATABASE_URL: ${{ matrix.database.url }}
+          SPATIALITE_PATH: ${{ matrix.database.name == 'spatialite' && 'mod_spatialite' || null }}
 
       - run: cargo test -p sql-migration-tests
         if: ${{ !matrix.database.single_threaded }}
         env:
           CLICOLOR_FORCE: 1
           TEST_DATABASE_URL: ${{ matrix.database.url }}
+          SPATIALITE_PATH: ${{ matrix.database.name == 'spatialite' && 'mod_spatialite' || null }}
           RUST_LOG: debug
 
       - run: cargo test -p schema-engine-cli
         if: ${{ !matrix.database.single_threaded }}
         env:
           CLICOLOR_FORCE: 1
           TEST_DATABASE_URL: ${{ matrix.database.url }}
+          SPATIALITE_PATH: ${{ matrix.database.name == 'spatialite' && 'mod_spatialite' || null }}
 
       - run: cargo test -p sql-introspection-tests -- --test-threads=1
         if: ${{ matrix.database.is_vitess }}

.test_database_urls/postgis_15

@@ -0,0 +1 @@
+export TEST_DATABASE_URL="postgresql://postgres:prisma@localhost:5439"

Makefile

@@ -87,6 +87,11 @@ start-sqlite:
 dev-sqlite:
 	cp $(CONFIG_PATH)/sqlite $(CONFIG_FILE)
 
+start-spatialite:
+
+dev-spatialite:
+	cp $(CONFIG_PATH)/spatialite $(CONFIG_FILE)
+
 dev-libsql-js: build-qe-napi build-connector-kit-js
 	cp $(CONFIG_PATH)/libsql-js $(CONFIG_FILE)
 
@@ -173,6 +178,12 @@ start-postgres15:
 dev-postgres15: start-postgres15
 	cp $(CONFIG_PATH)/postgres15 $(CONFIG_FILE)
 
+start-postgis15:
+	docker compose -f docker-compose.yml up -d --remove-orphans postgis15
+
+dev-postgis15: start-postgis15
+	cp $(CONFIG_PATH)/postgis15 $(CONFIG_FILE)
+
 start-cockroach_23_1:
 	docker compose -f docker-compose.yml up --wait -d --remove-orphans cockroach_23_1
 

docker-compose.yml

@@ -213,6 +213,19 @@ services:
     networks:
       - databases
 
+  postgis15:
+    image: postgis/postgis:15-3.3
+    restart: always
+    command: postgres -c 'max_connections=1000'
+    environment:
+      POSTGRES_PASSWORD: "prisma"
+      POSTGRES_HOST_AUTH_METHOD: "md5"
+      POSTGRES_INITDB_ARGS: "--auth-host=md5"
+    ports:
+      - "5439:5432"
+    networks:
+      - databases
+
   mysql-5-6:
     image: mysql:5.6.50
     command: mysqld