add update from queries

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kysely",
-  "version": "0.17.3",
+  "version": "0.18.0",
   "description": "Type safe SQL query builder",
   "repository": {
     "type": "git",

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

@@ -439,6 +439,7 @@ export class OperationNodeTransformer {
     return {
       kind: 'UpdateQueryNode',
       table: this.transformNode(node.table),
+      from: this.transformNode(node.from),
       joins: this.transformNodeList(node.joins),
       where: this.transformNode(node.where),
       updates: this.transformNodeList(node.updates),

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

@@ -8,12 +8,14 @@ import { ReturningNode } from './returning-node.js'
 import { ValueListNode } from './value-list-node.js'
 import { WhereNode } from './where-node.js'
 import { WithNode } from './with-node.js'
+import { FromNode } from './from-node.js'
 
 export type UpdateValuesNode = ValueListNode | PrimitiveValueListNode
 
 export interface UpdateQueryNode extends OperationNode {
   readonly kind: 'UpdateQueryNode'
   readonly table: TableExpressionNode
+  readonly from?: FromNode
   readonly joins?: ReadonlyArray<JoinNode>
   readonly where?: WhereNode
   readonly updates?: ReadonlyArray<ColumnUpdateNode>
@@ -30,11 +32,23 @@ export const UpdateQueryNode = freeze({
   },
 
   create(table: TableExpressionNode, withNode?: WithNode): UpdateQueryNode {
-    return {
+    return freeze({
       kind: 'UpdateQueryNode',
       table,
       ...(withNode && { with: withNode }),
-    }
+    })
+  },
+
+  cloneWithFromItems(
+    updateQuery: UpdateQueryNode,
+    fromItems: ReadonlyArray<TableExpressionNode>
+  ): UpdateQueryNode {
+    return freeze({
+      ...updateQuery,
+      from: updateQuery.from
+        ? FromNode.cloneWithFroms(updateQuery.from, fromItems)
+        : FromNode.create(fromItems),
+    })
   },
 
   cloneWithUpdates(

src/parser/update-set-parser.ts

@@ -3,12 +3,12 @@ import { ColumnUpdateNode } from '../operation-node/column-update-node.js'
 import { UpdateKeys, UpdateType } from '../util/column-type.js'
 import { parseValueExpression, ValueExpression } from './value-parser.js'
 
-export type MutationObject<DB, TB extends keyof DB> = {
-  [C in UpdateKeys<DB[TB]>]?: ValueExpression<DB, TB, UpdateType<DB[TB][C]>>
+export type MutationObject<DB, TB extends keyof DB, TM extends keyof DB> = {
+  [C in UpdateKeys<DB[TM]>]?: ValueExpression<DB, TB, UpdateType<DB[TM][C]>>
 }
 
 export function parseUpdateObject(
-  row: MutationObject<any, any>
+  row: MutationObject<any, any, any>
 ): ReadonlyArray<ColumnUpdateNode> {
   return Object.entries(row)
     .filter(([_, value]) => value !== undefined)

src/parser/with-parser.ts

@@ -38,7 +38,7 @@ export type QueryCreatorWithCommonTableExpression<
 type CommonTableExpressionOutput<DB, CN extends string> =
   | SelectQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>>
   | InsertQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>>
-  | UpdateQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>>
+  | UpdateQueryBuilder<DB, any, any, ExtractRowFromCommonTableExpressionName<CN>>
   | DeleteQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>>
   | RawBuilder<ExtractRowFromCommonTableExpressionName<CN>>
 
@@ -55,7 +55,7 @@ type ExtractRowFromCommonTableExpression<CTE> = CTE extends (
     ? QO
     : Q extends InsertQueryBuilder<any, any, infer QO>
     ? QO
-    : Q extends UpdateQueryBuilder<any, any, infer QO>
+    : Q extends UpdateQueryBuilder<any, any, any, infer QO>
     ? QO
     : Q extends DeleteQueryBuilder<any, any, infer QO>
     ? QO

src/query-builder/insert-query-builder.ts

@@ -475,7 +475,7 @@ export class InsertQueryBuilder<DB, TB extends keyof DB, O>
    * ```
    */
   onDuplicateKeyUpdate(
-    updates: MutationObject<DB, TB>
+    updates: MutationObject<DB, TB, TB>
   ): InsertQueryBuilder<DB, TB, O> {
     return new InsertQueryBuilder({
       ...this.#props,

src/query-builder/on-conflict-builder.ts

@@ -305,7 +305,11 @@ export class OnConflictBuilder<DB, TB extends keyof DB>
    * ```
    */
   doUpdateSet(
-    updates: MutationObject<OnConflictDatabase<DB, TB>, OnConflictTables<TB>>
+    updates: MutationObject<
+      OnConflictDatabase<DB, TB>,
+      OnConflictTables<TB>,
+      OnConflictTables<TB>
+    >
   ): OnConflictUpdateBuilder<OnConflictDatabase<DB, TB>, OnConflictTables<TB>> {
     return new OnConflictUpdateBuilder({
       ...this.#props,