Fix partial joins with prefixed tables

prometixX · May 3, 2023 · 2841b63 · 2841b63
1 parent 5045d4c
commit 2841b63
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.25.4",
+  "version": "0.25.5",
   "description": "Drizzle ORM package for SQL databases",
   "type": "module",
   "scripts": {

diff --git a/src/mysql-core/dialect.ts b/src/mysql-core/dialect.ts
@@ -191,7 +191,10 @@ export class MySqlDialect {
 						: table instanceof SQL
 						? undefined
 						: getTableName(table))
-				&& !((table) => joins.some(({ alias }) => alias === getTableName(table)))(f.field.table)
+				&& !((table) =>
+					joins.some(({ alias }) =>
+						alias === (table[Table.Symbol.IsAlias] ? getTableName(table) : table[Table.Symbol.BaseName])
+					))(f.field.table)
 			) {
 				const tableName = getTableName(f.field.table);
 				throw new Error(

diff --git a/src/pg-core/dialect.ts b/src/pg-core/dialect.ts
@@ -186,7 +186,10 @@ export class PgDialect {
 						: table instanceof SQL
 						? undefined
 						: getTableName(table))
-				&& !((table) => joins.some(({ alias }) => alias === getTableName(table)))(f.field.table)
+				&& !((table) =>
+					joins.some(({ alias }) =>
+						alias === (table[Table.Symbol.IsAlias] ? getTableName(table) : table[Table.Symbol.BaseName])
+					))(f.field.table)
 			) {
 				const tableName = getTableName(f.field.table);
 				throw new Error(

diff --git a/src/sqlite-core/dialect.ts b/src/sqlite-core/dialect.ts
@@ -145,7 +145,10 @@ export abstract class SQLiteDialect {
 						: table instanceof SQL
 						? undefined
 						: getTableName(table))
-				&& !((table) => joins.some(({ alias }) => alias === getTableName(table)))(f.field.table)
+				&& !((table) =>
+					joins.some(({ alias }) =>
+						alias === (table[Table.Symbol.IsAlias] ? getTableName(table) : table[Table.Symbol.BaseName])
+					))(f.field.table)
 			) {
 				const tableName = getTableName(f.field.table);
 				throw new Error(