@mikro-orm/knex 6.2.1-dev.8 → 6.2.1

package/MonkeyPatchable.d.ts

@@ -8,6 +8,7 @@ export declare const MonkeyPatchable: {
     MsSqlTableCompiler: any;
     MsSqlQueryCompiler: any;
     MsSqlDialect: any;
+    PostgresDialect: any;
     PostgresDialectTableCompiler: any;
     Sqlite3Dialect: any;
     Sqlite3DialectTableCompiler: any;

package/MonkeyPatchable.js

@@ -9,7 +9,7 @@ const client_1 = __importDefault(require("knex/lib/client"));
 // @ts-ignore
 const query_executioner_1 = __importDefault(require("knex/lib/execution/internal/query-executioner"));
 // @ts-ignore
-const mysql_1 = __importDefault(require("knex/lib/dialects/mysql"));
+const mysql2_1 = __importDefault(require("knex/lib/dialects/mysql2"));
 // @ts-ignore
 const mysql_columncompiler_1 = __importDefault(require("knex/lib/dialects/mysql/schema/mysql-columncompiler"));
 // @ts-ignore
@@ -23,6 +23,8 @@ const mssql_querycompiler_1 = __importDefault(require("knex/lib/dialects/mssql/q
 // @ts-ignore
 const mssql_1 = __importDefault(require("knex/lib/dialects/mssql"));
 // @ts-ignore
+const postgres_1 = __importDefault(require("knex/lib/dialects/postgres"));
+// @ts-ignore
 const pg_tablecompiler_1 = __importDefault(require("knex/lib/dialects/postgres/schema/pg-tablecompiler"));
 // @ts-ignore
 const sqlite3_1 = __importDefault(require("knex/lib/dialects/sqlite3"));
@@ -39,13 +41,14 @@ const tablecompiler_1 = __importDefault(require("knex/lib/schema/tablecompiler")
 exports.MonkeyPatchable = {
     Client: client_1.default,
     QueryExecutioner: query_executioner_1.default,
-    MySqlDialect: mysql_1.default,
+    MySqlDialect: mysql2_1.default,
     MySqlColumnCompiler: mysql_columncompiler_1.default,
     MySqlQueryCompiler: mysql_querycompiler_1.default,
     MsSqlColumnCompiler: mssql_columncompiler_1.default,
     MsSqlTableCompiler: mssql_tablecompiler_1.default,
     MsSqlQueryCompiler: mssql_querycompiler_1.default,
     MsSqlDialect: mssql_1.default,
+    PostgresDialect: postgres_1.default,
     PostgresDialectTableCompiler: pg_tablecompiler_1.default,
     Sqlite3Dialect: sqlite3_1.default,
     Sqlite3DialectTableCompiler: sqlite_tablecompiler_1.default,

package/dialects/mysql/MySqlKnexDialect.d.ts

@@ -1,5 +1,5 @@
-import MySql2Dialect from 'knex/lib/dialects/mysql2';
-export declare class MySqlKnexDialect extends MySql2Dialect {
+import { MonkeyPatchable } from '../../MonkeyPatchable';
+export declare class MySqlKnexDialect extends MonkeyPatchable.MySqlDialect {
     queryCompiler(): any;
     columnCompiler(): any;
 }

package/dialects/mysql/MySqlKnexDialect.js

@@ -1,14 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySqlKnexDialect = void 0;
-// @ts-ignore
-const mysql2_1 = __importDefault(require("knex/lib/dialects/mysql2"));
 const MySqlQueryCompiler_1 = require("./MySqlQueryCompiler");
 const MySqlColumnCompiler_1 = require("./MySqlColumnCompiler");
-class MySqlKnexDialect extends mysql2_1.default {
+const MonkeyPatchable_1 = require("../../MonkeyPatchable");
+class MySqlKnexDialect extends MonkeyPatchable_1.MonkeyPatchable.MySqlDialect {
     queryCompiler() {
         // eslint-disable-next-line prefer-rest-params
         return new MySqlQueryCompiler_1.MySqlQueryCompiler(this, ...arguments);

package/dialects/postgresql/PostgreSqlKnexDialect.d.ts

@@ -1,6 +1,6 @@
-import PostgresDialect from 'knex/lib/dialects/postgres';
 import type { Configuration } from '@mikro-orm/core';
-export declare class PostgreSqlKnexDialect extends PostgresDialect {
+import { MonkeyPatchable } from '../../MonkeyPatchable';
+export declare class PostgreSqlKnexDialect extends MonkeyPatchable.PostgresDialect {
     ormConfig: Configuration;
     tableCompiler(): any;
 }

package/dialects/postgresql/PostgreSqlKnexDialect.js

@@ -1,13 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgreSqlKnexDialect = void 0;
-// @ts-ignore
-const postgres_1 = __importDefault(require("knex/lib/dialects/postgres"));
 const PostgreSqlTableCompiler_1 = require("./PostgreSqlTableCompiler");
-class PostgreSqlKnexDialect extends postgres_1.default {
+const MonkeyPatchable_1 = require("../../MonkeyPatchable");
+class PostgreSqlKnexDialect extends MonkeyPatchable_1.MonkeyPatchable.PostgresDialect {
     ormConfig;
     tableCompiler() {
         // eslint-disable-next-line prefer-rest-params

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.2.1-dev.8",
+  "version": "6.2.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",
@@ -63,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.2.0"
+    "@mikro-orm/core": "^6.2.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.1-dev.8"
+    "@mikro-orm/core": "^6.0.0"
   }
 }

package/query/QueryBuilderHelper.js

@@ -139,6 +139,7 @@ class QueryBuilderHelper {
         const inverseJoinColumns = prop.referencedColumnNames;
         const primaryKeys = prop.owner ? prop.joinColumns : prop2.referencedColumnNames;
         schema ??= prop.targetMeta?.schema === '*' ? '*' : this.driver.getSchemaName(prop.targetMeta);
+        cond = core_1.Utils.merge(cond, prop.where);
         return {
             prop, type, cond, ownerAlias, alias, table, schema,
             joinColumns, inverseJoinColumns, primaryKeys,