@mikro-orm/knex 6.6.10-dev.0 → 6.6.10-dev.1

package/MonkeyPatchable.d.ts

@@ -11,8 +11,10 @@ export declare const MonkeyPatchable: {
     PostgresDialect: any;
     PostgresDialectTableCompiler: any;
     PostgresQueryCompiler: any;
+    PostgresColumnCompiler: any;
     Sqlite3Dialect: any;
     Sqlite3DialectTableCompiler: any;
+    Sqlite3ColumnCompiler: any;
     BetterSqlite3Dialect: any;
     TableCompiler: any;
 };

package/MonkeyPatchable.js

@@ -29,12 +29,16 @@ const pg_tablecompiler_1 = __importDefault(require("knex/lib/dialects/postgres/s
 // @ts-ignore
 const pg_querycompiler_1 = __importDefault(require("knex/lib/dialects/postgres/query/pg-querycompiler"));
 // @ts-ignore
+const pg_columncompiler_1 = __importDefault(require("knex/lib/dialects/postgres/schema/pg-columncompiler"));
+// @ts-ignore
 const sqlite3_1 = __importDefault(require("knex/lib/dialects/sqlite3"));
 // @ts-ignore
 const better_sqlite3_1 = __importDefault(require("knex/lib/dialects/better-sqlite3"));
 // @ts-ignore
 const sqlite_tablecompiler_1 = __importDefault(require("knex/lib/dialects/sqlite3/schema/sqlite-tablecompiler"));
 // @ts-ignore
+const sqlite_columncompiler_1 = __importDefault(require("knex/lib/dialects/sqlite3/schema/sqlite-columncompiler"));
+// @ts-ignore
 const tablecompiler_1 = __importDefault(require("knex/lib/schema/tablecompiler"));
 // These specific portions of knex are overridden by the different
 // database packages. We need to be sure the knex files they get to
@@ -53,8 +57,10 @@ exports.MonkeyPatchable = {
     PostgresDialect: postgres_1.default,
     PostgresDialectTableCompiler: pg_tablecompiler_1.default,
     PostgresQueryCompiler: pg_querycompiler_1.default,
+    PostgresColumnCompiler: pg_columncompiler_1.default,
     Sqlite3Dialect: sqlite3_1.default,
     Sqlite3DialectTableCompiler: sqlite_tablecompiler_1.default,
+    Sqlite3ColumnCompiler: sqlite_columncompiler_1.default,
     BetterSqlite3Dialect: better_sqlite3_1.default,
     TableCompiler: tablecompiler_1.default,
 };

package/dialects/mssql/MsSqlColumnCompiler.js

@@ -4,7 +4,7 @@ exports.MsSqlColumnCompiler = void 0;
 const MonkeyPatchable_1 = require("../../MonkeyPatchable");
 class MsSqlColumnCompiler extends MonkeyPatchable_1.MonkeyPatchable.MsSqlColumnCompiler {
     enu(allowed) {
-        return `nvarchar(100) check (${this.formatter.wrap(this.args[0])} in ('${(allowed.join("', '"))}'))`;
+        return `nvarchar(100) check (${this.formatter.wrap(this.args[0])} in (${allowed.map(v => `'${String(v).replace(/'/g, "''")}'`).join(', ')}))`;
     }
 }
 exports.MsSqlColumnCompiler = MsSqlColumnCompiler;

package/dialects/postgresql/PostgreSqlColumnCompiler.d.ts

@@ -0,0 +1,4 @@
+import { MonkeyPatchable } from '../../MonkeyPatchable';
+export declare class PostgreSqlColumnCompiler extends MonkeyPatchable.PostgresColumnCompiler {
+    enu(this: any, allowed: unknown[], options: any): any;
+}

package/dialects/postgresql/PostgreSqlColumnCompiler.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PostgreSqlColumnCompiler = void 0;
+const MonkeyPatchable_1 = require("../../MonkeyPatchable");
+class PostgreSqlColumnCompiler extends MonkeyPatchable_1.MonkeyPatchable.PostgresColumnCompiler {
+    enu(allowed, options) {
+        options = options || {};
+        if (options.useNative) {
+            return super.enu(allowed, options);
+        }
+        const values = allowed.map(v => `'${String(v).replace(/'/g, "''")}'`).join(', ');
+        return `text check (${this.formatter.wrap(this.args[0])} in (${values}))`;
+    }
+}
+exports.PostgreSqlColumnCompiler = PostgreSqlColumnCompiler;

package/dialects/postgresql/PostgreSqlKnexDialect.d.ts

@@ -4,4 +4,5 @@ export declare class PostgreSqlKnexDialect extends MonkeyPatchable.PostgresDiale
     ormConfig: Configuration;
     tableCompiler(): any;
     queryCompiler(): any;
+    columnCompiler(): any;
 }

