@mikro-orm/knex 6.0.0-dev.179 → 6.0.0-dev.180

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.179",
+  "version": "6.0.0-dev.180",
   "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.179"
+    "@mikro-orm/core": "6.0.0-dev.180"
   }
 }

package/schema/DatabaseTable.js

@@ -175,7 +175,10 @@ class DatabaseTable {
             }
             const properties = this.getIndexProperties(index, columnFks, fksOnColumnProps, fksOnStandaloneProps, namingStrategy);
             // If there is a column that cannot be unambiguously mapped to a prop, render an expression.
-            if (typeof properties === 'undefined') {
+            if (index.expression) {
+                ret.expression = index.expression;
+            }
+            else if (typeof properties === 'undefined') {
                 ret.expression = schemaHelper.getCreateIndexSQL(this.name, index);
             }
             else {
@@ -549,6 +552,9 @@ class DatabaseTable {
             }
             field = replacedFieldName;
         }
+        if (field.startsWith('_')) {
+            return field;
+        }
         return namingStrategy.columnNameToProperty(field);
     }
     getPropertyTypeForForeignKey(namingStrategy, fk) {