Merge branch 'main' into feat/order-by-to-many-field

DevFigueiredo · web-flow · commit be8f40a54c92 · 2026-04-18T16:34:06.000-03:00
diff --git a/schema-engine/connectors/sql-schema-connector/src/flavour/postgres.rs b/schema-engine/connectors/sql-schema-connector/src/flavour/postgres.rs
@@ -703,9 +703,8 @@ async fn sql_schema_from_migrations_and_db(
             migration.migration_name()
         );
 
-        conn.raw_cmd(&script)
+        conn.apply_migration_script(migration.migration_name(), &script)
             .await
-            .map_err(imp::quaint_error_mapper(params))
             .map_err(|connector_error| {
                 connector_error.into_migration_does_not_apply_cleanly(migration.migration_name().to_owned())
             })?;
diff --git a/schema-engine/core/src/commands/diff_cli.rs b/schema-engine/core/src/commands/diff_cli.rs
@@ -34,7 +34,6 @@ pub async fn diff_cli(
     let from = json_rpc_diff_target_to_dialect(
         &params.from,
         datasource_urls,
-        params.shadow_database_url.as_deref(),
         namespaces.clone(),
         &filter,
         preview_features,
@@ -44,7 +43,6 @@ pub async fn diff_cli(
     let to = json_rpc_diff_target_to_dialect(
         &params.to,
         datasource_urls,
-        params.shadow_database_url.as_deref(),
         namespaces,
         &filter,
         preview_features,
@@ -55,7 +53,6 @@ pub async fn diff_cli(
     // The `from` connector takes precedence, because if we think of diffs as migrations, `from` is
     // the target where the migration would be applied.
     //
-    // TODO: make sure the shadow_database_url param is _always_ taken into account.
     // TODO: make sure the connectors are the same in from and to.
     let (dialect, from, to) = match (from, to) {
         (Some((connector, from)), Some((_, to))) => (connector, from, to),
@@ -132,21 +129,11 @@ fn namespaces_and_preview_features_from_diff_targets(
 async fn json_rpc_diff_target_to_dialect(
     target: &DiffTarget,
     datasource_urls: &DatasourceUrls,
-    shadow_database_url: Option<&str>, // TODO: delete the parameter
     namespaces: Option<Namespaces>,
     filter: &SchemaFilter,
     preview_features: BitFlags<psl::PreviewFeature>,
     extension_types: &dyn ExtensionTypes,
 ) -> CoreResult<Option<(Box<dyn SchemaDialect>, DatabaseSchema)>> {
-    let datasource_urls = if let Some(shadow_database_url) = shadow_database_url {
-        &DatasourceUrls {
-            url: datasource_urls.url.clone(),
-            shadow_database_url: Some(shadow_database_url.to_owned()),
-        }
-    } else {
-        datasource_urls
-    };
-
     match target {
         DiffTarget::Empty => Ok(None),
         DiffTarget::SchemaDatasource(schemas) => {
@@ -237,7 +224,7 @@ async fn json_rpc_diff_target_to_dialect(
                     Ok(Some((connector.schema_dialect(), schema)))
                 }
                 (Some(_), None) => Err(ConnectorError::from_msg(
-                    "You must pass the `--shadow-database-url` flag or set `datasource.shadowDatabaseUrl` in your `prisma.config.ts` if you want to diff a migrations directory.".to_owned(),
+                    "You must set `datasource.shadowDatabaseUrl` in your `prisma.config.ts` if you want to diff a migrations directory.".to_owned(),
                 )),
                 (None, _) => Err(ConnectorError::from_msg(
                     "Could not determine the connector from the migrations directory (missing migration_lock.toml)."
diff --git a/schema-engine/json-rpc-api/src/types.rs b/schema-engine/json-rpc-api/src/types.rs
@@ -432,14 +432,6 @@ pub struct DiffParams {
     /// end-state.
     pub to: DiffTarget,
 
-    /// The URL to a live database to use as a shadow database. The schema and data on
-    /// that database will be wiped during diffing.
-    ///
-    /// This is only necessary when one of `from` or `to` is referencing a migrations
-    /// directory as a source for the schema.
-    /// @deprecated.
-    pub shadow_database_url: Option<String>,
-
     /// By default, the response will contain a human-readable diff. If you want an
     /// executable script, pass the `"script": true` param.
     pub script: bool,
diff --git a/schema-engine/sql-migration-tests/tests/errors/error_tests.rs b/schema-engine/sql-migration-tests/tests/errors/error_tests.rs
@@ -577,7 +577,6 @@ async fn diff_from_empty_schema_to_datamodel_should_not_require_url() {
                     content: dm.to_string(),
                 }],
             }),
-            shadow_database_url: None,
             script: false,
             exit_code: None,
             filters: SchemaFilter::default(),
diff --git a/schema-engine/sql-migration-tests/tests/migrations/diff.rs b/schema-engine/sql-migration-tests/tests/migrations/diff.rs
@@ -66,7 +66,6 @@ fn from_unique_index_to_without(mut api: TestApi) {
                 content: from_schema.to_string(),
             }],
         }),
-        shadow_database_url: None,
         to: DiffTarget::SchemaDatamodel(SchemasContainer {
             files: vec![SchemaContainer {
                 path: to_file.to_string_lossy().into_owned(),
@@ -177,7 +176,6 @@ fn from_unique_index_to_pk(mut api: TestApi) {
                 content: from_schema.to_string(),
             }],
         }),
-        shadow_database_url: None,
         to: DiffTarget::SchemaDatamodel(SchemasContainer {
             files: vec![SchemaContainer {
                 path: to_file.to_string_lossy().into_owned(),
@@ -369,7 +367,6 @@ fn from_empty_to_migrations_directory(mut api: TestApi) {
         from: DiffTarget::Empty,
         to: DiffTarget::Migrations(migrations_list),
         script: true,
-        shadow_database_url: Some(api.connection_string().to_owned()),
         filters: SchemaFilter::default(),
     };
 
@@ -421,7 +418,6 @@ fn from_empty_to_migrations_folder_without_shadow_db_url_must_error(mut api: Tes
         from: DiffTarget::Empty,
         to: DiffTarget::Migrations(migrations_list),
         script: true,
-        shadow_database_url: None, // TODO: ?
         filters: SchemaFilter::default(),
     };
 
@@ -436,7 +432,7 @@ fn from_empty_to_migrations_folder_without_shadow_db_url_must_error(mut api: Tes
         .unwrap_err();
 
     let expected_error = expect![[r#"
-        You must pass the `--shadow-database-url` flag or set `datasource.shadowDatabaseUrl` in your `prisma.config.ts` if you want to diff a migrations directory.
+        You must set `datasource.shadowDatabaseUrl` in your `prisma.config.ts` if you want to diff a migrations directory.
     "#]];
     expected_error.assert_eq(&err.to_string());
 }
@@ -478,7 +474,6 @@ fn from_schema_datamodel_to_url(mut api: TestApi) {
             }],
         }),
         script: true,
-        shadow_database_url: None,
         to: DiffTarget::Url(UrlContainer { url: second_url }),
         filters: SchemaFilter::default(),
     };
@@ -530,7 +525,6 @@ fn from_schema_datasource_relative(api: TestApi) {
             config_dir: schema_path.parent().unwrap().to_string_lossy().into_owned(),
         }),
         script: true,
-        shadow_database_url: None,
         to: DiffTarget::Empty,
         filters: SchemaFilter::default(),
     };
@@ -590,7 +584,6 @@ fn from_schema_datasource_to_url(mut api: TestApi) {
             config_dir: schema_path.parent().unwrap().to_string_lossy().into_owned(),
         }),
         script: true,
-        shadow_database_url: None,
         to: DiffTarget::Url(UrlContainer { url: second_url }),
         filters: SchemaFilter::default(),
     };
@@ -649,7 +642,6 @@ fn with_schema_filters(api: TestApi) {
             config_dir: schema_path.parent().unwrap().to_string_lossy().into_owned(),
         }),
         script: true,
-        shadow_database_url: None,
         to: DiffTarget::Url(UrlContainer { url: second_url }),
         filters: SchemaFilter {
             external_tables: vec!["external_table".to_string()],
@@ -704,7 +696,6 @@ fn with_invalid_schema_filter_sqlite(mut api: TestApi) {
             config_dir: schema_path.parent().unwrap().to_string_lossy().into_owned(),
         }),
         script: true,
-        shadow_database_url: None,
         to: DiffTarget::Url(UrlContainer { url: second_url }),
         filters: SchemaFilter {
             external_tables: vec!["public.external_table".to_string()],
@@ -743,7 +734,6 @@ fn with_invalid_schema_filter_postgres(mut api: TestApi) {
             config_dir: schema_path.parent().unwrap().to_string_lossy().into_owned(),
         }),
         script: true,
-        shadow_database_url: None,
         to: DiffTarget::Url(UrlContainer {
             url: connection_string.to_string(),
         }),
@@ -786,7 +776,6 @@ fn from_url_to_url(mut api: TestApi) {
         exit_code: None,
         from: DiffTarget::Url(UrlContainer { url: first_url }),
         script: true,
-        shadow_database_url: None,
         to: DiffTarget::Url(UrlContainer { url: second_url }),
         filters: SchemaFilter::default(),
     };
@@ -845,7 +834,6 @@ fn diffing_mongo_schemas_to_script_returns_a_nice_error() {
                 content: from.to_string(),
             }],
         }),
-        shadow_database_url: None,
         to: DiffTarget::SchemaDatamodel(SchemasContainer {
             files: vec![SchemaContainer {
                 path: to_file.to_string_lossy().into_owned(),
@@ -879,7 +867,6 @@ fn diff_sqlite_migration_directories() {
         exit_code: None,
         from: DiffTarget::Migrations(migrations_list),
         script: true,
-        shadow_database_url: None,
         to: DiffTarget::Migrations(migrations_list_2),
         filters: SchemaFilter::default(),
     };
@@ -946,7 +933,6 @@ fn from_migrations_to_schema_datamodel_ignores_manual_partial_indexes_without_pr
                 }],
             }),
             script: false,
-            shadow_database_url: Some(api.connection_string().to_owned()),
             filters: SchemaFilter::default(),
         },
     );
