fix: ORM-1269 fix table recreation through default schema (#5561)

This PR fixes an issue when enabling the multi schema preview feature
but not using explicit schema names and relying on the default schema
instead.

During diffing the existing tables in the database/applied migrations
were introspected with a namespace (the db default one from the
connection string). But the tables from the schema file (the target
state) didn't have a namespace.
=> actually identical tables were treated as different => tables got
dropped and created

This PR fixes this by making the schema generated from the schema file
aware of the default schema name. Tables in both schemas now have the
same schema name and diffing works as intended.

Author: FGoessler

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

@@ -35,7 +35,8 @@ jobs:
       threads: 8
 
   postgres-push:
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.body, '/test-all'))
     strategy:
       fail-fast: false
       matrix:
@@ -80,7 +81,8 @@ jobs:
       relation_load_strategy: ${{ matrix.database.relation_load_strategy }}
 
   mysql-push:
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.body, '/test-all'))
     strategy:
       fail-fast: false
       matrix:
@@ -107,7 +109,8 @@ jobs:
       relation_load_strategy: ${{ matrix.database.relation_load_strategy }}
 
   cockroachdb-push:
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.body, '/test-all'))
     strategy:
       fail-fast: false
       matrix:
@@ -145,7 +148,8 @@ jobs:
       relation_load_strategy: '["query"]'
 
   mongodb-push:
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.body, '/test-all'))
     strategy:
       fail-fast: false
       matrix:
@@ -183,7 +187,8 @@ jobs:
       relation_load_strategy: '["query"]'
 
   mssql-push:
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.body, '/test-all'))
     strategy:
       fail-fast: false
       matrix:

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

@@ -20,7 +20,8 @@ concurrency:
 
 jobs:
   test-mongodb-schema-connector:
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.body, '/test-all'))
     strategy:
       fail-fast: false
       matrix:
@@ -82,7 +83,9 @@ jobs:
       database_url: ${{ matrix.database.url }}
 
   test-linux-push:
-    if: github.event_name == 'push'
+    if: |
+      github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.body, '/test-all'))
     strategy:
       fail-fast: false
       matrix:
@@ -133,7 +136,8 @@ jobs:
       single_threaded: ${{ matrix.database.single_threaded }}
 
   test-windows:
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.body, '/test-all'))
     strategy:
       fail-fast: false
       matrix:

libs/test-setup/src/postgres.rs

@@ -83,13 +83,13 @@ pub async fn create_postgres_database(database_url: &str, db_name: &str) -> Resu
 
     url.query_pairs_mut()
         .append_pair("statement_cache_size", "0")
-        .append_pair("schema", "prisma-tests");
+        .append_pair("schema", "public");
 
     let url_str = url.to_string();
 
     let conn = Quaint::new(&url_str).await?;
 
-    conn.raw_cmd("CREATE SCHEMA \"prisma-tests\"").await?;
+    conn.raw_cmd("CREATE SCHEMA IF NOT EXISTS \"public\"").await?;
 
     Ok((conn, url_str))
 }

libs/user-facing-errors/src/schema_engine.rs

@@ -289,14 +289,14 @@ pub struct DirectDdlNotAllowed;
 #[derive(Debug, SimpleUserFacingError)]
 #[user_facing(
     code = "P3023",
-    message = "When using an explicit schemas list in your datasource, `externalTables` in your prisma config must contain only fully qualified table names (e.g. `schema_name.table_name`)."
+    message = "For the current database, `externalTables` & `externalEnums` in your prisma config must contain only fully qualified identifiers (e.g. `schema_name.table_name`)."
 )]
 pub struct MissingNamespaceInExternalTables;
 
 #[derive(Debug, SimpleUserFacingError)]
 #[user_facing(
     code = "P3024",
-    message = "When using no explicit schemas list in your datasource, `externalTables` in your prisma config must contain only simple table names without a schema name."
+    message = "For the current database, `externalTables` & `externalEnums` in your prisma config must contain only simple identifiers without a schema name."
 )]
 pub struct UnexpectedNamespaceInExternalTables;
 

query-engine/connector-test-kit-rs/qe-setup/src/lib.rs

@@ -78,7 +78,7 @@ pub async fn setup_external<'a>(
             // 1. Compute the diff migration script.
             std::fs::remove_file(source.url.as_literal().unwrap().trim_start_matches("file:")).ok();
             let dialect = sql_schema_connector::SqlSchemaDialect::sqlite();
-            let migration_script = crate::diff(prisma_schema, &dialect).await?;
+            let migration_script = crate::diff(prisma_schema, &dialect, None).await?;
 
             // 2. Tell JavaScript to take care of the schema migration.
             //    This results in a JSON-RPC call to the JS runtime.
@@ -148,15 +148,25 @@ pub async fn teardown(prisma_schema: &str, db_schemas: &[&str]) -> ConnectorResu
 
 /// Compute an initialisation migration script via
 /// `prisma migrate diff --from-empty --to-schema-datamodel $SCHEMA_PATH --script`.
