@mikro-orm/knex 6.4.6-dev.1 → 6.4.6-dev.11

package/dialects/sqlite/BaseSqliteSchemaHelper.js

@@ -169,21 +169,32 @@ class BaseSqliteSchemaHelper extends SchemaHelper_1.SchemaHelper {
         return name.startsWith('sqlite_');
     }
     async getAlterTable(changedTable, wrap) {
-        wrap ??= this.options.disableForeignKeys;
         const tempName = `${(changedTable.toTable.name)}__temp_alter`;
         const quotedName = this.platform.quoteIdentifier(changedTable.toTable.name);
         const quotedTempName = this.platform.quoteIdentifier(tempName);
         const createSql = await this.dump(this.createTable(changedTable.toTable), '');
         const [first, ...rest] = createSql.split('\n');
-        return [
+        const sql = [
             'pragma foreign_keys = off;',
             first.replace(`create table ${quotedName}`, `create table ${quotedTempName}`),
-            `insert into ${quotedTempName} select * from ${quotedName};`,
-            `drop table ${quotedName};`,
-            `alter table ${quotedTempName} rename to ${quotedName};`,
-            ...rest,
-            'pragma foreign_keys = on;',
-        ].join('\n');
+        ];
+        const columns = [];
+        for (const column of changedTable.toTable.getColumns()) {
+            const fromColumn = changedTable.fromTable.getColumn(column.name);
+            /* istanbul ignore else */
+            if (fromColumn) {
+                columns.push(this.platform.quoteIdentifier(column.name));
+            }
+            else {
+                columns.push(`null as ${this.platform.quoteIdentifier(column.name)}`);
+            }
+        }
+        sql.push(`insert into ${quotedTempName} select ${columns.join(', ')} from ${quotedName};`);
+        sql.push(`drop table ${quotedName};`);
+        sql.push(`alter table ${quotedTempName} rename to ${quotedName};`);
+        sql.push(...rest);
+        sql.push('pragma foreign_keys = on;');
+        return sql.join('\n');
     }
 }
 exports.BaseSqliteSchemaHelper = BaseSqliteSchemaHelper;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.6-dev.1",
+  "version": "6.4.6-dev.11",
   "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",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.4.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.6-dev.1",
+    "@mikro-orm/core": "6.4.6-dev.11",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.js

@@ -832,7 +832,7 @@ class QueryBuilder {
             ref.as(aliasName);
         }
         const schema = this.getSchema(this.mainAlias);
-        if (schema) {
+        if (schema && schema !== this.platform.getDefaultSchemaName()) {
             ref.withSchema(schema);
         }
         if (metadata?.virtual && processVirtualEntity) {
@@ -1053,7 +1053,7 @@ class QueryBuilder {
         const schema = this.getSchema(this.mainAlias);
         // Joined tables doesn't need to belong to the same schema as the main table
         const joinSchema = this._schema ?? this.em?.schema ?? schema;
-        if (schema) {
+        if (schema && schema !== this.platform.getDefaultSchemaName()) {
             qb.withSchema(schema);
         }
         if (this._indexHint) {
@@ -1372,7 +1372,7 @@ class QueryBuilder {
     getSchema(alias) {
         const { metadata } = alias;
         const metaSchema = metadata?.schema && metadata.schema !== '*' ? metadata.schema : undefined;
-        return this._schema ?? metaSchema ?? this.em?.schema ?? this.em?.config.get('schema');
+        return this._schema ?? metaSchema ?? this.em?.schema ?? this.em?.config.getSchema(true);
     }
     createAlias(entityName, aliasName, subQuery) {
         const metadata = this.metadata.find(entityName);

package/query/QueryBuilderHelper.js

@@ -206,7 +206,7 @@ class QueryBuilderHelper {
         const conditions = [];
         const params = [];
         schema = join.schema && join.schema !== '*' ? join.schema : schema;
-        if (schema) {
+        if (schema && schema !== this.platform.getDefaultSchemaName()) {
             table = `${schema}.${table}`;
         }
         if (join.prop.name !== '__subquery__') {