add MERGE query support.

src/dialect/mssql/mssql-query-compiler.ts

@@ -1,6 +1,7 @@
 import { AddColumnNode } from '../../operation-node/add-column-node.js'
 import { AlterTableColumnAlterationNode } from '../../operation-node/alter-table-node.js'
 import { DropColumnNode } from '../../operation-node/drop-column-node.js'
+import { MergeQueryNode } from '../../operation-node/merge-query-node.js'
 import { DefaultQueryCompiler } from '../../query-compiler/default-query-compiler.js'
 
 export class MssqlQueryCompiler extends DefaultQueryCompiler {
@@ -73,6 +74,11 @@ export class MssqlQueryCompiler extends DefaultQueryCompiler {
     this.visitNode(node.column)
   }
 
+  protected override visitMergeQuery(node: MergeQueryNode): void {
+    super.visitMergeQuery(node)
+    this.append(';')
+  }
+
   protected override announcesNewColumnDataType(): boolean {
     return false
   }

src/dialect/postgres/postgres-dialect-config.ts

@@ -66,7 +66,7 @@ export type PostgresCursorConstructor = new <T>(
 ) => PostgresCursor<T>
 
 export interface PostgresQueryResult<R> {
-  command: 'UPDATE' | 'DELETE' | 'INSERT' | 'SELECT'
+  command: 'UPDATE' | 'DELETE' | 'INSERT' | 'SELECT' | 'MERGE'
   rowCount: number
   rows: R[]
 }

src/dialect/postgres/postgres-driver.ts

@@ -109,7 +109,8 @@ class PostgresConnection implements DatabaseConnection {
       if (
         result.command === 'INSERT' ||
         result.command === 'UPDATE' ||
-        result.command === 'DELETE'
+        result.command === 'DELETE' ||
+        result.command === 'MERGE'
       ) {
         const numAffectedRows = BigInt(result.rowCount)
 

src/driver/database-connection.ts

@@ -21,7 +21,7 @@ export interface QueryResult<O> {
   readonly numUpdatedOrDeletedRows?: bigint
 
   /**
-   * This is defined for insert, update and delete queries and contains
+   * This is defined for insert, update, delete and merge queries and contains
    * the number of rows the query inserted/updated/deleted.
    */
   readonly numAffectedRows?: bigint

src/index.ts

@@ -25,6 +25,8 @@ export * from './query-builder/on-conflict-builder.js'
 export * from './query-builder/aggregate-function-builder.js'
 export * from './query-builder/case-builder.js'
 export * from './query-builder/json-path-builder.js'
+export * from './query-builder/merge-query-builder.js'
+export * from './query-builder/merge-result.js'
 
 export * from './raw-builder/raw-builder.js'
 export * from './raw-builder/sql.js'
@@ -197,6 +199,8 @@ export * from './operation-node/json-path-leg-node.js'
 export * from './operation-node/json-path-node.js'
 export * from './operation-node/json-operator-chain-node.js'
 export * from './operation-node/tuple-node.js'
+export * from './operation-node/merge-query-node.js'
+export * from './operation-node/matched-node.js'
 
 export * from './util/column-type.js'
 export * from './util/compilable.js'
@@ -238,6 +242,7 @@ export {
   ValueExpressionOrList,
 } from './parser/value-parser.js'
 export {
+  SimpleTableReference,
   TableExpression,
   TableExpressionOrList,
 } from './parser/table-parser.js'

src/operation-node/insert-query-node.ts

@@ -12,7 +12,7 @@ export type InsertQueryNodeProps = Omit<InsertQueryNode, 'kind' | 'into'>
 
 export interface InsertQueryNode extends OperationNode {
   readonly kind: 'InsertQueryNode'
-  readonly into: TableNode
+  readonly into?: TableNode
   readonly columns?: ReadonlyArray<ColumnNode>
   readonly values?: OperationNode
   readonly returning?: ReturningNode
@@ -46,6 +46,12 @@ export const InsertQueryNode = freeze({
     })
   },
 
+  createWithoutInto(): InsertQueryNode {
+    return freeze({
+      kind: 'InsertQueryNode',
+    })
+  },
+
   cloneWith(
     insertQuery: InsertQueryNode,
     props: InsertQueryNodeProps

src/operation-node/join-node.ts

@@ -1,8 +1,6 @@
 import { freeze } from '../util/object-utils.js'
-import { AliasNode } from './alias-node.js'
 import { OnNode } from './on-node.js'
 import { OperationNode } from './operation-node.js'
-import { TableNode } from './table-node.js'
 
 export type JoinType =
   | 'InnerJoin'
@@ -11,6 +9,7 @@ export type JoinType =
   | 'FullJoin'
   | 'LateralInnerJoin'
   | 'LateralLeftJoin'
+  | 'Using'
 
 export interface JoinNode extends OperationNode {
   readonly kind: 'JoinNode'

src/operation-node/matched-node.ts

@@ -0,0 +1,25 @@
+import { freeze } from '../util/object-utils.js'
+import { OperationNode } from './operation-node.js'
+
+export interface MatchedNode extends OperationNode {
+  readonly kind: 'MatchedNode'
+  readonly not: boolean
+  readonly bySource: boolean
+}
+
+/**
+ * @internal
+ */
+export const MatchedNode = freeze({
+  is(node: OperationNode): node is MatchedNode {
+    return node.kind === 'MatchedNode'
+  },
+
+  create(not: boolean, bySource: boolean = false): MatchedNode {
+    return freeze({
+      kind: 'MatchedNode',
+      not,
+      bySource,
+    })
+  },
+})

src/operation-node/merge-query-node.ts

@@ -0,0 +1,66 @@
+import { freeze } from '../util/object-utils.js'
+import { AliasNode } from './alias-node.js'
+import { JoinNode } from './join-node.js'
+import { OperationNode } from './operation-node.js'
+import { TableNode } from './table-node.js'
+import { WhenNode } from './when-node.js'
+import { WithNode } from './with-node.js'
+
+export interface MergeQueryNode extends OperationNode {
+  readonly kind: 'MergeQueryNode'
+  readonly into: TableNode | AliasNode
+  readonly using?: JoinNode
+  readonly whens?: ReadonlyArray<WhenNode>
+  readonly with?: WithNode
+}
+
+/**
+ * @internal
+ */
+export const MergeQueryNode = freeze({
+  is(node: OperationNode): node is MergeQueryNode {
+    return node.kind === 'MergeQueryNode'
+  },
+
+  create(into: TableNode | AliasNode, withNode?: WithNode): MergeQueryNode {
+    return freeze({
+      kind: 'MergeQueryNode',
+      into,
+      ...(withNode && { with: withNode }),
+    })
+  },
+
+  cloneWithUsing(mergeNode: MergeQueryNode, using: JoinNode): MergeQueryNode {
+    return freeze({
+      ...mergeNode,
+      using,
+    })
+  },
+
+  cloneWithWhen(mergeNode: MergeQueryNode, when: WhenNode): MergeQueryNode {
+    return freeze({
+      ...mergeNode,
+      whens: mergeNode.whens
+        ? freeze([...mergeNode.whens, when])
+        : freeze([when]),
+    })
+  },
+
+  cloneWithThen(
+    mergeNode: MergeQueryNode,
+    then: OperationNode
+  ): MergeQueryNode {
+    return freeze({
+      ...mergeNode,
+      whens: mergeNode.whens
+        ? freeze([
+            ...mergeNode.whens.slice(0, -1),
+            WhenNode.cloneWithResult(
+              mergeNode.whens[mergeNode.whens.length - 1],
+              then
+            ),
+          ])
+        : undefined,
+    })
+  },
+})

src/operation-node/operation-node-transformer.ts

@@ -87,6 +87,8 @@ import { JSONPathNode } from './json-path-node.js'
 import { JSONPathLegNode } from './json-path-leg-node.js'
 import { JSONOperatorChainNode } from './json-operator-chain-node.js'
 import { TupleNode } from './tuple-node.js'
+import { MergeQueryNode } from './merge-query-node.js'
+import { MatchedNode } from './matched-node.js'
 import { AddIndexNode } from './add-index-node.js'
 
 /**
@@ -209,6 +211,8 @@ export class OperationNodeTransformer {
     JSONPathLegNode: this.transformJSONPathLeg.bind(this),
     JSONOperatorChainNode: this.transformJSONOperatorChain.bind(this),
     TupleNode: this.transformTuple.bind(this),
+    MergeQueryNode: this.transformMergeQuery.bind(this),
+    MatchedNode: this.transformMatched.bind(this),
     AddIndexNode: this.transformAddIndex.bind(this),
   })
 
@@ -982,6 +986,24 @@ export class OperationNodeTransformer {
     })
   }
 
+  protected transformMergeQuery(node: MergeQueryNode): MergeQueryNode {
+    return requireAllProps<MergeQueryNode>({
+      kind: 'MergeQueryNode',
+      into: this.transformNode(node.into),
+      using: this.transformNode(node.using),
+      whens: this.transformNodeList(node.whens),
+      with: this.transformNode(node.with),
+    })
+  }
+
+  protected transformMatched(node: MatchedNode): MatchedNode {
+    return requireAllProps<MatchedNode>({
+      kind: 'MatchedNode',
+      not: node.not,
+      bySource: node.bySource,
+    })
+  }
+
   protected transformAddIndex(node: AddIndexNode): AddIndexNode {
     return requireAllProps<AddIndexNode>({
       kind: 'AddIndexNode',

src/operation-node/operation-node-visitor.ts

@@ -89,6 +89,8 @@ import { JSONPathNode } from './json-path-node.js'
 import { JSONPathLegNode } from './json-path-leg-node.js'
 import { JSONOperatorChainNode } from './json-operator-chain-node.js'
 import { TupleNode } from './tuple-node.js'
+import { MergeQueryNode } from './merge-query-node.js'
+import { MatchedNode } from './matched-node.js'
 import { AddIndexNode } from './add-index-node.js'
 
 export abstract class OperationNodeVisitor {
@@ -186,6 +188,8 @@ export abstract class OperationNodeVisitor {
     JSONPathLegNode: this.visitJSONPathLeg.bind(this),
     JSONOperatorChainNode: this.visitJSONOperatorChain.bind(this),
     TupleNode: this.visitTuple.bind(this),
+    MergeQueryNode: this.visitMergeQuery.bind(this),
+    MatchedNode: this.visitMatched.bind(this),
     AddIndexNode: this.visitAddIndex.bind(this),
   })
 
@@ -291,5 +295,7 @@ export abstract class OperationNodeVisitor {
   protected abstract visitJSONPathLeg(node: JSONPathLegNode): void
   protected abstract visitJSONOperatorChain(node: JSONOperatorChainNode): void
   protected abstract visitTuple(node: TupleNode): void
+  protected abstract visitMergeQuery(node: MergeQueryNode): void
+  protected abstract visitMatched(node: MatchedNode): void
   protected abstract visitAddIndex(node: AddIndexNode): void
 }

src/operation-node/operation-node.ts

@@ -85,6 +85,8 @@ export type OperationNodeKind =
   | 'JSONPathLegNode'
   | 'JSONOperatorChainNode'
   | 'TupleNode'
+  | 'MergeQueryNode'
+  | 'MatchedNode'
   | 'AddIndexNode'
 
 export interface OperationNode {

src/operation-node/query-node.ts

@@ -11,12 +11,14 @@ import { OperationNode } from './operation-node.js'
 import { ExplainNode } from './explain-node.js'
 import { ExplainFormat } from '../util/explainable.js'
 import { Expression } from '../expression/expression.js'
+import { MergeQueryNode } from './merge-query-node.js'
 
 export type QueryNode =
   | SelectQueryNode
   | InsertQueryNode
   | UpdateQueryNode
   | DeleteQueryNode
+  | MergeQueryNode
 
 type HasJoins = { joins?: ReadonlyArray<JoinNode> }
 type HasWhere = { where?: WhereNode }
@@ -32,7 +34,8 @@ export const QueryNode = freeze({
       SelectQueryNode.is(node) ||
       InsertQueryNode.is(node) ||
       UpdateQueryNode.is(node) ||
-      DeleteQueryNode.is(node)
+      DeleteQueryNode.is(node) ||
+      MergeQueryNode.is(node)
     )
   },
 

src/operation-node/schemable-identifier-node.ts

@@ -25,7 +25,7 @@ export const SchemableIdentifierNode = freeze({
 
   createWithSchema(
     schema: string,
-    identifier: string
+    identifier: string,
   ): SchemableIdentifierNode {
     return freeze({
       kind: 'SchemableIdentifierNode',

src/operation-node/update-query-node.ts

@@ -14,7 +14,7 @@ export type UpdateValuesNode = ValueListNode | PrimitiveValueListNode
 
 export interface UpdateQueryNode extends OperationNode {
   readonly kind: 'UpdateQueryNode'
-  readonly table: OperationNode
+  readonly table?: OperationNode
   readonly from?: FromNode
   readonly joins?: ReadonlyArray<JoinNode>
   readonly where?: WhereNode
@@ -40,6 +40,12 @@ export const UpdateQueryNode = freeze({
     })
   },
 
+  createWithoutTable(): UpdateQueryNode {
+    return freeze({
+      kind: 'UpdateQueryNode',
+    })
+  },
+
   cloneWithFromItems(
     updateQuery: UpdateQueryNode,
     fromItems: ReadonlyArray<OperationNode>

src/parser/binary-operation-parser.ts

@@ -36,6 +36,8 @@ import { SelectType } from '../util/column-type.js'
 import { AndNode } from '../operation-node/and-node.js'
 import { ParensNode } from '../operation-node/parens-node.js'
 import { OrNode } from '../operation-node/or-node.js'
+import { WhenNode } from '../operation-node/when-node.js'
+import { RawNode } from '../operation-node/raw-node.js'
 
 export type OperandValueExpression<
   DB,
@@ -128,7 +130,8 @@ export function parseFilterObject(
 
 export function parseFilterList(
   list: ReadonlyArray<OperationNodeSource | OperationNode>,
-  combinator: 'and' | 'or'
+  combinator: 'and' | 'or',
+  withParens = true
 ): OperationNode {
   const combine = combinator === 'and' ? AndNode.create : OrNode.create
 
@@ -146,7 +149,7 @@ export function parseFilterList(
     node = combine(node, toOperationNode(list[i]))
   }
 
-  if (list.length > 1) {
+  if (list.length > 1 && withParens) {
     return ParensNode.create(node)
   }
 

src/parser/insert-values-parser.ts

@@ -37,16 +37,20 @@ export type InsertObjectOrList<DB, TB extends keyof DB> =
   | InsertObject<DB, TB>
   | ReadonlyArray<InsertObject<DB, TB>>
 
-export type InsertObjectOrListFactory<DB, TB extends keyof DB> = (
-  eb: ExpressionBuilder<DB, TB>
-) => InsertObjectOrList<DB, TB>
-
-export type InsertExpression<DB, TB extends keyof DB> =
-  | InsertObjectOrList<DB, TB>
-  | InsertObjectOrListFactory<DB, TB>
+export type InsertObjectOrListFactory<
+  DB,
+  TB extends keyof DB,
+  UT extends keyof DB = never
+> = (eb: ExpressionBuilder<DB, TB | UT>) => InsertObjectOrList<DB, TB>
+
+export type InsertExpression<
+  DB,
+  TB extends keyof DB,
+  UT extends keyof DB = never
+> = InsertObjectOrList<DB, TB> | InsertObjectOrListFactory<DB, TB, UT>
 
 export function parseInsertExpression(
-  arg: InsertExpression<any, any>
+  arg: InsertExpression<any, any, any>
 ): [ReadonlyArray<ColumnNode>, ValuesNode] {
   const objectOrList = isFunction(arg) ? arg(expressionBuilder()) : arg
   const list = isReadonlyArray(objectOrList)