kysely 0.9.2 → 0.9.3

package/dist/cjs/query-builder/query-builder.d.ts

@@ -18,6 +18,7 @@ import { QueryExecutor } from '../query-executor/query-executor.js';
 import { QueryId } from '../util/query-id.js';
 import { OnConflictConstraintTarget } from '../parser/on-conflict-parser.js';
 import { ParseContext } from '../parser/parse-context.js';
+import { UnionExpression } from '../parser/union-parser.js';
 /**
  * The main query builder class.
  *
@@ -998,7 +999,7 @@ export declare class QueryBuilder<DB, TB extends keyof DB, O = {}> implements Op
      * ```
      */
     values(row: InsertObject<DB, TB>): QueryBuilder<DB, TB, O>;
-    values(row: InsertObject<DB, TB>[]): QueryBuilder<DB, TB, O>;
+    values(row: ReadonlyArray<InsertObject<DB, TB>>): QueryBuilder<DB, TB, O>;
     /**
      * Ignores the insert if the column or constraint given as the first
      * argument conflicts with the current rows in the database. The
@@ -1553,6 +1554,34 @@ export declare class QueryBuilder<DB, TB extends keyof DB, O = {}> implements Op
      * ```
      */
     offset(offset: number): QueryBuilder<DB, TB, O>;
