refactor: make schema-filter non optional (#5560)

Small refactoring PR to make schema-filter non optional but work with a
default filter instead. Removes some annoying optional handling. Will
require minor update on the types on the TS side.

Author: FGoessler

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

@@ -1,7 +1,7 @@
 use connection_string::JdbcString;
 use quaint::{prelude::*, single::Quaint};
 use schema_core::{
-    json_rpc::types::ResetInput,
+    json_rpc::types::{ResetInput, SchemaFilter},
     schema_connector::{ConnectorError, ConnectorParams, ConnectorResult},
 };
 use std::str::FromStr;
@@ -24,7 +24,11 @@ pub(crate) async fn mssql_setup(url: String, prisma_schema: &str, db_schemas: &[
         conn.raw_cmd(&sql).await.unwrap();
     } else {
         let mut api = schema_core::schema_api(Some(prisma_schema.to_owned()), None)?;
-        api.reset(ResetInput { filter: None }).await.ok();
+        api.reset(ResetInput {
+            filter: SchemaFilter::default(),
+        })
+        .await
+        .ok();
         api.dispose().await.ok();
         // Without these, our poor connection gets deadlocks if other schemas
         // are modified while we introspect.

schema-engine/connectors/schema-connector/src/filter.rs

@@ -48,13 +48,3 @@ impl From<json_rpc::types::SchemaFilter> for SchemaFilter {
         }
     }
 }
-
-impl From<Option<json_rpc::types::SchemaFilter>> for SchemaFilter {
-    fn from(filter: Option<json_rpc::types::SchemaFilter>) -> Self {
-        let filter = filter.unwrap_or_default();
-        Self {
-            external_tables: filter.external_tables,
-            external_enums: filter.external_enums,
-        }
-    }
-}

schema-engine/json-rpc-api/src/types.rs

@@ -234,7 +234,7 @@ pub struct ApplyMigrationsInput {
     pub migrations_list: MigrationList,
 
     /// The schema filter to use during the apply migrations.
-    pub filters: Option<SchemaFilter>,
+    pub filters: SchemaFilter,
 }
 
 /// The output of the `applyMigrations` command.
@@ -289,7 +289,7 @@ pub struct CreateMigrationInput {
     pub schema: SchemasContainer,
 
     /// Entities to be included or excluded from the migration.
-    pub filters: Option<SchemaFilter>,
+    pub filters: SchemaFilter,
 }
 
 /// The output of the `createMigration` command.
@@ -363,7 +363,7 @@ pub struct DevDiagnosticInput {
     pub migrations_list: MigrationList,
 
     /// The schema filter to use during checks on the database.
-    pub filters: Option<SchemaFilter>,
+    pub filters: SchemaFilter,
 }
 
 /// The response type for `devDiagnostic`.
@@ -391,7 +391,7 @@ pub struct DiagnoseMigrationHistoryInput {
 
     /// The schema filter to use during checks on the database.
     /// Note: Only used if opt_in_to_shadow_database is true.
-    pub filters: Option<SchemaFilter>,
+    pub filters: SchemaFilter,
 }
 
 /// The result type for `diagnoseMigrationHistory` responses.
@@ -451,7 +451,7 @@ pub struct DiffParams {
     pub exit_code: Option<bool>,
 
     /// The schema filter to use during the diff.
-    pub filters: Option<SchemaFilter>,
+    pub filters: SchemaFilter,
 }
 
 /// The result type for the `diff` method.
@@ -629,7 +629,7 @@ pub struct EvaluateDataLossInput {
     /// The prisma schema files to migrate to.
     pub schema: SchemasContainer,
     /// Entities to be included or excluded during the data loss evaluation.
-    pub filters: Option<SchemaFilter>,
+    pub filters: SchemaFilter,
 }
 
 /// The output of the `evaluateDataLoss` command.
@@ -736,7 +736,7 @@ pub struct MarkMigrationRolledBackOutput {}
 #[cfg_attr(target_arch = "wasm32", tsify(missing_as_null, from_wasm_abi))]
 pub struct ResetInput {
     /// The schema filter to use during the reset. Only relevant during "soft" resets though - usually we try to drop the whole database.
-    pub filter: Option<SchemaFilter>,
+    pub filter: SchemaFilter,
 }
 
 /// The output of the `reset` command.
@@ -759,7 +759,7 @@ pub struct SchemaPushInput {
     pub schema: SchemasContainer,
 
     /// The schema filter to use during the push.
-    pub filters: Option<SchemaFilter>,
+    pub filters: SchemaFilter,
 }
 
 /// Response result for the `schemaPush` method.

schema-engine/sql-migration-tests/src/commands/apply_migrations.rs

@@ -34,7 +34,7 @@ impl<'a> ApplyMigrations<'a> {
         let output = apply_migrations(
             ApplyMigrationsInput {
                 migrations_list,
-                filters: None,
+                filters: SchemaFilter::default(),
             },
             self.api,
             self.namespaces,

schema-engine/sql-migration-tests/src/commands/create_migration.rs

@@ -133,7 +133,7 @@ impl<'a> CreateMigration<'a> {
                 schema: SchemasContainer { files: self.files },
                 draft: self.draft,
                 migration_name: migration_name.clone(),
-                filters: Some(self.filter),
+                filters: self.filter,
             },
             self.api,
             &mut migration_schema_cache,

schema-engine/sql-migration-tests/src/commands/dev_diagnostic.rs

@@ -31,7 +31,7 @@ impl<'a> DevDiagnostic<'a> {
         let fut = dev_diagnostic_cli(
             DevDiagnosticInput {
                 migrations_list,
-                filters: Some(self.filter),
+                filters: self.filter,
             },
             None,
             self.api,

schema-engine/sql-migration-tests/src/commands/diagnose_migration_history.rs

@@ -1,7 +1,7 @@
 use schema_core::{
     CoreError, CoreResult,
-    commands::DiagnoseMigrationHistoryOutput,
-    commands::{DiagnoseMigrationHistoryInput, diagnose_migration_history_cli},
+    commands::{DiagnoseMigrationHistoryInput, DiagnoseMigrationHistoryOutput, diagnose_migration_history_cli},
+    json_rpc::types::SchemaFilter,
     schema_connector::SchemaConnector,
 };
 use tempfile::TempDir;
@@ -37,7 +37,7 @@ impl<'a> DiagnoseMigrationHistory<'a> {
             DiagnoseMigrationHistoryInput {
                 migrations_list,
                 opt_in_to_shadow_database: self.opt_in_to_shadow_database,
-                filters: None,
+                filters: SchemaFilter::default(),
             },
             None,
             self.api,

schema-engine/sql-migration-tests/src/commands/evaluate_data_loss.rs

@@ -40,7 +40,7 @@ impl<'a> EvaluateDataLoss<'a> {
             EvaluateDataLossInput {
                 migrations_list,
                 schema: SchemasContainer { files: self.files },
-                filters: Some(self.filter),
+                filters: self.filter,
             },
             self.api,
             &mut migration_schema_cache,

schema-engine/sql-migration-tests/src/commands/schema_push.rs

@@ -14,15 +14,15 @@ pub struct SchemaPush<'a> {
     migration_id: Option<&'a str>,
     // In eventually-consistent systems, we might need to wait for a while before the system refreshes
     max_ddl_refresh_delay: Option<Duration>,
-    schema_filter: Option<SchemaFilter>,
+    schema_filter: SchemaFilter,
 }
 
 impl<'a> SchemaPush<'a> {
     pub fn new(
         api: &'a mut dyn SchemaConnector,
         files: &[(&str, &str)],
         max_refresh_delay: Option<Duration>,
-        schema_filter: Option<SchemaFilter>,
+        schema_filter: SchemaFilter,
     ) -> Self {
         SchemaPush {
             api,

schema-engine/sql-migration-tests/src/multi_engine_test_api.rs

@@ -360,7 +360,7 @@ impl EngineTestApi {
             &mut self.connector,
             &[("schema.prisma", &dm)],
             self.max_ddl_refresh_delay,
-            None,
+            SchemaFilter::default(),
         )
     }