@mikro-orm/mariadb 6.6.10 → 6.6.11-dev.1

package/MariaDbSchemaHelper.d.ts

@@ -1,10 +1,10 @@
 import { type AbstractSqlConnection, type CheckDef, type Column, type IndexDef, type DatabaseSchema, type Table, MySqlSchemaHelper } from '@mikro-orm/knex';
-import { type Dictionary, type Type } from '@mikro-orm/core';
+import { type Dictionary, type Transaction, type Type } from '@mikro-orm/core';
 export declare class MariaDbSchemaHelper extends MySqlSchemaHelper {
-    loadInformationSchema(schema: DatabaseSchema, connection: AbstractSqlConnection, tables: Table[]): Promise<void>;
-    getAllIndexes(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<IndexDef[]>>;
-    getAllColumns(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<Column[]>>;
-    getAllChecks(connection: AbstractSqlConnection, tables: Table[], columns?: Dictionary<Column[]>): Promise<Dictionary<CheckDef[]>>;
+    loadInformationSchema(schema: DatabaseSchema, connection: AbstractSqlConnection, tables: Table[], schemas?: string[], ctx?: Transaction): Promise<void>;
+    getAllIndexes(connection: AbstractSqlConnection, tables: Table[], ctx?: Transaction): Promise<Dictionary<IndexDef[]>>;
+    getAllColumns(connection: AbstractSqlConnection, tables: Table[], ctx?: Transaction): Promise<Dictionary<Column[]>>;
+    getAllChecks(connection: AbstractSqlConnection, tables: Table[], ctx?: Transaction, columns?: Dictionary<Column[]>): Promise<Dictionary<CheckDef[]>>;
     protected getChecksSQL(tables: Table[]): string;
     getChecks(connection: AbstractSqlConnection, tableName: string, schemaName: string, columns?: Column[]): Promise<CheckDef[]>;
     protected wrap(val: string | undefined | null, type: Type<unknown>): string | undefined | null;

package/MariaDbSchemaHelper.js

@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MariaDbSchemaHelper = void 0;
 const knex_1 = require("@mikro-orm/knex");
 class MariaDbSchemaHelper extends knex_1.MySqlSchemaHelper {
-    async loadInformationSchema(schema, connection, tables) {
+    async loadInformationSchema(schema, connection, tables, schemas, ctx) {
         /* istanbul ignore next */
         if (tables.length === 0) {
             return;
         }
-        const columns = await this.getAllColumns(connection, tables);
-        const indexes = await this.getAllIndexes(connection, tables);
-        const checks = await this.getAllChecks(connection, tables, columns);
-        const fks = await this.getAllForeignKeys(connection, tables);
-        const enums = await this.getAllEnumDefinitions(connection, tables);
+        const columns = await this.getAllColumns(connection, tables, ctx);
+        const indexes = await this.getAllIndexes(connection, tables, ctx);
+        const checks = await this.getAllChecks(connection, tables, ctx, columns);
+        const fks = await this.getAllForeignKeys(connection, tables, ctx);
+        const enums = await this.getAllEnumDefinitions(connection, tables, ctx);
         for (const t of tables) {
             const key = this.getTableKey(t);
             const table = schema.addTable(t.table_name, t.schema_name, t.table_comment);
@@ -20,12 +20,12 @@ class MariaDbSchemaHelper extends knex_1.MySqlSchemaHelper {
             table.init(columns[key], indexes[key], checks[key], pks, fks[key], enums[key]);
         }
     }
-    async getAllIndexes(connection, tables) {
+    async getAllIndexes(connection, tables, ctx) {
         const sql = `select table_name as table_name, nullif(table_schema, schema()) as schema_name, index_name as index_name, non_unique as non_unique, column_name as column_name
         from information_schema.statistics where table_schema = database()
         and table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(', ')})
         order by schema_name, table_name, index_name, seq_in_index`;
-        const allIndexes = await connection.execute(sql);
+        const allIndexes = await connection.execute(sql, [], 'all', ctx);
         const ret = {};
         for (const index of allIndexes) {
             const key = this.getTableKey(index);
@@ -43,7 +43,7 @@ class MariaDbSchemaHelper extends knex_1.MySqlSchemaHelper {
         }
         return ret;
     }
-    async getAllColumns(connection, tables) {
+    async getAllColumns(connection, tables, ctx) {
         const sql = `select table_name as table_name,
       nullif(table_schema, schema()) as schema_name,
       column_name as column_name,
@@ -60,7 +60,7 @@ class MariaDbSchemaHelper extends knex_1.MySqlSchemaHelper {
       ifnull(datetime_precision, character_maximum_length) length
       from information_schema.columns where table_schema = database() and table_name in (${tables.map(t => this.platform.quoteValue(t.table_name))})
       order by ordinal_position`;
-        const allColumns = await connection.execute(sql);
+        const allColumns = await connection.execute(sql, [], 'all', ctx);
         const str = (val) => val != null ? '' + val : val;
         const extra = (val) => val.replace(/auto_increment|default_generated|(stored|virtual) generated/i, '').trim() || undefined;
         const ret = {};
@@ -93,9 +93,9 @@ class MariaDbSchemaHelper extends knex_1.MySqlSchemaHelper {
         }
         return ret;
     }
-    async getAllChecks(connection, tables, columns) {
+    async getAllChecks(connection, tables, ctx, columns) {
         const sql = this.getChecksSQL(tables);
-        const allChecks = await connection.execute(sql);
+        const allChecks = await connection.execute(sql, [], 'all', ctx);
         const ret = {};
         for (const check of allChecks) {
             const key = this.getTableKey(check);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mariadb",
-  "version": "6.6.10",
+  "version": "6.6.11-dev.1",
   "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,13 +58,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.6.10",
+    "@mikro-orm/knex": "6.6.11-dev.1",
     "mariadb": "3.4.5"
   },
   "devDependencies": {
     "@mikro-orm/core": "^6.6.10"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "^6.0.0"
+    "@mikro-orm/core": "6.6.11-dev.1"
   }
 }