@mikro-orm/postgresql 6.3.8-dev.2 → 6.3.8-dev.3

package/PostgreSqlSchemaHelper.d.ts

@@ -17,13 +17,13 @@ export declare class PostgreSqlSchemaHelper extends SchemaHelper {
     private getIgnoredNamespacesConditionSQL;
     loadInformationSchema(schema: DatabaseSchema, connection: AbstractSqlConnection, tables: Table[], schemas?: string[]): Promise<void>;
     getAllIndexes(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<IndexDef[]>>;
-    getAllColumns(connection: AbstractSqlConnection, tables: Table[], nativeEnums?: Dictionary<{
+    getAllColumns(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>, nativeEnums?: Dictionary<{
         name: string;
         schema?: string;
         items: string[];
     }>): Promise<Dictionary<Column[]>>;
-    getAllChecks(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<CheckDef[]>>;
-    getAllForeignKeys(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<Dictionary<ForeignKey>>>;
+    getAllChecks(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>): Promise<Dictionary<CheckDef[]>>;
+    getAllForeignKeys(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>): Promise<Dictionary<Dictionary<ForeignKey>>>;
     getNativeEnumDefinitions(connection: AbstractSqlConnection, schemas: string[]): Promise<Dictionary<{
         name: string;
         schema?: string;

package/PostgreSqlSchemaHelper.js

@@ -58,10 +58,11 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         if (tables.length === 0) {
             return;
         }
-        const columns = await this.getAllColumns(connection, tables, nativeEnums);
+        const tablesBySchema = this.getTablesGroupedBySchemas(tables);
+        const columns = await this.getAllColumns(connection, tablesBySchema, nativeEnums);
         const indexes = await this.getAllIndexes(connection, tables);
-        const checks = await this.getAllChecks(connection, tables);
-        const fks = await this.getAllForeignKeys(connection, tables);
+        const checks = await this.getAllChecks(connection, tablesBySchema);
+        const fks = await this.getAllForeignKeys(connection, tablesBySchema);
         for (const t of tables) {
             const key = this.getTableKey(t);
             const table = schema.addTable(t.table_name, t.schema_name, t.table_comment);
@@ -100,7 +101,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         }
         return ret;
     }
-    async getAllColumns(connection, tables, nativeEnums) {
+    async getAllColumns(connection, tablesBySchemas, nativeEnums) {
         const sql = `select table_schema as schema_name, table_name, column_name,
       column_default,
       is_nullable,
@@ -117,7 +118,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
       from information_schema.columns cols
       join pg_class pgc on cols.table_name = pgc.relname
       join pg_attribute pga on pgc.oid = pga.attrelid and cols.column_name = pga.attname
-      where (${tables.map(t => `(table_schema = ${this.platform.quoteValue(t.schema_name)} and table_name = ${this.platform.quoteValue(t.table_name)})`).join(' or ')})
+      where (${[...tablesBySchemas.entries()].map(([schema, tables]) => `(table_schema = ${this.platform.quoteValue(schema)} and table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}))`).join(' or ')})
       order by ordinal_position`;
         const allColumns = await connection.execute(sql);
         const str = (val) => val != null ? '' + val : val;
@@ -166,8 +167,8 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         }
         return ret;
     }
-    async getAllChecks(connection, tables) {
-        const sql = this.getChecksSQL(tables);
+    async getAllChecks(connection, tablesBySchemas) {
+        const sql = this.getChecksSQL(tablesBySchemas);
         const allChecks = await connection.execute(sql);
         const ret = {};
         for (const check of allChecks) {
@@ -184,7 +185,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         }
         return ret;
     }
-    async getAllForeignKeys(connection, tables) {
+    async getAllForeignKeys(connection, tablesBySchemas) {
         const sql = `select nsp1.nspname schema_name, cls1.relname table_name, nsp2.nspname referenced_schema_name,
       cls2.relname referenced_table_name, a.attname column_name, af.attname referenced_column_name, conname constraint_name,
       confupdtype update_rule, confdeltype delete_rule, array_position(con.conkey,a.attnum) as ord, condeferrable, condeferred,
@@ -196,7 +197,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
       join pg_class cls1 on cls1.oid = con.conrelid
       join pg_class cls2 on cls2.oid = confrelid
       join pg_namespace nsp2 on nsp2.oid = cls2.relnamespace
-      where (${tables.map(t => `(cls1.relname = ${this.platform.quoteValue(t.table_name)} and nsp1.nspname = ${this.platform.quoteValue(t.schema_name)})`).join(' or ')})
+      where (${[...tablesBySchemas.entries()].map(([schema, tables]) => `(cls1.relname in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}) and nsp1.nspname = ${this.platform.quoteValue(schema)})`).join(' or ')})
       and confrelid > 0
       order by nsp1.nspname, cls1.relname, constraint_name, ord`;
         const allFks = await connection.execute(sql);
@@ -495,23 +496,23 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
       where indrelid in (${tables.map(t => `${this.platform.quoteValue(`${this.platform.quoteIdentifier(t.schema_name ?? this.platform.getDefaultSchemaName() ?? '')}.${this.platform.quoteIdentifier(t.table_name)}`)}::regclass`).join(', ')})
       order by relname`;
     }
-    getChecksSQL(tables) {
+    getChecksSQL(tablesBySchemas) {
         return `select ccu.table_name as table_name, ccu.table_schema as schema_name, pgc.conname as name, conrelid::regclass as table_from, ccu.column_name as column_name, pg_get_constraintdef(pgc.oid) as expression
       from pg_constraint pgc
       join pg_namespace nsp on nsp.oid = pgc.connamespace
       join pg_class cls on pgc.conrelid = cls.oid
       join information_schema.constraint_column_usage ccu on pgc.conname = ccu.constraint_name and nsp.nspname = ccu.constraint_schema
-      where contype = 'c' and (${tables.map(t => `ccu.table_name = ${this.platform.quoteValue(t.table_name)} and ccu.table_schema = ${this.platform.quoteValue(t.schema_name ?? this.platform.getDefaultSchemaName() ?? '')}`).join(' or ')})
+      where contype = 'c' and (${[...tablesBySchemas.entries()].map(([schema, tables]) => `ccu.table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}) and ccu.table_schema = ${this.platform.quoteValue(schema ?? this.platform.getDefaultSchemaName() ?? '')}`).join(' or ')})
       order by pgc.conname`;
     }
     /* istanbul ignore next */
     async getChecks(connection, tableName, schemaName, columns) {
-        const res = await this.getAllChecks(connection, [{ table_name: tableName, schema_name: schemaName }]);
+        const res = await this.getAllChecks(connection, new Map([[schemaName, [{ table_name: tableName, schema_name: schemaName }]]]));
         return res[tableName];
     }
     /* istanbul ignore next */
     async getColumns(connection, tableName, schemaName) {
-        const res = await this.getAllColumns(connection, [{ table_name: tableName, schema_name: schemaName }]);
+        const res = await this.getAllColumns(connection, new Map([[schemaName, [{ table_name: tableName, schema_name: schemaName }]]]));
         return res[tableName];
     }
     /* istanbul ignore next */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/postgresql",
-  "version": "6.3.8-dev.2",
+  "version": "6.3.8-dev.3",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -58,7 +58,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.3.8-dev.2",
+    "@mikro-orm/knex": "6.3.8-dev.3",
     "pg": "8.12.0",
     "postgres-array": "3.0.2",
     "postgres-date": "2.1.0",
@@ -68,6 +68,6 @@
     "@mikro-orm/core": "^6.3.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.8-dev.2"
+    "@mikro-orm/core": "6.3.8-dev.3"
   }
 }