@mikro-orm/knex 6.0.0-dev.228 → 6.0.0-dev.229

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.228",
+  "version": "6.0.0-dev.229",
   "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,6 +66,6 @@
     "@mikro-orm/core": "^5.9.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.0-dev.228"
+    "@mikro-orm/core": "6.0.0-dev.229"
   }
 }

package/schema/SchemaComparator.d.ts

@@ -1,3 +1,4 @@
+import { type Dictionary } from '@mikro-orm/core';
 import type { Column, ForeignKey, IndexDef, SchemaDifference, TableDifference } from '../typings';
 import type { DatabaseSchema } from './DatabaseSchema';
 import type { DatabaseTable } from './DatabaseTable';
@@ -51,6 +52,7 @@ export declare class SchemaComparator {
      */
     isIndexFulfilledBy(index1: IndexDef, index2: IndexDef): boolean;
     diffExpression(expr1: string, expr2: string): boolean;
+    parseJsonDefault(defaultValue?: string | null): Dictionary | string | null;
     hasSameDefaultValue(from: Column, to: Column): boolean;
     private mapColumnToProperty;
     private log;

package/schema/SchemaComparator.js

@@ -449,6 +449,15 @@ class SchemaComparator {
         const simplify = (str) => str?.replace(/_\w+\\'(.*?)\\'/g, '$1').replace(/['"`()]|::\w+| +/g, '').toLowerCase();
         return simplify(expr1) !== simplify(expr2);
     }
+    parseJsonDefault(defaultValue) {
+        if (!defaultValue) {
+            return null;
+        }
+        const val = defaultValue
+            .replace(/^(_\w+\\)?'(.*?)\\?'$/, '$2')
+            .replace(/^\(?'(.*?)'\)?$/, '$1');
+        return (0, core_1.parseJsonSafe)(val);
+    }
     hasSameDefaultValue(from, to) {
         if (from.default == null || from.default.toString().toLowerCase() === 'null' || from.default.toString().startsWith('nextval(')) {
             return to.default == null || to.default.toLowerCase() === 'null';
@@ -459,8 +468,8 @@ class SchemaComparator {
             return defaultValueFrom === defaultValueTo;
         }
         if (to.mappedType instanceof core_1.JsonType) {
-            const defaultValueFrom = (0, core_1.parseJsonSafe)(from.default.replace(/^(_\w+\\)?'(.*?)\\?'$/, '$2'));
-            const defaultValueTo = (0, core_1.parseJsonSafe)(to.default?.replace(/^\(?'(.*?)'\)?$/, '$1'));
+            const defaultValueFrom = this.parseJsonDefault(from.default);
+            const defaultValueTo = this.parseJsonDefault(to.default);
             return core_1.Utils.equals(defaultValueFrom, defaultValueTo);
         }
         if (to.mappedType instanceof core_1.DateTimeType && from.default && to.default) {