@@ -1011,7 +997,6 @@ fn from_schema_datamodel_to_migrations_ignores_manual_partial_indexes_without_pr
             }),
             to: DiffTarget::Migrations(list_migrations(migrations_dir.path()).unwrap()),
             script: false,
-            shadow_database_url: Some(api.connection_string().to_owned()),
             filters: SchemaFilter::default(),
         },
     );
@@ -1084,7 +1069,6 @@ fn from_migrations_to_url_ignores_manual_partial_indexes_with_engine_seeded_sche
                 url: api.connection_string().to_owned(),
             }),
             script: false,
-            shadow_database_url: Some(api.connection_string().to_owned()),
             filters: SchemaFilter::default(),
         },
     );
@@ -1140,7 +1124,6 @@ fn diffing_mongo_schemas_works() {
                 content: from.to_string(),
             }],
         }),
-        shadow_database_url: None,
         to: DiffTarget::SchemaDatamodel(SchemasContainer {
             files: vec![SchemaContainer {
                 path: to_file.to_string_lossy().into_owned(),
@@ -1193,7 +1176,6 @@ fn diff_with_exit_code_and_empty_diff_returns_zero() {
                 }],
             }),
             script: false,
-            shadow_database_url: None,
             filters: SchemaFilter::default(),
         },
     );
