[Integration branch] feat: geospatial types support

.github/workflows/quaint.yml

@@ -17,13 +17,13 @@ jobs:
         features:
           - "--lib --features=all"
           - "--lib --no-default-features --features=sqlite"
-          - "--lib --no-default-features --features=sqlite --features=uuid --features=pooled --features=serde-support --features=bigdecimal"
+          - "--lib --no-default-features --features=sqlite --features=gis --features=uuid --features=pooled --features=serde-support --features=bigdecimal"
           - "--lib --no-default-features --features=postgresql"
-          - "--lib --no-default-features --features=postgresql --features=uuid --features=pooled --features=serde-support --features=bigdecimal"
+          - "--lib --no-default-features --features=postgresql --features=gis  --features=uuid --features=pooled --features=serde-support --features=bigdecimal"
           - "--lib --no-default-features --features=mysql"
-          - "--lib --no-default-features --features=mysql --features=uuid --features=pooled --features=serde-support --features=bigdecimal"
+          - "--lib --no-default-features --features=mysql --features=gis --features=uuid --features=pooled --features=serde-support --features=bigdecimal"
           - "--lib --no-default-features --features=mssql"
-          - "--lib --no-default-features --features=mssql --features=uuid --features=pooled --features=serde-support --features=bigdecimal"
+          - "--lib --no-default-features --features=mssql --features=gis --features=uuid --features=pooled --features=serde-support --features=bigdecimal"
           - "--doc --features=all"
     env:
       TEST_MYSQL: "mysql://root:prisma@localhost:3306/prisma"

.github/workflows/query-engine.yml

@@ -35,6 +35,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"

.github/workflows/schema-engine.yml

@@ -84,6 +84,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

.test_database_urls/postgis_15

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

Cargo.toml

@@ -64,6 +64,7 @@ features = [
   "postgresql",
   "sqlite",
   "uuid",
+  "gis",
 ]
 
 [profile.dev.package.backtrace]

Makefile

@@ -130,6 +130,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 -d --remove-orphans cockroach_23_1
 

README.md

