Merge pull request #683 from drizzle-team/fix-composite-fks-in-rqb

drizzle-team · Jun 1, 2023 · acf9935 · acf9935
2 parents 2089693 + aa7bb38
commit acf9935
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/drizzle-orm/src/mysql-core/dialect.ts b/drizzle-orm/src/mysql-core/dialect.ts
@@ -563,9 +563,15 @@ export class MySqlDialect {
 				)
 			}))`;
 
-			const field = sql`if(count(${
-				sql.join(normalizedRelation.references.map((c) => aliasedTableColumn(c, relationAlias)), sql.raw(' or '))
-			}) = 0, '[]', ${elseField})`.as(selectedRelationKey);
+			const countSql = normalizedRelation.references.length === 1
+				? aliasedTableColumn(normalizedRelation.references[0]!, relationAlias)
+				: sql.fromList([
+					sql`coalesce(`,
+					sql.join(normalizedRelation.references.map((c) => aliasedTableColumn(c, relationAlias)), sql.raw(', ')),
+					sql.raw(')'),
+				]);
+
+			const field = sql`if(count(${countSql}) = 0, '[]', ${elseField})`.as(selectedRelationKey);
 
 			const builtRelationField = {
 				path: [selectedRelationKey],

diff --git a/drizzle-orm/src/pg-core/dialect.ts b/drizzle-orm/src/pg-core/dialect.ts
@@ -632,9 +632,15 @@ export class PgDialect {
 				elseField.append(sql.raw('::text'));
 			}
 
-			const field = sql`case when count(${
-				sql.join(normalizedRelation.references.map((c) => aliasedTableColumn(c, relationAlias)), sql.raw(' or '))
-			}) = 0 then '[]' else ${elseField} end`.as(selectedRelationKey);
+			const countSql = normalizedRelation.references.length === 1
+				? aliasedTableColumn(normalizedRelation.references[0]!, relationAlias)
+				: sql.fromList([
+					sql`coalesce(`,
+					sql.join(normalizedRelation.references.map((c) => aliasedTableColumn(c, relationAlias)), sql.raw(', ')),
+					sql.raw(')'),
+				]);
+
+			const field = sql`case when count(${countSql}) = 0 then '[]' else ${elseField} end`.as(selectedRelationKey);
 
 			const builtRelationField = {
 				path: [selectedRelationKey],

diff --git a/drizzle-orm/src/sqlite-core/dialect.ts b/drizzle-orm/src/sqlite-core/dialect.ts
@@ -504,9 +504,15 @@ export abstract class SQLiteDialect {
 				)
 			}))`;
 
-			const field = sql`case when count(${
-				sql.join(normalizedRelation.references.map((c) => aliasedTableColumn(c, relationAlias)), sql.raw(' or '))
-			}) = 0 then '[]' else ${elseField} end`.as(selectedRelationKey);
+			const countSql = normalizedRelation.references.length === 1
+				? aliasedTableColumn(normalizedRelation.references[0]!, relationAlias)
+				: sql.fromList([
+					sql`coalesce(`,
+					sql.join(normalizedRelation.references.map((c) => aliasedTableColumn(c, relationAlias)), sql.raw(', ')),
+					sql.raw(')'),
+				]);
+
+			const field = sql`case when count(${countSql}) = 0 then '[]' else ${elseField} end`.as(selectedRelationKey);
 
 			const builtRelationField = {
 				path: [selectedRelationKey],