@@ -1234,7 +1216,6 @@ fn diff_with_exit_code_and_non_empty_diff_returns_two() {
                 }],
             }),
             script: false,
-            shadow_database_url: None,
             filters: SchemaFilter::default(),
         },
     );
@@ -1262,7 +1243,6 @@ fn diff_with_non_existing_sqlite_database_from_url() {
             exit_code: Some(true),
             from: DiffTarget::Empty,
             script: false,
-            shadow_database_url: None,
             to: DiffTarget::Url(UrlContainer {
                 url: format!("file:{}", tmpdir.path().join("db.sqlite").to_string_lossy()),
             }),
@@ -1298,7 +1278,6 @@ fn diff_with_non_existing_sqlite_database_from_datasource() {
             exit_code: Some(true),
             from: DiffTarget::Empty,
             script: false,
-            shadow_database_url: None,
             to: DiffTarget::SchemaDatasource(SchemasWithConfigDir {
                 files: vec![SchemaContainer {
                     path: schema_path.to_string_lossy().into_owned(),
@@ -1370,7 +1349,6 @@ fn from_multi_file_schema_datasource_to_url(mut api: TestApi) {
             config_dir: base_dir.path().to_string_lossy().into_owned(),
         }),
         script: true,
-        shadow_database_url: None,
         to: DiffTarget::Url(UrlContainer { url: second_url }),
         filters: SchemaFilter::default(),
     };
@@ -1436,7 +1414,6 @@ fn from_multi_file_schema_datamodel_to_url(mut api: TestApi) {
         exit_code: None,
         from: DiffTarget::SchemaDatamodel(SchemasContainer { files: from_files }),
         script: true,
-        shadow_database_url: None,
         to: DiffTarget::Url(UrlContainer { url: second_url }),
         filters: SchemaFilter::default(),
     };
diff --git a/schema-engine/sql-migration-tests/tests/migrations/drift_summary.rs b/schema-engine/sql-migration-tests/tests/migrations/drift_summary.rs
@@ -20,7 +20,6 @@ fn check(provider: &str, from: &str, to: &str, expectation: Expect) {
             }],
         }),
         script: false,
-        shadow_database_url: None,
         to: schema_core::json_rpc::types::DiffTarget::SchemaDatamodel(SchemasContainer {
             files: vec![SchemaContainer {
                 path: to_schema.to_str().unwrap().to_owned(),
diff --git a/schema-engine/sql-migration-tests/tests/migrations/mysql.rs b/schema-engine/sql-migration-tests/tests/migrations/mysql.rs
@@ -513,7 +513,6 @@ fn dropping_m2m_relation_from_datamodel_works() {
                 }],
             }),
             script: true,
-            shadow_database_url: None,
             filters: SchemaFilter::default(),
         },
     );
