kysely 0.27.6 → 0.28.1

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

@@ -15,7 +15,7 @@ import { QueryId } from '../util/query-id.js';
 import { UpdateResult } from './update-result.js';
 import { KyselyPlugin } from '../plugin/kysely-plugin.js';
 import { WhereInterface } from './where-interface.js';
-import { ReturningInterface } from './returning-interface.js';
+import { MultiTableReturningInterface } from './returning-interface.js';
 import { NoResultErrorConstructor } from './no-result-error.js';
 import { Explainable, ExplainFormat } from '../util/explainable.js';
 import { AliasedExpression, Expression } from '../expression/expression.js';
@@ -25,7 +25,9 @@ import { Streamable } from '../util/streamable.js';
 import { ExpressionOrFactory } from '../parser/expression-parser.js';
 import { ValueExpression } from '../parser/value-parser.js';
 import { OutputCallback, OutputExpression, OutputInterface, OutputPrefix, SelectExpressionFromOutputCallback, SelectExpressionFromOutputExpression } from './output-interface.js';
-export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, ReturningInterface<DB, TB, O>, OutputInterface<DB, TB, O>, OperationNodeSource, Compilable<O>, Explainable, Streamable<O> {
+import { OrderByInterface } from './order-by-interface.js';
+import { DirectedOrderByStringReference, OrderByExpression, OrderByModifiers } from '../parser/order-by-parser.js';
+export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, MultiTableReturningInterface<DB, TB, O>, OutputInterface<DB, TB, O>, OrderByInterface<DB, TB, never>, OperationNodeSource, Compilable<O>, Explainable, Streamable<O> {
     #private;
     constructor(props: UpdateQueryBuilderProps);
     /**
@@ -599,6 +601,50 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
      */
     fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilderWithFullJoin<DB, UT, TB, O, TE>;
     fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilderWithFullJoin<DB, UT, TB, O, TE>;
+    /**
+     * @description This is only supported by some dialects like MySQL or SQLite with `SQLITE_ENABLE_UPDATE_DELETE_LIMIT`.
+     */
+    orderBy<OE extends OrderByExpression<DB, TB, {}>>(expr: OE, modifiers?: OrderByModifiers): UpdateQueryBuilder<DB, UT, TB, O>;
+    /**
+     * @description This is only supported by some dialects like MySQL or SQLite with `SQLITE_ENABLE_UPDATE_DELETE_LIMIT`.
+     * @deprecated It does ~2-2.6x more compile-time instantiations compared to multiple chained `orderBy(expr, modifiers?)` calls (in `order by` clauses with reasonable item counts), and has broken autocompletion.
+     */
+    orderBy<OE extends OrderByExpression<DB, TB, {}> | DirectedOrderByStringReference<DB, TB, {}>>(exprs: ReadonlyArray<OE>): UpdateQueryBuilder<DB, UT, TB, O>;
+    /**
+     * @description This is only supported by some dialects like MySQL or SQLite with `SQLITE_ENABLE_UPDATE_DELETE_LIMIT`.
+     * @deprecated It does ~2.9x more compile-time instantiations compared to a `orderBy(expr, direction)` call.
+     */
+    orderBy<OE extends DirectedOrderByStringReference<DB, TB, {}>>(expr: OE): UpdateQueryBuilder<DB, UT, TB, O>;
+    /**
+     * @description This is only supported by some dialects like MySQL or SQLite with `SQLITE_ENABLE_UPDATE_DELETE_LIMIT`.
+     * @deprecated Use `orderBy(expr, (ob) => ...)` instead.
+     */
+    orderBy<OE extends OrderByExpression<DB, TB, {}>>(expr: OE, modifiers: Expression<any>): UpdateQueryBuilder<DB, UT, TB, O>;
+    /**
+     * Clears the `order by` clause from the query.
+     *
+     * See {@link orderBy} for adding an `order by` clause or item to a query.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * const query = db
+     *   .selectFrom('person')
+     *   .selectAll()
+     *   .orderBy('id', 'desc')
+     *
+     * const results = await query
+     *   .clearOrderBy()
+     *   .execute()
+     * ```
+     *
+     * The generated SQL (PostgreSQL):
+     *
+     * ```sql
+     * select * from "person"
+     * ```
+     */
+    clearOrderBy(): UpdateQueryBuilder<DB, UT, TB, O>;
     /**
      * Adds a limit clause to the update query for supported databases, such as MySQL.
      *
@@ -651,8 +697,6 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
      *   })
      *   .where('id', '=', 1)
      *   .executeTakeFirst()
-     *
-     * console.log(result.numUpdatedRows)
      * ```
      *
      * The generated SQL (PostgreSQL):
@@ -676,8 +720,6 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
      *   }))
      *   .where('id', '=', 1)
      *   .executeTakeFirst()
-     *
-     * console.log(result.numUpdatedRows)
      * ```
      *
      * The generated SQL (PostgreSQL):
@@ -762,6 +804,43 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
      * "last_name" = $3 || $4
      * where "id" = $5
      * ```
+     *
+     * <!-- siteExample("update", "MySQL joins", 30) -->
+     *
+     * MySQL allows you to join tables directly to the "main" table and update
+     * rows of all joined tables. This is possible by passing all tables to the
+     * `updateTable` method as a list and adding the `ON` conditions as `WHERE`
+     * statements. You can then use the `set(column, value)` variant to update
+     * columns using table qualified names.
+     *
+     * The `UpdateQueryBuilder` also has `innerJoin` etc. join methods, but those
+     * can only be used as part of a PostgreSQL `update set from join` query.
+     * Due to type complexity issues, we unfortunately can't make the same
+     * methods work in both cases.
+     *
+     * ```ts
+     * const result = await db
+     *   .updateTable(['person', 'pet'])
+     *   .set('person.first_name', 'Updated person')
+     *   .set('pet.name', 'Updated doggo')
+     *   .whereRef('person.id', '=', 'pet.owner_id')
+     *   .where('person.id', '=', 1)
+     *   .executeTakeFirst()
+     * ```
+     *
+     * The generated SQL (MySQL):
+     *
+     * ```sql
+     * update
+     *   `person`,
+     *   `pet`
+     * set
+     *   `person`.`first_name` = ?,
+     *   `pet`.`name` = ?
+     * where
+     *   `person`.`id` = `pet`.`owner_id`
+     *   and `person`.`id` = ?
+     * ```
      */
     set(update: UpdateObjectExpression<DB, TB, UT>): UpdateQueryBuilder<DB, UT, TB, O>;
     set<RE extends ReferenceExpression<DB, UT>>(key: RE, value: ValueExpression<DB, TB, ExtractUpdateTypeFromReferenceExpression<DB, UT, RE>>): UpdateQueryBuilder<DB, UT, TB, O>;
@@ -769,7 +848,7 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
      * Allows you to return data from modified rows.
      *
      * On supported databases like PostgreSQL, this method can be chained to
-     * `insert`, `update` and `delete` queries to return data.
+     * `insert`, `update`, `delete` and `merge` queries to return data.
      *
      * Note that on SQLite you need to give aliases for the expressions to avoid
      * [this bug](https://sqlite.org/forum/forumpost/033daf0b32) in SQLite.
@@ -828,8 +907,8 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
     returning<CB extends SelectCallback<DB, TB>>(callback: CB): UpdateQueryBuilder<DB, UT, TB, ReturningCallbackRow<DB, TB, O, CB>>;
     returning<SE extends SelectExpression<DB, TB>>(selection: SE): UpdateQueryBuilder<DB, UT, TB, ReturningRow<DB, TB, O, SE>>;
     /**
-     * Adds a `returning *` to an insert/update/delete query on databases
-     * that support `returning` such as PostgreSQL.
+     * Adds a `returning *` or `returning table.*` to an insert/update/delete/merge
+     * query on databases that support `returning` such as PostgreSQL.
      *
      * Also see the {@link returning} method.
      */

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

@@ -7,7 +7,6 @@ const select_parser_js_1 = require("../parser/select-parser.js");
 const query_node_js_1 = require("../operation-node/query-node.js");
 const update_query_node_js_1 = require("../operation-node/update-query-node.js");
 const update_set_parser_js_1 = require("../parser/update-set-parser.js");
-const prevent_await_js_1 = require("../util/prevent-await.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 const update_result_js_1 = require("./update-result.js");
 const no_result_error_js_1 = require("./no-result-error.js");
@@ -15,6 +14,7 @@ const binary_operation_parser_js_1 = require("../parser/binary-operation-parser.
 const value_parser_js_1 = require("../parser/value-parser.js");
 const limit_node_js_1 = require("../operation-node/limit-node.js");
 const top_parser_js_1 = require("../parser/top-parser.js");
+const order_by_parser_js_1 = require("../parser/order-by-parser.js");
 class UpdateQueryBuilder {
     #props;
     constructor(props) {
@@ -90,27 +90,33 @@ class UpdateQueryBuilder {
         });
     }
     innerJoin(...args) {
-        return new UpdateQueryBuilder({
-            ...this.#props,
-            queryNode: query_node_js_1.QueryNode.cloneWithJoin(this.#props.queryNode, (0, join_parser_js_1.parseJoin)('InnerJoin', args)),
-        });
+        return this.#join('InnerJoin', args);
     }
     leftJoin(...args) {
+        return this.#join('LeftJoin', args);
+    }
+    rightJoin(...args) {
+        return this.#join('RightJoin', args);
+    }
+    fullJoin(...args) {
+        return this.#join('FullJoin', args);
+    }
+    #join(joinType, args) {
         return new UpdateQueryBuilder({
             ...this.#props,
-            queryNode: query_node_js_1.QueryNode.cloneWithJoin(this.#props.queryNode, (0, join_parser_js_1.parseJoin)('LeftJoin', args)),
+            queryNode: query_node_js_1.QueryNode.cloneWithJoin(this.#props.queryNode, (0, join_parser_js_1.parseJoin)(joinType, args)),
         });
     }
-    rightJoin(...args) {
+    orderBy(...args) {
         return new UpdateQueryBuilder({
             ...this.#props,
-            queryNode: query_node_js_1.QueryNode.cloneWithJoin(this.#props.queryNode, (0, join_parser_js_1.parseJoin)('RightJoin', args)),
+            queryNode: query_node_js_1.QueryNode.cloneWithOrderByItems(this.#props.queryNode, (0, order_by_parser_js_1.parseOrderBy)(args)),
         });
     }
-    fullJoin(...args) {
+    clearOrderBy() {
         return new UpdateQueryBuilder({
             ...this.#props,
-            queryNode: query_node_js_1.QueryNode.cloneWithJoin(this.#props.queryNode, (0, join_parser_js_1.parseJoin)('FullJoin', args)),
+            queryNode: query_node_js_1.QueryNode.cloneWithoutOrderBy(this.#props.queryNode),
         });
     }
     /**
@@ -460,10 +466,7 @@ class UpdateQueryBuilder {
             return result.rows;
         }
         return [
-            new update_result_js_1.UpdateResult(
-            // TODO: remove numUpdatedOrDeletedRows.
-            // TODO: https://github.com/kysely-org/kysely/pull/431#discussion_r1172330899
-            result.numAffectedRows ?? result.numUpdatedOrDeletedRows ?? BigInt(0), result.numChangedRows),
+            new update_result_js_1.UpdateResult(result.numAffectedRows ?? BigInt(0), result.numChangedRows),
         ];
     }
     /**
@@ -508,4 +511,3 @@ class UpdateQueryBuilder {
     }
 }
 exports.UpdateQueryBuilder = UpdateQueryBuilder;
-(0, prevent_await_js_1.preventAwait)(UpdateQueryBuilder, "don't await UpdateQueryBuilder instances directly. To execute the query you need to call `execute` or `executeTakeFirst`.");

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

@@ -1,6 +1,8 @@
+import { QueryId } from '../util/query-id.js';
 import { RootOperationNode } from './query-compiler.js';
 export interface CompiledQuery<O = unknown> {
     readonly query: RootOperationNode;
+    readonly queryId: QueryId;
     readonly sql: string;
     readonly parameters: ReadonlyArray<unknown>;
 }

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

@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompiledQuery = void 0;
 const raw_node_js_1 = require("../operation-node/raw-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
+const query_id_js_1 = require("../util/query-id.js");
 exports.CompiledQuery = (0, object_utils_js_1.freeze)({
     raw(sql, parameters = []) {
         return (0, object_utils_js_1.freeze)({
             sql,
             query: raw_node_js_1.RawNode.createWithSql(sql),
             parameters: (0, object_utils_js_1.freeze)(parameters),
+            queryId: (0, query_id_js_1.createQueryId)(),
         });
     },
 });

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

@@ -35,7 +35,7 @@ import { SelectAllNode } from '../operation-node/select-all-node.js';
 import { SelectQueryNode } from '../operation-node/select-query-node.js';
 import { SelectionNode } from '../operation-node/selection-node.js';
 import { TableNode } from '../operation-node/table-node.js';
-import { PrimaryKeyConstraintNode } from '../operation-node/primary-constraint-node.js';
+import { PrimaryKeyConstraintNode } from '../operation-node/primary-key-constraint-node.js';
 import { UniqueConstraintNode } from '../operation-node/unique-constraint-node.js';
 import { UpdateQueryNode } from '../operation-node/update-query-node.js';
 import { ValueListNode } from '../operation-node/value-list-node.js';
@@ -95,10 +95,15 @@ import { CastNode } from '../operation-node/cast-node.js';
 import { FetchNode } from '../operation-node/fetch-node.js';
 import { TopNode } from '../operation-node/top-node.js';
 import { OutputNode } from '../operation-node/output-node.js';
+import { RefreshMaterializedViewNode } from '../operation-node/refresh-materialized-view-node.js';
+import { OrActionNode } from '../operation-node/or-action-node.js';
+import { CollateNode } from '../operation-node/collate-node.js';
+import { QueryId } from '../util/query-id.js';
+import { RenameConstraintNode } from '../operation-node/rename-constraint-node.js';
 export declare class DefaultQueryCompiler extends OperationNodeVisitor implements QueryCompiler {
     #private;
     protected get numParameters(): number;
-    compileQuery(node: RootOperationNode): CompiledQuery;
+    compileQuery(node: RootOperationNode, queryId: QueryId): CompiledQuery;
     protected getSql(): string;
     protected visitSelectQuery(node: SelectQueryNode): void;
     protected visitFrom(node: FromNode): void;
@@ -151,6 +156,10 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected visitCreateSchema(node: CreateSchemaNode): void;
     protected visitDropSchema(node: DropSchemaNode): void;
     protected visitPrimaryKeyConstraint(node: PrimaryKeyConstraintNode): void;
+    protected buildDeferrable(node: {
+        deferrable?: boolean;
+        initiallyDeferred?: boolean;
+    }): void;
     protected visitUniqueConstraint(node: UniqueConstraintNode): void;
     protected visitCheckConstraint(node: CheckConstraintNode): void;
     protected visitForeignKeyConstraint(node: ForeignKeyConstraintNode): void;
@@ -166,8 +175,10 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected visitModifyColumn(node: ModifyColumnNode): void;
     protected visitAddConstraint(node: AddConstraintNode): void;
     protected visitDropConstraint(node: DropConstraintNode): void;
+    protected visitRenameConstraint(node: RenameConstraintNode): void;
     protected visitSetOperation(node: SetOperationNode): void;
     protected visitCreateView(node: CreateViewNode): void;
+    protected visitRefreshMaterializedView(node: RefreshMaterializedViewNode): void;
     protected visitDropView(node: DropViewNode): void;
     protected visitGenerated(node: GeneratedNode): void;
     protected visitDefaultValue(node: DefaultValueNode): void;
@@ -198,6 +209,8 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected visitFetch(node: FetchNode): void;
     protected visitOutput(node: OutputNode): void;
     protected visitTop(node: TopNode): void;
+    protected visitOrAction(node: OrActionNode): void;
+    protected visitCollate(node: CollateNode): void;
     protected append(str: string): void;
     protected appendValue(parameter: unknown): void;
     protected getLeftIdentifierWrapper(): string;
@@ -208,8 +221,10 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected getExplainOptionsDelimiter(): string;
     protected getRightExplainOptionsWrapper(): string;
     protected sanitizeIdentifier(identifier: string): string;
+    protected sanitizeStringLiteral(value: string): string;
     protected addParameter(parameter: unknown): void;
     protected appendImmediateValue(value: unknown): void;
+    protected appendStringLiteral(value: string): void;
     protected sortSelectModifiers(arr: SelectModifierNode[]): ReadonlyArray<SelectModifierNode>;
     protected compileColumnAlterations(columnAlterations: readonly AlterTableColumnAlterationNode[]): void;
     /**

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

@@ -11,19 +11,22 @@ const object_utils_js_1 = require("../util/object-utils.js");
 const create_view_node_js_1 = require("../operation-node/create-view-node.js");
 const set_operation_node_js_1 = require("../operation-node/set-operation-node.js");
 const merge_query_node_js_1 = require("../operation-node/merge-query-node.js");
+const log_once_js_1 = require("../util/log-once.js");
+const LIT_WRAP_REGEX = /'/g;
 class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisitor {
     #sql = '';
     #parameters = [];
     get numParameters() {
         return this.#parameters.length;
     }
-    compileQuery(node) {
+    compileQuery(node, queryId) {
         this.#sql = '';
         this.#parameters = [];
         this.nodeStack.splice(0, this.nodeStack.length);
         this.visitNode(node);
         return (0, object_utils_js_1.freeze)({
             query: node,
+            queryId,
             sql: this.getSql(),
             parameters: [...this.#parameters],
         });
@@ -161,9 +164,15 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' ');
         }
         this.append(node.replace ? 'replace' : 'insert');
+        // TODO: remove in 0.29.
         if (node.ignore) {
+            (0, log_once_js_1.logOnce)('`InsertQueryNode.ignore` is deprecated. Use `InsertQueryNode.orAction` instead.');
             this.append(' ignore');
         }
+        if (node.orAction) {
+            this.append(' ');
+            this.visitNode(node.orAction);
+        }
         if (node.top) {
             this.append(' ');
             this.visitNode(node.top);
@@ -500,10 +509,18 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     }
     visitOrderByItem(node) {
         this.visitNode(node.orderBy);
+        if (node.collation) {
+            this.append(' ');
+            this.visitNode(node.collation);
+        }
         if (node.direction) {
             this.append(' ');
             this.visitNode(node.direction);
         }
+        if (node.nulls) {
+            this.append(' nulls ');
+            this.append(node.nulls);
+        }
     }
     visitGroupBy(node) {
         this.append('group by ');
@@ -548,6 +565,9 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.visitNode(node.from);
         }
         if (node.joins) {
+            if (!node.from) {
+                throw new Error("Joins in an update query are only supported as a part of a PostgreSQL 'update set from join' query. If you want to create a MySQL 'update join set' query, see https://kysely.dev/docs/examples/update/my-sql-joins");
+            }
             this.append(' ');
             this.compileList(node.joins, ' ');
         }
@@ -555,6 +575,10 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' ');
             this.visitNode(node.where);
         }
+        if (node.orderBy) {
+            this.append(' ');
+            this.visitNode(node.orderBy);
+        }
         if (node.limit) {
             this.append(' ');
             this.visitNode(node.limit);
@@ -691,6 +715,25 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         this.append('primary key (');
         this.compileList(node.columns);
         this.append(')');
+        this.buildDeferrable(node);
+    }
+    buildDeferrable(node) {
+        if (node.deferrable !== undefined) {
+            if (node.deferrable) {
+                this.append(' deferrable');
+            }
+            else {
+                this.append(' not deferrable');
+            }
+        }
+        if (node.initiallyDeferred !== undefined) {
+            if (node.initiallyDeferred) {
+                this.append(' initially deferred');
+            }
+            else {
+                this.append(' initially immediate');
+            }
+        }
     }
     visitUniqueConstraint(node) {
         if (node.name) {
@@ -705,6 +748,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         this.append(' (');
         this.compileList(node.columns);
         this.append(')');
+        this.buildDeferrable(node);
     }
     visitCheckConstraint(node) {
         if (node.name) {
@@ -734,6 +778,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' on update ');
             this.append(node.onUpdate);
         }
+        this.buildDeferrable(node);
     }
     visitList(node) {
         this.compileList(node.items);
@@ -782,6 +827,9 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         if (node.dropConstraint) {
             this.visitNode(node.dropConstraint);
         }
+        if (node.renameConstraint) {
+            this.visitNode(node.renameConstraint);
+        }
         if (node.columnAlterations) {
             this.compileColumnAlterations(node.columnAlterations);
         }
@@ -855,6 +903,12 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' restrict');
         }
     }
+    visitRenameConstraint(node) {
+        this.append('rename constraint ');
+        this.visitNode(node.oldName);
+        this.append(' to ');
+        this.visitNode(node.newName);
+    }
     visitSetOperation(node) {
         this.append(node.operator);
         this.append(' ');
@@ -890,6 +944,19 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.visitNode(node.as);
         }
     }
+    visitRefreshMaterializedView(node) {
+        this.append('refresh materialized view ');
+        if (node.concurrently) {
+            this.append('concurrently ');
+        }
+        this.visitNode(node.name);
+        if (node.withNoData) {
+            this.append(' with no data');
+        }
+        else {
+            this.append(' with data');
+        }
+    }
     visitDropView(node) {
         this.append('drop ');
         if (node.materialized) {
@@ -990,6 +1057,11 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.visitNode(node.orderBy);
         }
         this.append(')');
+        if (node.withinGroup) {
+            this.append(' within group (');
+            this.visitNode(node.withinGroup);
+            this.append(')');
+        }
         if (node.filter) {
             this.append(' filter(');
             this.visitNode(node.filter);
@@ -1127,6 +1199,10 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' ');
             this.compileList(node.whens, ' ');
         }
+        if (node.returning) {
+            this.append(' ');
+            this.visitNode(node.returning);
+        }
         if (node.output) {
             this.append(' ');
             this.visitNode(node.output);
@@ -1184,6 +1260,13 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(` ${node.modifiers}`);
         }
     }
+    visitOrAction(node) {
+        this.append(node.action);
+    }
+    visitCollate(node) {
+        this.append('collate ');
+        this.visitNode(node.collation);
+    }
     append(str) {
         this.#sql += str;
     }
@@ -1227,12 +1310,15 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         }
         return sanitized;
     }
+    sanitizeStringLiteral(value) {
+        return value.replace(LIT_WRAP_REGEX, "''");
+    }
     addParameter(parameter) {
         this.#parameters.push(parameter);
     }
     appendImmediateValue(value) {
         if ((0, object_utils_js_1.isString)(value)) {
-            this.append(`'${value}'`);
+            this.appendStringLiteral(value);
         }
         else if ((0, object_utils_js_1.isNumber)(value) || (0, object_utils_js_1.isBoolean)(value)) {
             this.append(value.toString());
@@ -1250,6 +1336,11 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             throw new Error(`invalid immediate value ${value}`);
         }
     }
+    appendStringLiteral(value) {
+        this.append("'");
+        this.append(this.sanitizeStringLiteral(value));
+        this.append("'");
+    }
     sortSelectModifiers(arr) {
         arr.sort((left, right) => left.modifier && right.modifier
             ? SELECT_MODIFIER_PRIORITY[left.modifier] -
@@ -1292,7 +1383,11 @@ const JOIN_TYPE_SQL = (0, object_utils_js_1.freeze)({
     LeftJoin: 'left join',
     RightJoin: 'right join',
     FullJoin: 'full join',
+    CrossJoin: 'cross join',
     LateralInnerJoin: 'inner join lateral',
     LateralLeftJoin: 'left join lateral',
+    LateralCrossJoin: 'cross join lateral',
+    OuterApply: 'outer apply',
+    CrossApply: 'cross apply',
     Using: 'using',
 });

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

@@ -12,11 +12,13 @@ import { DropViewNode } from '../operation-node/drop-view-node.js';
 import { MergeQueryNode } from '../operation-node/merge-query-node.js';
 import { QueryNode } from '../operation-node/query-node.js';
 import { RawNode } from '../operation-node/raw-node.js';
+import { RefreshMaterializedViewNode } from '../operation-node/refresh-materialized-view-node.js';
+import { QueryId } from '../util/query-id.js';
 import { CompiledQuery } from './compiled-query.js';
-export type RootOperationNode = QueryNode | CreateTableNode | CreateIndexNode | CreateSchemaNode | CreateViewNode | DropTableNode | DropIndexNode | DropSchemaNode | DropViewNode | AlterTableNode | RawNode | CreateTypeNode | DropTypeNode | MergeQueryNode;
+export type RootOperationNode = QueryNode | CreateTableNode | CreateIndexNode | CreateSchemaNode | CreateViewNode | RefreshMaterializedViewNode | DropTableNode | DropIndexNode | DropSchemaNode | DropViewNode | AlterTableNode | RawNode | CreateTypeNode | DropTypeNode | MergeQueryNode;
 /**
  * a `QueryCompiler` compiles a query expressed as a tree of `OperationNodes` into SQL.
  */
 export interface QueryCompiler {
-    compileQuery(node: RootOperationNode): CompiledQuery;
+    compileQuery(node: RootOperationNode, queryId: QueryId): CompiledQuery;
 }