+    /**
+     * Combines another select query or raw expression to this query using `union`.
+     *
+     * The output row type of the combined query must match `this` query.
+     *
+     * @xample
+     * ```ts
+     * db.selectFrom('person')
+     *   .select(['id', 'first_name as name'])
+     *   .union(db.selectFrom('pet').select(['id', 'name']))
+     *   .orderBy('name')
+     * ```
+     */
+    union(expression: UnionExpression<DB, O>): QueryBuilder<DB, TB, O>;
+    /**
+     * Combines another select query or raw expression to this query using `union all`.
+     *
+     * The output row type of the combined query must match `this` query.
+     *
+     * @xample
+     * ```ts
+     * db.selectFrom('person')
+     *   .select(['id', 'first_name as name'])
+     *   .unionAll(db.selectFrom('pet').select(['id', 'name']))
+     *   .orderBy('name')
+     * ```
+     */
+    unionAll(expression: UnionExpression<DB, O>): QueryBuilder<DB, TB, O>;
     /**
      * Gives an alias for the query. This method is only useful for sub queries.
      *

package/dist/cjs/query-builder/query-builder.js

@@ -20,6 +20,7 @@ const object_utils_js_1 = require("../util/object-utils.js");
 const delete_query_node_js_1 = require("../operation-node/delete-query-node.js");
 const on_duplicate_key_node_js_1 = require("../operation-node/on-duplicate-key-node.js");
 const group_by_parser_js_1 = require("../parser/group-by-parser.js");
+const union_parser_js_1 = require("../parser/union-parser.js");
 /**
  * The main query builder class.
  *
@@ -777,6 +778,46 @@ class QueryBuilder {
             queryNode: select_query_node_js_1.SelectQueryNode.cloneWithOffset(this.#props.queryNode, offset_node_js_1.OffsetNode.create(offset)),
         });
     }
+    /**
+     * Combines another select query or raw expression to this query using `union`.
+     *
+     * The output row type of the combined query must match `this` query.
+     *
+     * @xample
+     * ```ts
+     * db.selectFrom('person')
+     *   .select(['id', 'first_name as name'])
+     *   .union(db.selectFrom('pet').select(['id', 'name']))
+     *   .orderBy('name')
+     * ```
+     */
+    union(expression) {
+        assertCanHaveUnion(this.#props.queryNode);
+        return new QueryBuilder({
+            ...this.#props,
+            queryNode: select_query_node_js_1.SelectQueryNode.cloneWithUnion(this.#props.queryNode, (0, union_parser_js_1.parseUnion)(expression, false)),
+        });
+    }
+    /**
+     * Combines another select query or raw expression to this query using `union all`.
+     *
+     * The output row type of the combined query must match `this` query.
+     *
+     * @xample
+     * ```ts
+     * db.selectFrom('person')
+     *   .select(['id', 'first_name as name'])
+     *   .unionAll(db.selectFrom('pet').select(['id', 'name']))
+     *   .orderBy('name')
+     * ```
+     */
+    unionAll(expression) {
+        assertCanHaveUnion(this.#props.queryNode);
+        return new QueryBuilder({
+            ...this.#props,
+            queryNode: select_query_node_js_1.SelectQueryNode.cloneWithUnion(this.#props.queryNode, (0, union_parser_js_1.parseUnion)(expression, true)),
+        });
+    }
     /**
      * Gives an alias for the query. This method is only useful for sub queries.
      *
@@ -985,3 +1026,8 @@ function assertCanHaveOffset(node) {
         throw new Error('only a select query can have an offset');
     }
 }
+function assertCanHaveUnion(node) {
+    if (!select_query_node_js_1.SelectQueryNode.is(node)) {
+        throw new Error('only a select query can have an union');
+    }
+}

package/dist/cjs/query-compiler/default-query-compiler.d.ts

@@ -60,6 +60,8 @@ import { ForeignKeyConstraintNode } from '../operation-node/foreign-key-constrai
 import { ColumnDefinitionNode } from '../operation-node/column-definition-node.js';
 import { ModifyColumnNode } from '../operation-node/modify-column-node.js';
 import { OnDuplicateKeyNode } from '../operation-node/on-duplicate-key-node.js';
+import { ColumnNode } from '../operation-node/column-node.js';
+import { UnionNode } from '../operation-node/union-node.js';
 export declare class DefaultQueryCompiler extends OperationNodeVisitor implements QueryCompiler {
     #private;
     protected get numParameters(): number;
@@ -67,6 +69,8 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected getSql(): string;
     protected visitSelectQuery(node: SelectQueryNode): void;
     protected visitFrom(node: FromNode): void;
+    protected visitSelection(node: SelectionNode): void;
+    protected visitColumn(node: ColumnNode): void;
     protected compileDistinctOn(selections: ReadonlyArray<SelectionNode>): void;
     protected compileList(nodes: ReadonlyArray<OperationNode>, separator?: string): void;
     protected visitWhere(node: WhereNode): void;
@@ -125,6 +129,7 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected visitModifyColumn(node: ModifyColumnNode): void;
     protected visitAddConstraint(node: AddConstraintNode): void;
     protected visitDropConstraint(node: DropConstraintNode): void;
+    protected visitUnion(node: UnionNode): void;
     protected append(str: string): void;
     protected appendValue(parameter: unknown): void;
     protected getLeftIdentifierWrapper(): string;

package/dist/cjs/query-compiler/default-query-compiler.js

@@ -17,7 +17,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         this.visitNode(node);
         return (0, object_utils_js_1.freeze)({
             sql: this.getSql(),
-            parameters: this.#parameters,
+            parameters: [...this.#parameters],
         });
     }
     getSql() {
@@ -63,6 +63,10 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' ');
             this.visitNode(node.having);
         }
+        if (node.union) {
+            this.append(' ');
+            this.compileList(node.union, ' ');
+        }
         if (node.orderBy) {
             this.append(' ');
             this.visitNode(node.orderBy);
@@ -89,6 +93,12 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         this.append('from ');
         this.compileList(node.froms);
     }
+    visitSelection(node) {
+        this.visitNode(node.selection);
+    }
+    visitColumn(node) {
+        this.visitNode(node.column);
+    }
     compileDistinctOn(selections) {
         this.append('distinct on (');
         this.compileList(selections);
@@ -630,6 +640,13 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         this.append('drop constraint ');
         this.visitNode(node.constraintName);
     }
+    visitUnion(node) {
+        this.append('union ');
+        if (node.all) {
+            this.append('all ');
+        }
+        this.visitNode(node.union);
+    }
     append(str) {
         this.#sql += str;
     }

package/dist/esm/operation-node/operation-node-transformer.d.ts

@@ -57,6 +57,7 @@ import { ForeignKeyConstraintNode } from './foreign-key-constraint-node.js';
 import { ColumnDefinitionNode } from './column-definition-node.js';
 import { ModifyColumnNode } from './modify-column-node.js';
 import { OnDuplicateKeyNode } from './on-duplicate-key-node.js';
+import { UnionNode } from './union-node.js';
 /**
  * Transforms an operation node tree into another one.
  *
@@ -129,6 +130,7 @@ export declare class OperationNodeTransformer {
     protected transformPrimaryKeyConstraint(node: PrimaryKeyConstraintNode): PrimaryKeyConstraintNode;
     protected transformUniqueConstraint(node: UniqueConstraintNode): UniqueConstraintNode;
     protected transformForeignKeyConstraint(node: ForeignKeyConstraintNode): ForeignKeyConstraintNode;
+    protected transformUnion(node: UnionNode): UnionNode;
     protected transformReferences(node: ReferencesNode): ReferencesNode;
     protected transformCheckConstraint(node: CheckConstraintNode): CheckConstraintNode;
     protected transformWith(node: WithNode): WithNode;

package/dist/esm/operation-node/operation-node-transformer.js

@@ -89,6 +89,7 @@ export class OperationNodeTransformer {
         AddConstraintNode: this.transformAddConstraint.bind(this),
         DropConstraintNode: this.transformDropConstraint.bind(this),
         ForeignKeyConstraintNode: this.transformForeignKeyConstraint.bind(this),
+        UnionNode: this.transformUnion.bind(this),
     };
     transformNode = (node) => {
         if (!node) {
@@ -121,6 +122,7 @@ export class OperationNodeTransformer {
             offset: this.transformNode(node.offset),
             with: this.transformNode(node.with),
             having: this.transformNode(node.having),
+            union: this.transformNodeList(node.union),
         };
     }
     transformSelection(node) {
@@ -400,6 +402,13 @@ export class OperationNodeTransformer {
             onUpdate: node.onUpdate,
         };
     }
+    transformUnion(node) {
+        return {
+            kind: 'UnionNode',
+            union: this.transformNode(node.union),
+            all: node.all,
+        };
+    }
     transformReferences(node) {
         return {
             kind: 'ReferencesNode',

package/dist/esm/operation-node/operation-node-visitor.d.ts

@@ -57,66 +57,68 @@ import { ForeignKeyConstraintNode } from './foreign-key-constraint-node.js';
 import { ColumnDefinitionNode } from './column-definition-node.js';
 import { ModifyColumnNode } from './modify-column-node.js';
 import { OnDuplicateKeyNode } from './on-duplicate-key-node.js';
-export declare class OperationNodeVisitor {
+import { UnionNode } from './union-node.js';
+export declare abstract class OperationNodeVisitor {
     #private;
     protected readonly nodeStack: OperationNode[];
     protected readonly visitNode: (node: OperationNode) => void;
-    protected visitSelectQuery(node: SelectQueryNode): void;
-    protected visitSelection(node: SelectionNode): void;
-    protected visitColumn(node: ColumnNode): void;
-    protected visitAlias(node: AliasNode): void;
-    protected visitTable(node: TableNode): void;
-    protected visitFrom(node: FromNode): void;
-    protected visitReference(node: ReferenceNode): void;
-    protected visitFilter(node: FilterNode): void;
-    protected visitAnd(node: AndNode): void;
-    protected visitOr(node: OrNode): void;
-    protected visitValueList(node: ValueListNode): void;
-    protected visitParens(node: ParensNode): void;
-    protected visitJoin(node: JoinNode): void;
-    protected visitRaw(node: RawNode): void;
-    protected visitWhere(node: WhereNode): void;
-    protected visitInsertQuery(node: InsertQueryNode): void;
-    protected visitDeleteQuery(node: DeleteQueryNode): void;
-    protected visitReturning(node: ReturningNode): void;
-    protected visitCreateTable(node: CreateTableNode): void;
-    protected visitAddColumn(node: AddColumnNode): void;
-    protected visitColumnDefinition(node: ColumnDefinitionNode): void;
-    protected visitDropTable(node: DropTableNode): void;
-    protected visitOrderBy(node: OrderByNode): void;
-    protected visitOrderByItem(node: OrderByItemNode): void;
-    protected visitGroupBy(node: GroupByNode): void;
-    protected visitGroupByItem(node: GroupByItemNode): void;
-    protected visitUpdateQuery(node: UpdateQueryNode): void;
-    protected visitColumnUpdate(node: ColumnUpdateNode): void;
-    protected visitLimit(node: LimitNode): void;
-    protected visitOffset(node: OffsetNode): void;
-    protected visitOnConflict(node: OnConflictNode): void;
-    protected visitOnDuplicateKey(node: OnDuplicateKeyNode): void;
-    protected visitCreateIndex(node: CreateIndexNode): void;
-    protected visitList(node: ListNode): void;
-    protected visitDropIndex(node: DropIndexNode): void;
-    protected visitPrimaryKeyConstraint(node: PrimaryKeyConstraintNode): void;
-    protected visitUniqueConstraint(node: UniqueConstraintNode): void;
-    protected visitReferences(node: ReferencesNode): void;
-    protected visitCheckConstraint(node: CheckConstraintNode): void;
-    protected visitWith(node: WithNode): void;
-    protected visitCommonTableExpression(node: CommonTableExpressionNode): void;
-    protected visitHaving(node: HavingNode): void;
-    protected visitCreateSchema(node: CreateSchemaNode): void;
-    protected visitDropSchema(node: DropSchemaNode): void;
-    protected visitAlterTable(node: AlterTableNode): void;
-    protected visitDropColumn(node: DropColumnNode): void;
-    protected visitRenameColumn(node: RenameColumnNode): void;
-    protected visitAlterColumn(node: AlterColumnNode): void;
-    protected visitModifyColumn(node: ModifyColumnNode): void;
-    protected visitAddConstraint(node: AddConstraintNode): void;
-    protected visitDropConstraint(node: DropConstraintNode): void;
-    protected visitForeignKeyConstraint(node: ForeignKeyConstraintNode): void;
-    protected visitDataType(node: DataTypeNode): void;
-    protected visitSelectAll(_: SelectAllNode): void;
-    protected visitIdentifier(_: IdentifierNode): void;
-    protected visitValue(_: ValueNode): void;
-    protected visitPrimitiveValueList(_: PrimitiveValueListNode): void;
-    protected visitOperator(node: OperatorNode): void;
+    protected abstract visitSelectQuery(node: SelectQueryNode): void;
+    protected abstract visitSelection(node: SelectionNode): void;
+    protected abstract visitColumn(node: ColumnNode): void;
+    protected abstract visitAlias(node: AliasNode): void;
+    protected abstract visitTable(node: TableNode): void;
+    protected abstract visitFrom(node: FromNode): void;
+    protected abstract visitReference(node: ReferenceNode): void;
+    protected abstract visitFilter(node: FilterNode): void;
+    protected abstract visitAnd(node: AndNode): void;
+    protected abstract visitOr(node: OrNode): void;
+    protected abstract visitValueList(node: ValueListNode): void;
+    protected abstract visitParens(node: ParensNode): void;
+    protected abstract visitJoin(node: JoinNode): void;
+    protected abstract visitRaw(node: RawNode): void;
+    protected abstract visitWhere(node: WhereNode): void;
+    protected abstract visitInsertQuery(node: InsertQueryNode): void;
+    protected abstract visitDeleteQuery(node: DeleteQueryNode): void;
+    protected abstract visitReturning(node: ReturningNode): void;
+    protected abstract visitCreateTable(node: CreateTableNode): void;
+    protected abstract visitAddColumn(node: AddColumnNode): void;
+    protected abstract visitColumnDefinition(node: ColumnDefinitionNode): void;
+    protected abstract visitDropTable(node: DropTableNode): void;
+    protected abstract visitOrderBy(node: OrderByNode): void;
+    protected abstract visitOrderByItem(node: OrderByItemNode): void;
+    protected abstract visitGroupBy(node: GroupByNode): void;
+    protected abstract visitGroupByItem(node: GroupByItemNode): void;
+    protected abstract visitUpdateQuery(node: UpdateQueryNode): void;
+    protected abstract visitColumnUpdate(node: ColumnUpdateNode): void;
+    protected abstract visitLimit(node: LimitNode): void;
+    protected abstract visitOffset(node: OffsetNode): void;
+    protected abstract visitOnConflict(node: OnConflictNode): void;
+    protected abstract visitOnDuplicateKey(node: OnDuplicateKeyNode): void;
+    protected abstract visitCreateIndex(node: CreateIndexNode): void;
+    protected abstract visitDropIndex(node: DropIndexNode): void;
+    protected abstract visitList(node: ListNode): void;
+    protected abstract visitPrimaryKeyConstraint(node: PrimaryKeyConstraintNode): void;
+    protected abstract visitUniqueConstraint(node: UniqueConstraintNode): void;
+    protected abstract visitReferences(node: ReferencesNode): void;
+    protected abstract visitCheckConstraint(node: CheckConstraintNode): void;
+    protected abstract visitWith(node: WithNode): void;
+    protected abstract visitCommonTableExpression(node: CommonTableExpressionNode): void;
+    protected abstract visitHaving(node: HavingNode): void;
+    protected abstract visitCreateSchema(node: CreateSchemaNode): void;
+    protected abstract visitDropSchema(node: DropSchemaNode): void;
+    protected abstract visitAlterTable(node: AlterTableNode): void;
+    protected abstract visitDropColumn(node: DropColumnNode): void;
+    protected abstract visitRenameColumn(node: RenameColumnNode): void;
+    protected abstract visitAlterColumn(node: AlterColumnNode): void;
+    protected abstract visitModifyColumn(node: ModifyColumnNode): void;
+    protected abstract visitAddConstraint(node: AddConstraintNode): void;
+    protected abstract visitDropConstraint(node: DropConstraintNode): void;
+    protected abstract visitForeignKeyConstraint(node: ForeignKeyConstraintNode): void;
+    protected abstract visitUnion(node: UnionNode): void;
+    protected abstract visitDataType(node: DataTypeNode): void;
+    protected abstract visitSelectAll(_: SelectAllNode): void;
+    protected abstract visitIdentifier(_: IdentifierNode): void;
+    protected abstract visitValue(_: ValueNode): void;
+    protected abstract visitPrimitiveValueList(_: PrimitiveValueListNode): void;
+    protected abstract visitOperator(node: OperatorNode): void;
 }