kysely 0.9.8 → 0.11.0

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

@@ -21,6 +21,9 @@ 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");
+const insert_result_js_1 = require("./insert-result.js");
+const update_result_js_1 = require("./update-result.js");
+const delete_result_js_1 = require("./delete-result.js");
 /**
  * The main query builder class.
  *
@@ -65,7 +68,7 @@ class QueryBuilder {
      *   .whereRef('person.first_name', '=', 'pet.name')
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select * from "person", "pet" where "person"."first_name" = "pet"."name"
@@ -88,7 +91,7 @@ class QueryBuilder {
      *   .execute()
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select "person".*, (
@@ -147,7 +150,7 @@ class QueryBuilder {
      *   .execute()
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select * from "person"
@@ -173,7 +176,7 @@ class QueryBuilder {
      *   )
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select * from "person"
@@ -327,7 +330,7 @@ class QueryBuilder {
      *   .execute()
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select distinct "first_name" from "person"
@@ -526,15 +529,15 @@ class QueryBuilder {
      * values to update. In addition to the column's type, the values can be `raw`
      * instances or select queries.
      *
-     * The return value is the number of affected rows. You can use the
-     * {@link QueryBuilder.returning | returning} method on supported databases
-     * to get out the updated rows.
+     * The return value of an update query is an instance of {@link UpdateResult}.
+     * You can use the {@link QueryBuilder.returning | returning} method on
+     * supported databases to get out the updated rows.
      *
      * @example
      * Update a row in `person` table:
      *
      * ```ts
-     * const numAffectedRows = await db
+     * const result = await db
      *   .updateTable('person')
      *   .set({
      *     first_name: 'Jennifer',
@@ -542,9 +545,11 @@ class QueryBuilder {
      *   })
      *   .where('id', '=', 1)
      *   .executeTakeFirst()
+     *
+     * console.log(result.numUpdatedRows)
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * update "person" set "first_name" = $1, "last_name" = $2 where "id" = $3
@@ -569,7 +574,7 @@ class QueryBuilder {
      * row.id
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * update "person" set "first_name" = $1, "last_name" = $2 where "id" = $3 returning "id"
@@ -580,7 +585,7 @@ class QueryBuilder {
      * select queries:
      *
      * ```ts
-     * const numAffectedRows = await db
+     * const result = await db
      *   .updateTable('person')
      *   .set({
      *     first_name: 'Jennifer',
@@ -589,9 +594,11 @@ class QueryBuilder {
      *   })
      *   .where('id', '=', 1)
      *   .executeTakeFirst()
+     *
+     * console.log(result.numUpdatedRows)
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * update "person" set
@@ -617,7 +624,7 @@ class QueryBuilder {
     }
     /**
      * Adds a `returning *` to an insert/update/delete query on databases
-     * that support `returning` such as postgres.
+     * that support `returning` such as PostgreSQL.
      */
     returningAll() {
         assertCanHaveReturningClause(this.#props.queryNode);
@@ -645,7 +652,7 @@ class QueryBuilder {
      *   .execute()
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select "person"."first_name" as "fn"
@@ -672,7 +679,7 @@ class QueryBuilder {
      *   .execute()
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select *
@@ -704,7 +711,7 @@ class QueryBuilder {
      * someQuery('fn')
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select "person"."first_name" as "fn"
@@ -895,32 +902,22 @@ class QueryBuilder {
      * Also see the {@link executeTakeFirst} and {@link executeTakeFirstOrThrow} methods.
      */
     async execute() {
-        const node = this.#props.executor.transformQuery(this.#props.queryNode, this.#props.queryId);
-        const compildQuery = this.#props.executor.compileQuery(node, this.#props.queryId);
+        const compildQuery = this.compile();
+        const query = compildQuery.query;
         const result = await this.#props.executor.executeQuery(compildQuery, this.#props.queryId);
-        if (insert_query_node_js_1.InsertQueryNode.is(node)) {
-            if (this.#props.parseContext.adapter.supportsReturning &&
-                node.returning) {
-                return result.rows;
-            }
-            else if (result.insertedPrimaryKey != null) {
-                return [result.insertedPrimaryKey];
-            }
-            else {
-                return [];
-            }
+        if (this.#props.parseContext.adapter.supportsReturning &&
+            query_node_js_1.QueryNode.isMutating(query) &&
+            query.returning) {
+            return result.rows;
+        }
+        else if (insert_query_node_js_1.InsertQueryNode.is(query)) {
+            return [new insert_result_js_1.InsertResult(result.insertId)];
+        }
+        else if (update_query_node_js_1.UpdateQueryNode.is(query)) {
+            return [new update_result_js_1.UpdateResult(result.numUpdatedOrDeletedRows)];
         }
-        else if (update_query_node_js_1.UpdateQueryNode.is(node) || delete_query_node_js_1.DeleteQueryNode.is(node)) {
-            if (this.#props.parseContext.adapter.supportsReturning &&
-                node.returning) {
-                return result.rows;
-            }
-            else if (result.numUpdatedOrDeletedRows != null) {
-                return [result.numUpdatedOrDeletedRows];
-            }
-            else {
-                return [];
-            }
+        else if (delete_query_node_js_1.DeleteQueryNode.is(query)) {
+            return [new delete_result_js_1.DeleteResult(result.numUpdatedOrDeletedRows)];
         }
         else {
             return result.rows;

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

@@ -0,0 +1,5 @@
+export declare class UpdateResult {
+    #private;
+    constructor(numUpdatedRows: bigint);
+    get numUpdatedRows(): bigint;
+}

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateResult = void 0;
+class UpdateResult {
+    #numUpdatedRows;
+    constructor(numUpdatedRows) {
+        this.#numUpdatedRows = numUpdatedRows;
+    }
+    get numUpdatedRows() {
+        return this.#numUpdatedRows;
+    }
+}
+exports.UpdateResult = UpdateResult;

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

@@ -1,4 +1,9 @@
+import { RootOperationNode } from './query-compiler.js';
 export interface CompiledQuery {
+    readonly query: RootOperationNode;
     readonly sql: string;
     readonly parameters: ReadonlyArray<unknown>;
 }
+export declare const CompiledQuery: Readonly<{
+    raw(sql: string): CompiledQuery;
+}>;

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

@@ -1,2 +1,14 @@
 "use strict";
 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");
+exports.CompiledQuery = (0, object_utils_js_1.freeze)({
+    raw(sql) {
+        return (0, object_utils_js_1.freeze)({
+            sql,
+            query: raw_node_js_1.RawNode.createWithSql(sql),
+            parameters: (0, object_utils_js_1.freeze)([]),
+        });
+    },
+});

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

@@ -62,6 +62,11 @@ 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';
+import { CreateViewNode } from '../operation-node/create-view-node.js';
+import { DropViewNode } from '../operation-node/drop-view-node.js';
+import { GeneratedAlwaysAsNode } from '../operation-node/generated-always-as-node.js';
+import { DefaultValueNode } from '../operation-node/default-value-node.js';
+import { OnNode } from '../operation-node/on-node.js';
 export declare class DefaultQueryCompiler extends OperationNodeVisitor implements QueryCompiler {
     #private;
     protected get numParameters(): number;
@@ -91,6 +96,7 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected visitPrimitiveValueList(node: PrimitiveValueListNode): void;
     protected visitParens(node: ParensNode): void;
     protected visitJoin(node: JoinNode): void;
+    protected visitOn(node: OnNode): void;
     protected visitRaw(node: RawNode): void;
     protected visitOperator(node: OperatorNode): void;
     protected visitTable(node: TableNode): void;
@@ -130,6 +136,10 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected visitAddConstraint(node: AddConstraintNode): void;
     protected visitDropConstraint(node: DropConstraintNode): void;
     protected visitUnion(node: UnionNode): void;
+    protected visitCreateView(node: CreateViewNode): void;
+    protected visitDropView(node: DropViewNode): void;
+    protected visitGeneratedAlwaysAs(node: GeneratedAlwaysAsNode): void;
+    protected visitDefaultValue(node: DefaultValueNode): void;
     protected append(str: string): void;
     protected appendValue(parameter: unknown): void;
     protected getLeftIdentifierWrapper(): string;

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

@@ -5,6 +5,8 @@ const operation_node_visitor_js_1 = require("../operation-node/operation-node-vi
 const query_node_js_1 = require("../operation-node/query-node.js");
 const raw_node_js_1 = require("../operation-node/raw-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
+const union_node_js_1 = require("../operation-node/union-node.js");
+const create_view_node_js_1 = require("../operation-node/create-view-node.js");
 class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisitor {
     #sql = '';
     #parameters = [];
@@ -16,6 +18,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         this.#parameters = [];
         this.visitNode(node);
         return (0, object_utils_js_1.freeze)({
+            query: node,
             sql: this.getSql(),
             parameters: [...this.#parameters],
         });
@@ -24,9 +27,10 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         return this.#sql;
     }
     visitSelectQuery(node) {
-        // This is a sub query if this is not the root node.
-        const isSubQuery = this.nodeStack.length !== 1;
-        if (isSubQuery) {
+        const wrapInParens = this.nodeStack.length !== 1 &&
+            !create_view_node_js_1.CreateViewNode.is(this.parentNode) &&
+            !union_node_js_1.UnionNode.is(this.parentNode);
+        if (wrapInParens) {
             this.append('(');
         }
         if (node.with) {
@@ -38,7 +42,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.compileDistinctOn(node.distinctOnSelections);
             this.append(' ');
         }
-        if (node.isDistinct) {
+        if (node.distinct) {
             this.append('distinct');
             this.append(' ');
         }
@@ -85,7 +89,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
                 this.append(SELECT_MODIFIER_SQL[modifier]);
             });
         }
-        if (isSubQuery) {
+        if (wrapInParens) {
             this.append(')');
         }
     }
@@ -265,11 +269,15 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         this.append(JOIN_TYPE_SQL[node.joinType]);
         this.append(' ');
         this.visitNode(node.table);
-        this.append(' on ');
         if (node.on) {
+            this.append(' ');
             this.visitNode(node.on);
         }
     }
+    visitOn(node) {
+        this.append('on ');
+        this.visitNode(node.on);
+    }
     visitRaw(node) {
         node.sqlFragments.forEach((sql, i) => {
             this.append(sql);
@@ -290,7 +298,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     }
     visitCreateTable(node) {
         this.append('create table ');
-        if (node.modifier === 'IfNotExists') {
+        if (node.ifNotExists) {
             this.append('if not exists ');
         }
         this.visitNode(node.table);
@@ -302,23 +310,27 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         this.visitNode(node.column);
         this.append(' ');
         this.visitNode(node.dataType);
+        if (node.generatedAlwaysAs) {
+            this.append(' ');
+            this.visitNode(node.generatedAlwaysAs);
+        }
         if (node.defaultTo) {
-            this.append(' default ');
+            this.append(' ');
             this.visitNode(node.defaultTo);
         }
-        if (!node.isNullable) {
+        if (!node.nullable) {
             this.append(' not null');
         }
-        if (node.isAutoIncrementing) {
-            this.append(' ');
-            this.append(this.getAutoIncrement());
-        }
-        if (node.isUnique) {
+        if (node.unique) {
             this.append(' unique');
         }
-        if (node.isPrimaryKey) {
+        if (node.primaryKey) {
             this.append(' primary key');
         }
+        if (node.autoIncrement) {
+            this.append(' ');
+            this.append(this.getAutoIncrement());
+        }
         if (node.references) {
             this.append(' ');
             this.visitNode(node.references);
@@ -348,7 +360,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     }
     visitDropTable(node) {
         this.append('drop table ');
-        if (node.modifier === 'IfExists') {
+        if (node.ifExists) {
             this.append('if exists ');
         }
         this.visitNode(node.table);
@@ -470,7 +482,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     }
     visitDropIndex(node) {
         this.append('drop index ');
-        if (node.modifier === 'IfExists') {
+        if (node.ifExists) {
             this.append('if exists ');
         }
         this.visitNode(node.name);
@@ -481,14 +493,14 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     }
     visitCreateSchema(node) {
         this.append('create schema ');
-        if (node.modifier === 'IfNotExists') {
+        if (node.ifNotExists) {
             this.append('if not exists ');
         }
         this.visitNode(node.schema);
     }
     visitDropSchema(node) {
         this.append('drop schema ');
-        if (node.modifier === 'IfExists') {
+        if (node.ifExists) {
             this.append('if exists ');
         }
         this.visitNode(node.schema);
@@ -647,6 +659,53 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         }
         this.visitNode(node.union);
     }
+    visitCreateView(node) {
+        this.append('create ');
+        if (node.orReplace) {
+            this.append('or replace ');
+        }
+        if (node.materialized) {
+            this.append('materialized ');
+        }
+        this.append('view ');
+        if (node.ifNotExists) {
+            this.append('if not exists ');
+        }
+        this.visitNode(node.name);
+        this.append(' ');
+        if (node.columns) {
+            this.append('(');
+            this.compileList(node.columns);
+            this.append(') ');
+        }
+        if (node.as) {
+            this.append('as ');
+            this.visitNode(node.as);
+        }
+    }
+    visitDropView(node) {
+        this.append('drop ');
+        if (node.materialized) {
+            this.append('materialized ');
+        }
+        this.append('view ');
+        if (node.ifExists) {
+            this.append('if exists ');
+        }
+        this.visitNode(node.name);
+    }
+    visitGeneratedAlwaysAs(node) {
+        this.append('generated always as (');
+        this.visitNode(node.expression);
+        this.append(')');
+        if (node.stored) {
+            this.append(' stored');
+        }
+    }
+    visitDefaultValue(node) {
+        this.append('default ');
+        this.visitNode(node.defaultValue);
+    }
     append(str) {
         this.#sql += str;
     }
@@ -688,17 +747,17 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     }
 }
 exports.DefaultQueryCompiler = DefaultQueryCompiler;
-const SELECT_MODIFIER_SQL = {
+const SELECT_MODIFIER_SQL = (0, object_utils_js_1.freeze)({
     ForKeyShare: 'for key share',
     ForNoKeyUpdate: 'for no key update',
     ForUpdate: 'for update',
     ForShare: 'for share',
     NoWait: 'nowait',
     SkipLocked: 'skip locked',
-};
-const JOIN_TYPE_SQL = {
+});
+const JOIN_TYPE_SQL = (0, object_utils_js_1.freeze)({
     InnerJoin: 'inner join',
     LeftJoin: 'left join',
     RightJoin: 'right join',
     FullJoin: 'full join',
-};
+});

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

@@ -2,13 +2,15 @@ import { AlterTableNode } from '../operation-node/alter-table-node.js';
 import { CreateIndexNode } from '../operation-node/create-index-node.js';
 import { CreateSchemaNode } from '../operation-node/create-schema-node.js';
 import { CreateTableNode } from '../operation-node/create-table-node.js';
+import { CreateViewNode } from '../operation-node/create-view-node.js';
 import { DropIndexNode } from '../operation-node/drop-index-node.js';
 import { DropSchemaNode } from '../operation-node/drop-schema-node.js';
 import { DropTableNode } from '../operation-node/drop-table-node.js';
+import { DropViewNode } from '../operation-node/drop-view-node.js';
 import { QueryNode } from '../operation-node/query-node.js';
 import { RawNode } from '../operation-node/raw-node.js';
 import { CompiledQuery } from './compiled-query.js';
-export declare type RootOperationNode = QueryNode | CreateTableNode | CreateIndexNode | AlterTableNode | DropTableNode | DropIndexNode | CreateSchemaNode | DropSchemaNode | RawNode;
+export declare type RootOperationNode = QueryNode | CreateTableNode | CreateIndexNode | CreateSchemaNode | CreateViewNode | DropTableNode | DropIndexNode | DropSchemaNode | DropViewNode | AlterTableNode | RawNode;
 /**
  * a `QueryCompiler` compiles a query expressed as a tree of `OperationNodes` into SQL.
  */