diff --git a/schema-engine/sql-migration-tests/tests/migrations/postgres.rs b/schema-engine/sql-migration-tests/tests/migrations/postgres.rs
@@ -1114,3 +1114,51 @@ fn postgres_create_index_concurrently_works(api: TestApi) {
         .send_sync()
         .assert_applied_migrations(&["01init"]);
 }
+
+#[test_connector(tags(Postgres))]
+fn postgres_create_migration_works_with_multiple_create_index_concurrently_statements(api: TestApi) {
+    let migrations_directory = api.create_migrations_directory();
+    let dm = "";
+    let migration = r#"
+        CREATE TABLE "Cat" (
+            id INTEGER PRIMARY KEY,
+            name TEXT NOT NULL,
+            age INTEGER NOT NULL
+        );
+
+        CREATE INDEX CONCURRENTLY "Cat_name_idx" ON "Cat"(name);
+        CREATE INDEX CONCURRENTLY "Cat_age_idx" ON "Cat"(age);
+    "#;
+
+    api.create_migration("01init", dm, &migrations_directory)
+        .draft(true)
+        .send_sync()
+        .modify_migration(|contents| {
+            contents.clear();
+            contents.push_str(migration);
+        });
+
+    let dm2 = api.datamodel_with_provider(
+        r#"
+        model Cat {
+            id    Int    @id
+            name  String
+            age   Int
+            breed String?
+
+            @@index([name])
+            @@index([age])
+        }
+    "#,
+    );
+
+    api.create_migration("02add_breed", &dm2, &migrations_directory)
+        .send_sync()
+        .assert_migration("02add_breed", |migration| {
+            migration.assert_contents(
+                r#"-- AlterTable
+ALTER TABLE "Cat" ADD COLUMN     "breed" TEXT;
+"#,
+            )
+        });
+}
diff --git a/schema-engine/sql-migration-tests/tests/single_migration_tests.rs b/schema-engine/sql-migration-tests/tests/single_migration_tests.rs
@@ -106,7 +106,6 @@ fn run_single_migration_test(test_file_path: &str, test_function_name: &'static
     tok(schema_engine.diff(schema_core::json_rpc::types::DiffParams {
         exit_code: None,
         script: true,
-        shadow_database_url: None,
         from: schema_core::json_rpc::types::DiffTarget::Empty,
         to: schema_core::json_rpc::types::DiffTarget::SchemaDatamodel(SchemasContainer {
             files: vec![schema_core::json_rpc::types::SchemaContainer {
@@ -133,7 +132,6 @@ fn run_single_migration_test(test_file_path: &str, test_function_name: &'static
     let second_migration_result = tok(schema_engine.diff(schema_core::json_rpc::types::DiffParams {
         exit_code: Some(true),
         script: true,
-        shadow_database_url: None,
         from: schema_core::json_rpc::types::DiffTarget::Url(schema_core::json_rpc::types::UrlContainer {
             url: connection_string,
         }),
diff --git a/schema-engine/sql-schema-describer/src/postgres/default.rs b/schema-engine/sql-schema-describer/src/postgres/default.rs
