fix filterBySchema with defaultSchema

Author: arthurfiorette

src/generator.ts

@@ -48,9 +48,12 @@ generatorHandler({
       options.dmmf.datamodel.models
     );
 
+    const hasMultiSchema = options.datasources.some(
+      (d) => d.schemas.length > 0
+    );
+
     const multiSchemaMap =
-      config.groupBySchema ||
-      options.generator.previewFeatures?.includes("multiSchema")
+      config.groupBySchema || hasMultiSchema
         ? parseMultiSchemaMap(options.datamodel)
         : undefined;
 
@@ -69,10 +72,7 @@ generatorHandler({
     );
 
     // Extend model table names with schema names if using multi-schemas
-    if (
-      options.generator.previewFeatures?.includes("multiSchema") ||
-      options.datasources.some((d) => d.schemas.length > 0)
-    ) {
+    if (hasMultiSchema) {
       const filterBySchema = config.filterBySchema
         ? new Set(config.filterBySchema)
         : null;

src/helpers/multiSchemaHelpers.ts

@@ -28,7 +28,7 @@ export const convertToMultiSchemaModels = <const T extends ModelLike>(
   return models.flatMap((model) => {
     const schemaName = multiSchemaMap?.get(model.typeName);
 
-    if (!schemaName || schemaName === defaultSchema) {
+    if (!schemaName) {
       return model;
     }
 
@@ -37,6 +37,11 @@ export const convertToMultiSchemaModels = <const T extends ModelLike>(
       return [];
     }
 
+    // If the schema is the default schema, we don't need to modify the model
+    if (schemaName === defaultSchema) {
+      return model;
+    }
+
     return [
       {
         ...model,