@mikro-orm/knex 6.4.12-dev.2 → 6.4.12-dev.21

package/AbstractSqlDriver.js

@@ -791,13 +791,15 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const targetSchema = this.getSchemaName(prop.targetMeta, options) ?? this.platform.getDefaultSchemaName();
             qb.innerJoin(pivotProp1.name, targetAlias, {}, targetSchema);
             const targetFields = this.buildFields(prop.targetMeta, (options.populate ?? []), [], qb, targetAlias, options);
+            const additionalFields = [];
             for (const field of targetFields) {
                 const f = field.toString();
-                fields.unshift(f.includes('.') ? field : `${targetAlias}.${f}`);
+                additionalFields.push(f.includes('.') ? field : `${targetAlias}.${f}`);
                 if (core_1.RawQueryFragment.isKnownFragment(field)) {
                     qb.rawFragments.add(f);
                 }
             }
+            fields.unshift(...additionalFields);
             // we need to handle 1:1 owner auto-joins explicitly, as the QB type is the pivot table, not the target
             populate.forEach(hint => {
                 const alias = qb.getNextAlias(prop.targetMeta.tableName);

package/package.json

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

package/schema/DatabaseTable.js

@@ -97,6 +97,9 @@ class DatabaseTable {
                 ignoreSchemaChanges: prop.ignoreSchemaChanges,
             };
             this.columns[field].unsigned ??= this.columns[field].autoincrement;
+            if (this.nativeEnums[type]) {
+                this.columns[field].enumItems ??= this.nativeEnums[type].items;
+            }
             const defaultValue = this.platform.getSchemaHelper().normalizeDefaultValue(prop.defaultRaw, prop.length);
             this.columns[field].default = defaultValue;
         });