Feat: Set operations (union / intersect / except) support

drizzle-orm/src/libsql/driver.ts

@@ -10,20 +10,15 @@ import {
 } from '~/relations.ts';
 import { BaseSQLiteDatabase } from '~/sqlite-core/db.ts';
 import { SQLiteAsyncDialect } from '~/sqlite-core/dialect.ts';
-import type {
-	SQLiteDelete,
-	SQLiteInsert,
-	SQLiteSelect,
-	SQLiteUpdate,
-} from '~/sqlite-core/index.ts';
+import type { SQLiteDelete, SQLiteInsert, SQLiteSelect, SQLiteUpdate } from '~/sqlite-core/index.ts';
 import type { SQLiteRelationalQuery } from '~/sqlite-core/query-builders/query.ts';
 import type { SQLiteRaw } from '~/sqlite-core/query-builders/raw.ts';
 import { type DrizzleConfig } from '~/utils.ts';
 import { LibSQLSession } from './session.ts';
 
 export type BatchParameters =
 	| SQLiteUpdate<any, 'async', ResultSet, any>
-	| SQLiteSelect<any, 'async', ResultSet, any, any>
+	| SQLiteSelect<any, 'async', ResultSet, any, any, any>
 	| SQLiteDelete<any, 'async', ResultSet, any>
 	| Omit<SQLiteDelete<any, 'async', ResultSet, any>, 'where'>
 	| Omit<SQLiteUpdate<any, 'async', ResultSet, any>, 'where'>

drizzle-orm/src/mysql-core/dialect.ts

@@ -24,6 +24,7 @@ import { MySqlColumn } from './columns/common.ts';
 import type { MySqlDeleteConfig } from './query-builders/delete.ts';
 import type { MySqlInsertConfig } from './query-builders/insert.ts';
 import type { Join, MySqlSelectConfig, SelectedFieldsOrdered } from './query-builders/select.types.ts';
+import type { MySqlSetOperatorConfig } from './query-builders/set-operators.ts';
 import type { MySqlUpdateConfig } from './query-builders/update.ts';
 import type { MySqlSession } from './session.ts';
 import { MySqlTable } from './table.ts';
@@ -334,6 +335,54 @@ export class MySqlDialect {
 		return sql`${withSql}select${distinctSql} ${selection} from ${tableSql}${joinsSql}${whereSql}${groupBySql}${havingSql}${orderBySql}${limitSql}${offsetSql}${lockingClausesSql}`;
 	}
 
+	buildSetOperationQuery({
+		operator,
+		isAll,
+		leftSelect,
+		rightSelect,
+		limit,
+		orderBy,
+		offset,
+	}: MySqlSetOperatorConfig): SQL {
+		const leftChunk = sql`(${leftSelect.getSQL()}) `;
+		const rightChunk = sql`(${rightSelect.getSQL()})`;
+
+		let orderBySql;
+		if (orderBy && orderBy.length > 0) {
+			const orderByValues: SQL<unknown>[] = [];
+
+			// The next bit is necessary because the sql operator replaces ${table.column} with `table`.`column`
+			// which is invalid MySql syntax, Table from one of the SELECTs cannot be used in global ORDER clause
+			for (const orderByUnit of orderBy) {
+				if (is(orderByUnit, MySqlColumn)) {
+					orderByValues.push(sql.raw(orderByUnit.name));
+				} else if (is(orderByUnit, SQL)) {
+					for (let i = 0; i < orderByUnit.queryChunks.length; i++) {
+						const chunk = orderByUnit.queryChunks[i];
+
+						if (is(chunk, MySqlColumn)) {
+							orderByUnit.queryChunks[i] = sql.raw(chunk.name);
+						}
+					}
+
+					orderByValues.push(sql`${orderByUnit}`);
+				} else {
+					orderByValues.push(sql`${orderByUnit}`);
+				}
+			}
+
+			orderBySql = sql` order by ${sql.join(orderByValues, sql`, `)} `;
+		}
+
+		const limitSql = limit ? sql` limit ${limit}` : undefined;
+
+		const operatorChunk = sql.raw(`${operator} ${isAll ? 'all ' : ''}`);
+
+		const offsetSql = offset ? sql` offset ${offset}` : undefined;
+
+		return sql`${leftChunk}${operatorChunk}${rightChunk}${orderBySql}${limitSql}${offsetSql}`;
+	}
+
 	buildInsertQuery({ table, values, ignore, onConflict }: MySqlInsertConfig): SQL {
 		// const isSingleValue = values.length === 1;
 		const valuesSqlList: ((SQLChunk | SQL)[] | SQL)[] = [];

drizzle-orm/src/mysql-core/query-builders/index.ts

@@ -3,4 +3,5 @@ export * from './insert.ts';
 export * from './query-builder.ts';
 export * from './select.ts';
 export * from './select.types.ts';
+export * from './set-operators.ts';
 export * from './update.ts';

drizzle-orm/src/mysql-core/query-builders/select.ts

@@ -10,7 +10,6 @@ import type {
 import type { SubqueryWithSelection } from '~/mysql-core/subquery.ts';
 import type { MySqlTable } from '~/mysql-core/table.ts';
 import { MySqlViewBase } from '~/mysql-core/view.ts';
-import { TypedQueryBuilder } from '~/query-builders/query-builder.ts';
 import type {
 	BuildSubquerySelection,
 	GetSelectTableName,
@@ -37,6 +36,7 @@ import type {
 	MySqlSelectQueryBuilderHKT,
 	SelectedFields,
 } from './select.types.ts';
+import { MySqlSetOperatorBuilder } from './set-operators.ts';
 
 type CreateMySqlSelectFromBuilderMode<
 	TBuilderMode extends 'db' | 'qb',
@@ -128,9 +128,12 @@ export abstract class MySqlSelectQueryBuilder<
 	TSelectMode extends SelectMode,
 	TNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'>
 		: {},
-> extends TypedQueryBuilder<
-	BuildSubquerySelection<TSelection, TNullabilityMap>,
-	SelectResult<TSelection, TSelectMode, TNullabilityMap>[]
+> extends MySqlSetOperatorBuilder<
+	TTableName,
+	TSelection,
+	TSelectMode,
+	PreparedQueryHKTBase,
+	TNullabilityMap
 > {
 	static readonly [entityKind]: string = 'MySqlSelectQueryBuilder';