@mikro-orm/sql 7.1.0-dev.45 → 7.1.0-dev.46

package/AbstractSqlDriver.js

@@ -838,13 +838,19 @@ export class AbstractSqlDriver extends DatabaseDriver {
                     else {
                         const field = prop.fieldNames[0];
                         if (!duplicates.includes(field) || !usedDups.includes(field)) {
+                            const rowValue = row[prop.name];
+                            const rowValueIsRaw = isRaw(rowValue);
                             if (prop.customType &&
                                 !prop.object &&
                                 'convertToDatabaseValueSQL' in prop.customType &&
-                                row[prop.name] != null &&
-                                !isRaw(row[prop.name])) {
+                                rowValue != null &&
+                                !rowValueIsRaw) {
                                 keys.push(prop.customType.convertToDatabaseValueSQL('?', this.platform));
                             }
+                            else if (rowValueIsRaw && /^\s*(?:with|select)\b/i.test(rowValue.sql)) {
+                                // raw subqueries must be parenthesized when inlined as a VALUES position
+                                keys.push('(?)');
+                            }
                             else {
                                 keys.push('?');
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.0-dev.45",
+  "version": "7.1.0-dev.46",
   "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.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.0.17"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.0-dev.45"
+    "@mikro-orm/core": "7.1.0-dev.46"
   },
   "engines": {
     "node": ">= 22.17.0"

package/typings.d.ts

@@ -397,7 +397,7 @@ type ClassEntityColumns<T, TOptions extends MikroKyselyPluginOptions = {}> = T e
 type ClassEntityColumnName<K, V, TOptions extends MikroKyselyPluginOptions = {}> = K extends symbol ? never : NonNullable<V> extends infer NV ? NV extends {
     [k: number]: any;
     readonly owner: object;
-} ? never : TOptions['columnNamingStrategy'] extends 'property' ? K : NV extends Scalar ? K extends string ? SnakeCase<K> : never : K extends string ? ClassEntityJoinColumnName<SnakeCase<K>, NV> : never : never;
+} ? never : TOptions['columnNamingStrategy'] extends 'property' ? K : NV extends Scalar | readonly any[] ? K extends string ? SnakeCase<K> : never : K extends string ? ClassEntityJoinColumnName<SnakeCase<K>, NV> : never : never;
 type ClassEntityJoinColumnName<TName extends string, V> = PrimaryProperty<V> extends string ? `${TName}_${SnakeCase<PrimaryProperty<V>>}` : never;
-type ClassEntityColumnValue<V> = NonNullable<V> extends Scalar ? V : Primary<NonNullable<V>>;
+type ClassEntityColumnValue<V> = NonNullable<V> extends Scalar | readonly any[] ? V : Primary<NonNullable<V>>;
 export {};