update

Author: ymc9

packages/orm/src/client/executor/zenstack-query-executor.ts

@@ -55,18 +55,14 @@ export class ZenStackQueryExecutor<Schema extends SchemaDef> extends DefaultQuer
     ) {
         super(compiler, adapter, connectionProvider, plugins);
 
-        if (this.schemaHasCustomPostgresSchema(client.$schema) || this.schemaHasMappedNames(client.$schema)) {
+        if (
+            client.$schema.provider.type === 'postgresql' || // postgres queries need to be schema-qualified
+            this.schemaHasMappedNames(client.$schema)
+        ) {
             this.nameMapper = new QueryNameMapper(client.$schema);
         }
     }
 
-    private schemaHasCustomPostgresSchema(schema: SchemaDef) {
-        if (schema.provider.type !== 'postgresql') {
-            return false;
-        }
-        return Object.values(schema.models).some((model) => model.attributes?.some((attr) => attr.name === '@@schema'));
-    }
-
     private schemaHasMappedNames(schema: Schema) {
         const hasMapAttr = (decl: ModelDef | TypeDefDef) => {
             if (decl.attributes?.some((attr) => attr.name === '@@map')) {