@mikro-orm/knex 6.1.13-dev.38 → 6.1.13-dev.39

package/dialects/mysql/MySqlSchemaHelper.js

@@ -61,7 +61,7 @@ class MySqlSchemaHelper extends SchemaHelper_1.SchemaHelper {
                 primary: index.index_name === 'PRIMARY',
                 constraint: !index.non_unique,
             };
-            if (!index.column_name || index.column_name.match(/[(): ,"'`]/) || index.expression?.match(/ where /i)) {
+            if (!index.column_name || index.expression?.match(/ where /i)) {
                 indexDef.expression = index.expression; // required for the `getCreateIndexSQL()` call
                 indexDef.expression = this.getCreateIndexSQL(index.table_name, indexDef, !!index.expression);
             }
@@ -100,7 +100,7 @@ class MySqlSchemaHelper extends SchemaHelper_1.SchemaHelper {
                 ? ['false', 'true'][+col.column_default]
                 : col.column_default, col.length));
             const key = this.getTableKey(col);
-            const generated = col.generation_expression ? `${col.generation_expression} ${col.extra.match(/stored generated/i) ? 'stored' : 'virtual'}` : undefined;
+            const generated = col.generation_expression ? `(${col.generation_expression.replaceAll(`\\'`, `'`)}) ${col.extra.match(/stored generated/i) ? 'stored' : 'virtual'}` : undefined;
             ret[key] ??= [];
             ret[key].push({
                 name: col.column_name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.13-dev.38",
+  "version": "6.1.13-dev.39",
   "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": "^6.1.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.13-dev.38"
+    "@mikro-orm/core": "6.1.13-dev.39"
   }
 }

package/schema/DatabaseTable.js

@@ -169,8 +169,7 @@ class DatabaseTable {
     }
     getEntityDeclaration(namingStrategy, schemaHelper, scalarPropertiesForRelations) {
         const { fksOnColumnProps, fksOnStandaloneProps, columnFks, fkIndexes, nullableForeignKeys, skippedColumnNames, } = this.foreignKeysToProps(namingStrategy, scalarPropertiesForRelations);
-        let name = namingStrategy.getEntityName(this.name, this.schema);
-        name = name.match(/^\d/) ? 'E' + name : name;
+        const name = namingStrategy.getEntityName(this.name, this.schema);
         const schema = new core_1.EntitySchema({ name, collection: this.name, schema: this.schema });
         const compositeFkIndexes = {};
         const compositeFkUniques = {};

package/schema/SchemaComparator.js

@@ -481,7 +481,7 @@ class SchemaComparator {
     diffExpression(expr1, expr2) {
         // expressions like check constraints might be normalized by the driver,
         // e.g. quotes might be added (https://github.com/mikro-orm/mikro-orm/issues/3827)
-        const simplify = (str) => str?.replace(/_\w+\\'(.*?)\\'/g, '$1').replace(/['"`()]|::\w+| +/g, '').toLowerCase();
+        const simplify = (str) => str?.replace(/_\w+'(.*?)'/g, '$1').replace(/['"`()]|::\w+| +/g, '').toLowerCase();
         return simplify(expr1) !== simplify(expr2);
     }
     parseJsonDefault(defaultValue) {