describer: multiSchema-aware SQL Server

introspection-engine/introspection-engine-tests/tests/multi_schema/sql_server.rs

@@ -0,0 +1,80 @@
+use introspection_engine_tests::{test_api::*, TestResult};
+
+#[test_connector(tags(Mssql), preview_features("multiSchema"), namespaces("first", "second"))]
+async fn multiple_schemas_w_tables_are_introspected(api: &TestApi) -> TestResult {
+    let schema_name = "first";
+    let other_name = "second";
+
+    let setup = format!("CREATE SCHEMA {schema_name}");
+    api.database().raw_cmd(&setup).await?;
+
+    let setup = format!("CREATE SCHEMA {other_name}");
+    api.database().raw_cmd(&setup).await?;
+
+    let setup = format!("CREATE SCHEMA third");
+    api.database().raw_cmd(&setup).await?;
+
+    let setup = formatdoc!(
+        r#"
+        CREATE TABLE [{schema_name}].[A] (
+            id INT IDENTITY,
+            data INT,
+            CONSTRAINT [A_pkey] PRIMARY KEY (id)
+        );
+    "#
+    );
+    api.database().raw_cmd(&setup).await?;
+
+    let setup = formatdoc!(
+        r#"
+        CREATE TABLE [{other_name}].[B] (
+            id INT IDENTITY,
+            data INT,
+            CONSTRAINT [B_pkey] PRIMARY KEY (id)
+        );
+    "#
+    );
+    api.database().raw_cmd(&setup).await?;
+
+    let setup = formatdoc!(
+        r#"
+        CREATE TABLE [third].[C] (
+            id INT IDENTITY,
+            data INT,
+            CONSTRAINT [C_pkey] PRIMARY KEY (id)
+        );
+    "#
+    );
+    api.database().raw_cmd(&setup).await?;
+
+    let expected = expect![[r#"
+        generator client {
+          provider        = "prisma-client-js"
+          previewFeatures = ["multiSchema"]
+        }
+
+        datasource db {
+          provider = "sqlserver"
+          url      = "env(TEST_DATABASE_URL)"
+          schemas  = ["first", "second"]
+        }
+
+        model A {
+          id   Int  @id @default(autoincrement())
+          data Int?
+
+          @@schema("first")
+        }
+
+        model B {
+          id   Int  @id @default(autoincrement())
+          data Int?
+
+          @@schema("second")
+        }
+    "#]];
+
+    api.expect_datamodel(&expected).await;
+
+    Ok(())
+}

libs/sql-schema-describer/src/getters.rs

@@ -16,27 +16,31 @@ pub trait Getter {
 }
 
 impl Getter for ResultRow {
+    #[track_caller]
     fn get_expect_string(&self, name: &str) -> String {
         self.get(name)
             .and_then(|x| x.to_string())
             .ok_or_else(|| format!("Getting {} from Resultrow {:?} as String failed", name, &self))
             .unwrap()
     }
 
+    #[track_caller]
     fn get_expect_char(&self, name: &str) -> char {
         self.get(name)
             .and_then(|x| x.as_char())
             .ok_or_else(|| format!("Getting {} from Resultrow {:?} as char failed", name, &self))
             .unwrap()
     }
 
+    #[track_caller]
     fn get_expect_i64(&self, name: &str) -> i64 {
         self.get(name)
             .and_then(|x| x.as_integer())
             .ok_or_else(|| format!("Getting {} from Resultrow {:?} as i64 failed", name, &self))
             .unwrap()
     }
 
+    #[track_caller]
     fn get_expect_bool(&self, name: &str) -> bool {
         self.get_bool(name)
             .ok_or_else(|| format!("Getting {} from Resultrow {:?} as bool failed", name, &self))

libs/sql-schema-describer/src/lib.rs

@@ -434,6 +434,8 @@ pub struct Procedure {
 /// A user-defined type. Can map to another type, or be declared as assembly.
 #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
 pub struct UserDefinedType {
+    ///Namespace of the procedure
+    namespace_id: NamespaceId,
     /// Type name
     pub name: String,
     /// Type mapping