fix(knex): rework postgres and mysql dialect imports to fix compilati…

…on errors
mikro-orm · Apr 12, 2024 · ffdca15 · ffdca15
1 parent c937060
commit ffdca15
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/packages/knex/src/MonkeyPatchable.ts b/packages/knex/src/MonkeyPatchable.ts
@@ -3,7 +3,7 @@ import Client from 'knex/lib/client';
 // @ts-ignore
 import QueryExecutioner from 'knex/lib/execution/internal/query-executioner';
 // @ts-ignore
-import MySqlDialect from 'knex/lib/dialects/mysql';
+import MySqlDialect from 'knex/lib/dialects/mysql2';
 // @ts-ignore
 import MySqlColumnCompiler from 'knex/lib/dialects/mysql/schema/mysql-columncompiler';
 // @ts-ignore
@@ -17,6 +17,8 @@ import MsSqlQueryCompiler from 'knex/lib/dialects/mssql/query/mssql-querycompile
 // @ts-ignore
 import MsSqlDialect from 'knex/lib/dialects/mssql';
 // @ts-ignore
+import PostgresDialect from 'knex/lib/dialects/postgres';
+// @ts-ignore
 import PostgresDialectTableCompiler from 'knex/lib/dialects/postgres/schema/pg-tablecompiler';
 // @ts-ignore
 import Sqlite3Dialect from 'knex/lib/dialects/sqlite3';
@@ -41,6 +43,7 @@ export const MonkeyPatchable = {
   MsSqlTableCompiler,
   MsSqlQueryCompiler,
   MsSqlDialect,
+  PostgresDialect,
   PostgresDialectTableCompiler,
   Sqlite3Dialect,
   Sqlite3DialectTableCompiler,

diff --git a/packages/knex/src/dialects/mysql/MySqlKnexDialect.ts b/packages/knex/src/dialects/mysql/MySqlKnexDialect.ts
@@ -1,9 +1,8 @@
-// @ts-ignore
-import MySql2Dialect from 'knex/lib/dialects/mysql2';
+import { MonkeyPatchable } from '@mikro-orm/knex';
 import { MySqlQueryCompiler } from './MySqlQueryCompiler';
 import { MySqlColumnCompiler } from './MySqlColumnCompiler';
 
-export class MySqlKnexDialect extends MySql2Dialect {
+export class MySqlKnexDialect extends MonkeyPatchable.MySqlDialect {
 
   queryCompiler() {
     // eslint-disable-next-line prefer-rest-params

diff --git a/packages/knex/src/dialects/postgresql/PostgreSqlKnexDialect.ts b/packages/knex/src/dialects/postgresql/PostgreSqlKnexDialect.ts
@@ -1,9 +1,8 @@
-// @ts-ignore
-import PostgresDialect from 'knex/lib/dialects/postgres';
+import { MonkeyPatchable } from '@mikro-orm/knex';
 import type { Configuration } from '@mikro-orm/core';
 import { PostgreSqlTableCompiler } from './PostgreSqlTableCompiler';
 
-export class PostgreSqlKnexDialect extends PostgresDialect {
+export class PostgreSqlKnexDialect extends MonkeyPatchable.PostgresDialect {
 
   ormConfig!: Configuration;