@mikro-orm/knex 6.5.8-dev.3 → 6.5.8-dev.5

package/package.json

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

package/query/QueryBuilder.js

@@ -1310,10 +1310,11 @@ class QueryBuilder {
                 }
                 else if (join.parent?.type === enums_1.JoinType.nestedInnerJoin) {
                     const group = lookupParentGroup(join.parent);
+                    const nested = group ?? ((join.parent).nested ??= new Set());
                     join.type = join.type === enums_1.JoinType.innerJoin
                         ? enums_1.JoinType.nestedInnerJoin
                         : enums_1.JoinType.nestedLeftJoin;
-                    group?.add(join);
+                    nested.add(join);
                 }
             }
         }

package/schema/DatabaseSchema.js

@@ -108,10 +108,15 @@ class DatabaseSchema {
             table.addIndex(meta, { properties: meta.props.filter(prop => prop.primary).map(prop => prop.name) }, 'primary');
             meta.checks.forEach(check => {
                 const columnName = check.property ? meta.properties[check.property].fieldNames[0] : undefined;
+                let expression = check.expression;
+                const raw = core_1.RawQueryFragment.getKnownFragment(expression);
+                if (raw) {
+                    expression = platform.formatQuery(raw.sql, raw.params);
+                }
                 table.addCheck({
                     name: check.name,
-                    expression: check.expression,
-                    definition: `check ((${check.expression}))`,
+                    expression,
+                    definition: `check ((${expression}))`,
                     columnName,
                 });
             });