-pub(crate) async fn diff(schema: &str, dialect: &dyn SchemaDialect) -> ConnectorResult<String> {
+pub(crate) async fn diff(
+    schema: &str,
+    dialect: &dyn SchemaDialect,
+    default_namespace: Option<&str>,
+) -> ConnectorResult<String> {
     let from = dialect.empty_database_schema();
-    let to = dialect.schema_from_datamodel(vec![("schema.prisma".to_string(), schema.into())])?;
+    let to = dialect.schema_from_datamodel(vec![("schema.prisma".to_string(), schema.into())], default_namespace)?;
     let migration = dialect.diff(from, to, &SchemaFilter::default());
     dialect.render_script(&migration, &Default::default())
 }
 
 /// Apply the script returned by [`diff`] against the database.
 pub(crate) async fn diff_and_apply(schema: &str, connector: &mut dyn SchemaConnector) -> ConnectorResult<()> {
-    let script = diff(schema, &*connector.schema_dialect()).await.unwrap();
+    let script = diff(
+        schema,
+        &*connector.schema_dialect(),
+        connector.default_runtime_namespace(),
+    )
+    .await
+    .unwrap();
     connector.db_execute(script).await
 }

schema-engine/commands/src/commands/create_migration.rs

@@ -32,9 +32,10 @@ pub async fn create_migration(
     let sources: Vec<_> = input.schema.to_psl_input();
     let dialect = connector.schema_dialect();
     let filter: schema_connector::SchemaFilter = input.filters.into();
+    let default_namespace = connector.default_runtime_namespace();
     // We need to start with the 'to', which is the Schema, in order to grab the
     // namespaces, in case we've got MultiSchema enabled.
-    let to = dialect.schema_from_datamodel(sources)?;
+    let to = dialect.schema_from_datamodel(sources, default_namespace)?;
     let namespaces = dialect.extract_namespaces(&to);
     filter.validate(namespaces.as_ref())?;
 

schema-engine/commands/src/commands/diff.rs

@@ -138,7 +138,7 @@ async fn diff_target_to_dialect(
         DiffTarget::SchemaDatamodel(schemas) => {
             let sources = schemas.to_psl_input();
             let dialect = schema_to_dialect(&sources)?;
-            let schema = dialect.schema_from_datamodel(sources)?;
+            let schema = dialect.schema_from_datamodel(sources, connector.default_runtime_namespace())?;
             Ok(Some((dialect, schema)))
         }
         DiffTarget::Url(UrlContainer { .. }) => Err(ConnectorError::from_msg(

schema-engine/commands/src/commands/evaluate_data_loss.rs

@@ -18,7 +18,7 @@ pub async fn evaluate_data_loss(
     let dialect = connector.schema_dialect();
     let filter: schema_connector::SchemaFilter = input.filters.into();
 
-    let to = dialect.schema_from_datamodel(sources)?;
+    let to = dialect.schema_from_datamodel(sources, connector.default_runtime_namespace())?;
 
     let from = migration_schema_cache
         .get_or_insert(&input.migrations_list.migration_directories, || async {

schema-engine/commands/src/commands/schema_push.rs

@@ -24,7 +24,7 @@ pub async fn schema_push(input: SchemaPushInput, connector: &mut dyn SchemaConne
     let dialect = connector.schema_dialect();
     let filter: schema_connector::SchemaFilter = input.filters.into();
 
-    let to = dialect.schema_from_datamodel(sources)?;
+    let to = dialect.schema_from_datamodel(sources, connector.default_runtime_namespace())?;
     // We only consider the namespaces present in the "to" schema aka the PSL file for the introspection of the "from" schema.
     // So when the user removes a previously existing namespace from their PSL file we will not modify that namespace in the database.
     let namespaces = dialect.extract_namespaces(&to);

schema-engine/connectors/mongodb-schema-connector/src/lib.rs

@@ -90,7 +90,15 @@ impl SchemaDialect for MongoDbSchemaDialect {
         DatabaseSchema::new(MongoSchema::default())
     }
 
-    fn schema_from_datamodel(&self, sources: Vec<(String, psl::SourceFile)>) -> ConnectorResult<DatabaseSchema> {
+    fn default_namespace(&self) -> Option<&str> {
+        None
+    }
+
+    fn schema_from_datamodel(
+        &self,
+        sources: Vec<(String, psl::SourceFile)>,
+        _default_namespace: Option<&str>,
+    ) -> ConnectorResult<DatabaseSchema> {
         let validated_schema = psl::parse_schema_multi(&sources).map_err(ConnectorError::new_schema_parser_error)?;
         Ok(DatabaseSchema::new(schema_calculator::calculate(&validated_schema)))
     }
@@ -121,6 +129,10 @@ impl SchemaConnector for MongoDbSchemaConnector {
         Box::new(MongoDbSchemaDialect)
     }
 
+    fn default_runtime_namespace(&self) -> Option<&str> {
+        None
+    }
+
     fn host(&self) -> &Arc<dyn ConnectorHost> {
         &self.host
     }