@@ -1,4 +1,4 @@
-# Prisma Engines
+# Prisma Engines 
 
 [![Query Engine](https://github.com/prisma/prisma-engines/actions/workflows/query-engine.yml/badge.svg)](https://github.com/prisma/prisma-engines/actions/workflows/query-engine.yml)
 [![Schema Engine + sql_schema_describer](https://github.com/prisma/prisma-engines/actions/workflows/schema-engine.yml/badge.svg)](https://github.com/prisma/prisma-engines/actions/workflows/schema-engine.yml)

docker-compose.yml

@@ -147,6 +147,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

libs/prisma-value/src/lib.rs

@@ -24,6 +24,8 @@ pub enum PrismaValue {
     Uuid(Uuid),
     List(PrismaListValue),
     Json(String),
+    GeoJson(String),
+    Geometry(String),
 
     /// A collections of key-value pairs constituting an object.
     #[serde(serialize_with = "serialize_object")]
@@ -318,6 +320,8 @@ impl fmt::Display for PrismaValue {
             PrismaValue::Null => "null".fmt(f),
             PrismaValue::Uuid(x) => x.fmt(f),
             PrismaValue::Json(x) => x.fmt(f),
+            PrismaValue::GeoJson(x) => x.fmt(f),
+            PrismaValue::Geometry(x) => x.fmt(f),
             PrismaValue::BigInt(x) => x.fmt(f),
             PrismaValue::List(x) => {
                 let as_string = format!("{x:?}");

libs/test-setup/src/postgres.rs

@@ -7,9 +7,14 @@ pub(crate) fn get_postgres_tags(database_url: &str) -> Result<BitFlags<Tags>, St
     let fut = async {
         let quaint = Quaint::new(database_url).await.map_err(|err| err.to_string())?;
         let mut tags = Tags::Postgres.into();
-        let version = quaint.version().await.map_err(|err| err.to_string())?;
 
-        match version {
+        if let Ok(_postgis_version) = quaint.query_raw("SELECT PostGIS_version()", &[]).await {
+            tags |= Tags::PostGIS;
+        }
+
+        let postgres_version = quaint.version().await.map_err(|err| err.to_string())?;
+
+        match postgres_version {
             None => Ok(tags),
             Some(version) => {
                 eprintln!("version: {version:?}");

libs/test-setup/src/sqlite.rs

@@ -1,4 +1,8 @@
+use enumflags2::BitFlags;
 use once_cell::sync::Lazy;
+use quaint::{prelude::Queryable, single::Quaint};
+
+use crate::{runtime::run_with_thread_local_runtime as tok, Tags};
 
 pub fn sqlite_test_url(db_name: &str) -> String {
     std::env::var("SQLITE_TEST_URL").unwrap_or_else(|_| format!("file:{}", sqlite_test_file(db_name)))
@@ -25,3 +29,17 @@ fn sqlite_test_file(db_name: &str) -> String {
 
     file_path.to_string_lossy().into_owned()
 }
+
+pub(crate) fn get_sqlite_tags() -> Result<BitFlags<Tags>, String> {
+    let fut = async {
+        let mut tags: BitFlags<Tags> = Tags::Sqlite.into();
+        // The SpatiaLite extension is loaded by quaint, assuming the SPATIALITE_PATH env variable is set
+        // If the extension can be loaded in a dummy database, it means it will also be available for the tests
+        let quaint = Quaint::new_in_memory().map_err(|err| err.to_string())?;
+        if let Ok(_has_spatialite) = quaint.query_raw("SELECT spatialite_version();", &[]).await {
+            tags |= Tags::Spatialite;
+        }
+        Ok(tags)
+    };
+    tok(fut)
+}

libs/test-setup/src/tags.rs

@@ -41,6 +41,8 @@ tags![
     CockroachDb221 = 1 << 19,
     CockroachDb222 = 1 << 20,
     CockroachDb231 = 1 << 21,
+    PostGIS = 1 << 22,
+    Spatialite = 1 << 23,
 ];
 
 pub fn tags_from_comma_separated_list(input: &str) -> BitFlags<Tags> {

libs/test-setup/src/test_api_args.rs

@@ -1,4 +1,4 @@
-use crate::{logging, mssql, mysql, postgres, Capabilities, Tags};
+use crate::{logging, mssql, mysql, postgres, sqlite, Capabilities, Tags};
 use enumflags2::BitFlags;
 use once_cell::sync::Lazy;
 use quaint::single::Quaint;
@@ -36,7 +36,7 @@ static DB_UNDER_TEST: Lazy<Result<DbUnderTest, String>> = Lazy::new(|| {
     match prefix {
         "file" | "sqlite" => Ok(DbUnderTest {
             database_url,
-            tags: Tags::Sqlite.into(),
+            tags: sqlite::get_sqlite_tags()?,
             capabilities: Capabilities::CreateDatabase.into(),
             provider: "sqlite",
             shadow_database_url,

prisma-fmt/tests/native_types.rs

@@ -11,7 +11,7 @@ fn test_native_types_list_on_crdb() {
 
     let result = prisma_fmt::native_types(schema.to_owned());
     let expected = expect![[
-        r#"[{"name":"Bit","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["String"]},{"name":"Bool","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Boolean"]},{"name":"Bytes","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Bytes"]},{"name":"Char","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["String"]},{"name":"Date","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["DateTime"]},{"name":"Decimal","_number_of_args":0,"_number_of_optional_args":2,"prisma_types":["Decimal"]},{"name":"Float4","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Float"]},{"name":"Float8","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Float"]},{"name":"Inet","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["String"]},{"name":"Int2","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Int"]},{"name":"Int4","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Int"]},{"name":"Int8","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["BigInt"]},{"name":"JsonB","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Json"]},{"name":"Oid","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Int"]},{"name":"CatalogSingleChar","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["String"]},{"name":"String","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["String"]},{"name":"Time","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["DateTime"]},{"name":"Timestamp","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["DateTime"]},{"name":"Timestamptz","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["DateTime"]},{"name":"Timetz","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["DateTime"]},{"name":"Uuid","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["String"]},{"name":"VarBit","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["String"]}]"#
+        r#"[{"name":"Bit","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["String"]},{"name":"Bool","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Boolean"]},{"name":"Bytes","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Bytes"]},{"name":"Char","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["String"]},{"name":"Date","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["DateTime"]},{"name":"Decimal","_number_of_args":0,"_number_of_optional_args":2,"prisma_types":["Decimal"]},{"name":"Float4","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Float"]},{"name":"Float8","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Float"]},{"name":"Inet","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["String"]},{"name":"Int2","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Int"]},{"name":"Int4","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Int"]},{"name":"Int8","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["BigInt"]},{"name":"JsonB","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Json"]},{"name":"Oid","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["Int"]},{"name":"CatalogSingleChar","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["String"]},{"name":"String","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["String"]},{"name":"Time","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["DateTime"]},{"name":"Timestamp","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["DateTime"]},{"name":"Timestamptz","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["DateTime"]},{"name":"Timetz","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["DateTime"]},{"name":"Uuid","_number_of_args":0,"_number_of_optional_args":0,"prisma_types":["String"]},{"name":"VarBit","_number_of_args":0,"_number_of_optional_args":1,"prisma_types":["String"]},{"name":"Geometry","_number_of_args":0,"_number_of_optional_args":2,"prisma_types":["Geometry","GeoJson"]},{"name":"Geography","_number_of_args":0,"_number_of_optional_args":2,"prisma_types":["Geometry","GeoJson"]}]"#
     ]];
     expected.assert_eq(&result);
 }