package/dialects/postgresql/PostgreSqlKnexDialect.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgreSqlKnexDialect = void 0;
 const PostgreSqlTableCompiler_1 = require("./PostgreSqlTableCompiler");
 const PostgreSqlQueryCompiler_1 = require("./PostgreSqlQueryCompiler");
+const PostgreSqlColumnCompiler_1 = require("./PostgreSqlColumnCompiler");
 const MonkeyPatchable_1 = require("../../MonkeyPatchable");
 class PostgreSqlKnexDialect extends MonkeyPatchable_1.MonkeyPatchable.PostgresDialect {
     ormConfig;
@@ -16,5 +17,9 @@ class PostgreSqlKnexDialect extends MonkeyPatchable_1.MonkeyPatchable.PostgresDi
         // eslint-disable-next-line prefer-rest-params
         return new PostgreSqlQueryCompiler_1.PostgreSqlQueryCompiler(this, ...arguments);
     }
+    columnCompiler() {
+        // eslint-disable-next-line prefer-rest-params
+        return new PostgreSqlColumnCompiler_1.PostgreSqlColumnCompiler(this, ...arguments);
+    }
 }
 exports.PostgreSqlKnexDialect = PostgreSqlKnexDialect;

package/dialects/sqlite/BaseSqliteSchemaHelper.js

