@mikro-orm/knex 7.0.0-dev.25 → 7.0.0-dev.27

package/dialects/sqlite/SqliteSchemaHelper.js

@@ -167,7 +167,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
             if (col.hidden > 1) {
                 /* v8 ignore next */
                 const storage = col.hidden === 2 ? 'virtual' : 'stored';
-                const re = `(generated always)? as \\((.*)\\)( ${storage})?$`;
+                const re = new RegExp(`(generated always)? as \\((.*)\\)( ${storage})?$`, 'i');
                 const match = columnDefinitions[col.name].definition.match(re);
                 if (match) {
                     generated = `${match[2]} ${storage}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.25",
+  "version": "7.0.0-dev.27",
   "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.",
   "type": "module",
   "exports": {
@@ -50,13 +50,13 @@
     "access": "public"
   },
   "dependencies": {
-    "kysely": "0.28.5",
+    "kysely": "0.28.7",
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.5.3"
+    "@mikro-orm/core": "^6.5.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.25"
+    "@mikro-orm/core": "7.0.0-dev.27"
   }
 }

package/query/ObjectCriteriaNode.js

@@ -218,9 +218,10 @@ export class ObjectCriteriaNode extends CriteriaNode {
             // - if the owning column is null, the row is missing, we don't apply the filter
             // - if the target column is not null, the row is matched, we apply the filter
             if (toOneProperty && this.prop.nullable && options?.filter) {
+                const key = this.prop.owner ? this.prop.name : this.prop.referencedPKs;
                 qb.andWhere({
                     $or: [
-                        { [field]: null },
+                        { [alias + '.' + key]: null },
                         { [nestedAlias + '.' + Utils.getPrimaryKeyHash(this.prop.referencedPKs)]: { $ne: null } },
                     ],
                 });

package/schema/SchemaComparator.js

@@ -511,7 +511,7 @@ export class SchemaComparator {
             return str
                 ?.replace(/_\w+'(.*?)'/g, '$1')
                 .replace(/in\s*\((.*?)\)/ig, '= any (array[$1])')
-                .replace(/['"`()]|::\w+| +/g, '')
+                .replace(/['"`()\n[\]]|::\w+| +/g, '')
                 .replace(/anyarray\[(.*)]/ig, '$1')
                 .toLowerCase();
         };