@mikro-orm/knex 6.4.17-dev.1 → 6.4.17-dev.11

package/dialects/mysql/MySqlSchemaHelper.js

@@ -204,7 +204,14 @@ class MySqlSchemaHelper extends SchemaHelper_1.SchemaHelper {
                 col.defaultTo(null);
             }
             else {
-                col.defaultTo(knex.raw(column.default + (column.extra ? ' ' + column.extra : '')));
+                const columnType = column.type.toLowerCase();
+                // https://dev.mysql.com/doc/refman/9.0/en/data-type-defaults.html
+                const needsExpression = ['blob', 'text', 'json', 'point', 'linestring', 'polygon', 'multipoint', 'multilinestring', 'multipolygon', 'geometrycollection'].some(type => columnType.startsWith(type));
+                let defaultSql = needsExpression && !column.default.startsWith('(') ? `(${column.default})` : column.default;
+                if (column.extra) {
+                    defaultSql += ' ' + column.extra;
+                }
+                col.defaultTo(knex.raw(defaultSql));
             }
         }
         return col;

package/package.json

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

package/query/CriteriaNodeFactory.js

@@ -49,13 +49,14 @@ class CriteriaNodeFactory {
     static createObjectItemNode(metadata, entityName, node, payload, key, meta) {
         const prop = meta?.properties[key];
         const childEntity = prop && prop.kind !== core_1.ReferenceKind.SCALAR ? prop.type : entityName;
-        if (prop?.customType instanceof core_1.JsonType) {
+        const isNotEmbedded = prop?.kind !== core_1.ReferenceKind.EMBEDDED;
+        if (isNotEmbedded && prop?.customType instanceof core_1.JsonType) {
             return this.createScalarNode(metadata, childEntity, payload[key], node, key);
         }
         if (prop?.kind === core_1.ReferenceKind.SCALAR && payload[key] != null && Object.keys(payload[key]).some(f => core_1.Utils.isGroupOperator(f))) {
             throw core_1.ValidationError.cannotUseGroupOperatorsInsideScalars(entityName, prop.name, payload);
         }
-        if (prop?.kind !== core_1.ReferenceKind.EMBEDDED) {
+        if (isNotEmbedded) {
             return this.createNode(metadata, childEntity, payload[key], node, key);
         }
         if (payload[key] == null) {

package/schema/DatabaseTable.js

@@ -115,6 +115,7 @@ class DatabaseTable {
                 localTableName: this.getShortestName(),
                 referencedColumnNames: prop.referencedColumnNames,
                 referencedTableName: schema ? `${schema}.${prop.referencedTableName}` : prop.referencedTableName,
+                createForeignKeyConstraint: prop.createForeignKeyConstraint,
             };
             const cascade = prop.cascade.includes(core_1.Cascade.REMOVE) || prop.cascade.includes(core_1.Cascade.ALL);
             if (prop.deleteRule || cascade || prop.nullable) {

package/schema/SchemaHelper.js

@@ -321,7 +321,7 @@ class SchemaHelper {
         });
     }
     createForeignKey(table, foreignKey, schema) {
-        if (!this.options.createForeignKeyConstraints) {
+        if (!this.options.createForeignKeyConstraints || !foreignKey.createForeignKeyConstraint) {
             return;
         }
         const builder = table

package/typings.d.ts

@@ -59,6 +59,7 @@ export interface ForeignKey {
     updateRule?: string;
     deleteRule?: string;
     deferMode?: DeferMode;
+    createForeignKeyConstraint: boolean;
 }
 export interface IndexDef {
     columnNames: string[];