@@ -92,7 +92,9 @@ class BaseSqliteSchemaHelper extends SchemaHelper_1.SchemaHelper {
             const match = item.match(/[`["']([^`\]"']+)[`\]"'] text check \(.* \((.*)\)/i);
             /* istanbul ignore else */
             if (match) {
-                o[match[1]] = match[2].split(',').map((item) => item.trim().match(/^\(?'(.*)'/)[1]);
+                o[match[1]] = match[2]
+                    .split(/,(?=\s*'(?:[^']|'')*'(?:\s*\)|$))/)
+                    .map((item) => item.trim().match(/^\(?'((?:[^']|'')*)'/)[1].replace(/''/g, "'"));
             }
             return o;
         }, {});

package/dialects/sqlite/BetterSqliteKnexDialect.d.ts

@@ -2,4 +2,5 @@ import { MonkeyPatchable } from '../../MonkeyPatchable';
 export declare class BetterSqliteKnexDialect extends MonkeyPatchable.BetterSqlite3Dialect {
     _driver(): any;
     tableCompiler(): any;
+    columnCompiler(): any;
 }

package/dialects/sqlite/BetterSqliteKnexDialect.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BetterSqliteKnexDialect = void 0;
 const SqliteTableCompiler_1 = require("./SqliteTableCompiler");
+const SqliteColumnCompiler_1 = require("./SqliteColumnCompiler");
 const MonkeyPatchable_1 = require("../../MonkeyPatchable");
 class BetterSqliteKnexDialect extends MonkeyPatchable_1.MonkeyPatchable.BetterSqlite3Dialect {
     _driver() {
@@ -11,5 +12,9 @@ class BetterSqliteKnexDialect extends MonkeyPatchable_1.MonkeyPatchable.BetterSq
         // eslint-disable-next-line prefer-rest-params
         return new SqliteTableCompiler_1.SqliteTableCompiler(this, ...arguments);
     }
+    columnCompiler() {
+        // eslint-disable-next-line prefer-rest-params
+        return new SqliteColumnCompiler_1.SqliteColumnCompiler(this, ...arguments);
+    }
 }
 exports.BetterSqliteKnexDialect = BetterSqliteKnexDialect;

package/dialects/sqlite/LibSqlKnexDialect.d.ts

@@ -5,6 +5,7 @@ export declare class LibSqlKnexDialect extends MonkeyPatchable.BetterSqlite3Dial
     _query(this: any, connection: any, obj: any): Promise<any>;
     acquireRawConnection(this: any): Promise<any>;
     tableCompiler(): any;
+    columnCompiler(): any;
     validateConnection(connection: any): boolean;
     private getCallMethod;
     private isRunQuery;

package/dialects/sqlite/LibSqlKnexDialect.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LibSqlKnexDialect = void 0;
 const SqliteTableCompiler_1 = require("./SqliteTableCompiler");
+const SqliteColumnCompiler_1 = require("./SqliteColumnCompiler");
 const MonkeyPatchable_1 = require("../../MonkeyPatchable");
 class LibSqlKnexDialect extends MonkeyPatchable_1.MonkeyPatchable.BetterSqlite3Dialect {
     get driverName() {
@@ -41,6 +42,10 @@ class LibSqlKnexDialect extends MonkeyPatchable_1.MonkeyPatchable.BetterSqlite3D
         // eslint-disable-next-line prefer-rest-params
         return new SqliteTableCompiler_1.SqliteTableCompiler(this, ...arguments);
     }
+    columnCompiler() {
+        // eslint-disable-next-line prefer-rest-params
+        return new SqliteColumnCompiler_1.SqliteColumnCompiler(this, ...arguments);
+    }
     validateConnection(connection) {
         if (connection.memory) {
             return true;

package/dialects/sqlite/SqliteColumnCompiler.d.ts

@@ -0,0 +1,4 @@
+import { MonkeyPatchable } from '../../MonkeyPatchable';
+export declare class SqliteColumnCompiler extends MonkeyPatchable.Sqlite3ColumnCompiler {
+    enu(this: any, allowed: unknown[]): string;
+}

package/dialects/sqlite/SqliteColumnCompiler.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SqliteColumnCompiler = void 0;
+const MonkeyPatchable_1 = require("../../MonkeyPatchable");
+class SqliteColumnCompiler extends MonkeyPatchable_1.MonkeyPatchable.Sqlite3ColumnCompiler {
+    enu(allowed) {
+        const values = allowed.map(v => `'${String(v).replace(/'/g, "''")}'`).join(', ');
+        return `text check (${this.formatter.wrap(this.args[0])} in (${values}))`;
+    }
+}
+exports.SqliteColumnCompiler = SqliteColumnCompiler;

package/dialects/sqlite/SqliteKnexDialect.d.ts

@@ -1,6 +1,7 @@
 import { MonkeyPatchable } from '../../MonkeyPatchable';
 export declare class SqliteKnexDialect extends MonkeyPatchable.Sqlite3Dialect {
     tableCompiler(): any;
+    columnCompiler(): any;
     processResponse(obj: any, runner: any): any;
     _query(connection: any, obj: any): Promise<unknown>;
     private getCallMethod;

package/dialects/sqlite/SqliteKnexDialect.js

@@ -2,12 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqliteKnexDialect = void 0;
 const SqliteTableCompiler_1 = require("./SqliteTableCompiler");
+const SqliteColumnCompiler_1 = require("./SqliteColumnCompiler");
 const MonkeyPatchable_1 = require("../../MonkeyPatchable");
 class SqliteKnexDialect extends MonkeyPatchable_1.MonkeyPatchable.Sqlite3Dialect {
     tableCompiler() {
         // eslint-disable-next-line prefer-rest-params
         return new SqliteTableCompiler_1.SqliteTableCompiler(this, ...arguments);
     }
+    columnCompiler() {
+        // eslint-disable-next-line prefer-rest-params
+        return new SqliteColumnCompiler_1.SqliteColumnCompiler(this, ...arguments);
+    }
     processResponse(obj, runner) {
         if (obj.method === 'raw' && this.isRunQuery(obj.sql)) {
             return obj.response ?? obj.context;

package/package.json

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

package/query/QueryBuilder.js

@@ -559,7 +559,7 @@ class QueryBuilder {
         const qb = this.getQueryBase(processVirtualEntity);
         const schema = this.getSchema(this.mainAlias);
         const type = this.type ?? enums_1.QueryType.SELECT;
-        qb.__raw = true; // tag it as there is now way to check via `instanceof`
+        core_1.RawQueryFragment.markRaw(qb);
         core_1.Utils.runIfNotEmpty(() => this.helper.appendQueryCondition(type, this._cond, qb), this._cond && !this._onConflict);
         core_1.Utils.runIfNotEmpty(() => qb.groupBy(this.prepareFields(this._groupBy, 'groupBy', schema)), this._groupBy);
         core_1.Utils.runIfNotEmpty(() => this.helper.appendQueryCondition(type, this._having, qb, undefined, 'having'), this._having);
@@ -1393,7 +1393,7 @@ class QueryBuilder {
         // multiple sub-queries are needed to get around mysql limitations with order by + limit + where in + group by (o.O)
         // https://stackoverflow.com/questions/17892762/mysql-this-version-of-mysql-doesnt-yet-support-limit-in-all-any-some-subqu
         const subSubQuery = this.getKnex().select(pks).from(knexQuery);
-        subSubQuery.__raw = true; // tag it as there is now way to check via `instanceof`
+        core_1.RawQueryFragment.markRaw(subSubQuery);
         this._limit = undefined;
         this._offset = undefined;
         if (this._fields.some(f => core_1.RawQueryFragment.isKnownFragment(f))) {
@@ -1441,7 +1441,7 @@ class QueryBuilder {
         // wrap one more time to get around MySQL limitations
         // https://stackoverflow.com/questions/45494/mysql-error-1093-cant-specify-target-table-for-update-in-from-clause
         const subSubQuery = this.getKnex().select(this.prepareFields(meta.primaryKeys)).from(subQuery.as(this.mainAlias.aliasName));
-        subSubQuery.__raw = true; // tag it as there is now way to check via `instanceof`
+        core_1.RawQueryFragment.markRaw(subSubQuery);
         const method = this.flags.has(core_1.QueryFlag.UPDATE_SUB_QUERY) ? 'update' : 'delete';
         this._cond = {}; // otherwise we would trigger validation error
         this._joins = {}; // included in the subquery