kysely 0.28.2 → 0.28.3

package/dist/cjs/dialect/mssql/mssql-driver.d.ts

@@ -4,6 +4,7 @@ import { MssqlDialectConfig, Tedious, TediousConnection } from './mssql-dialect-
 import { CompiledQuery } from '../../query-compiler/compiled-query.js';
 declare const PRIVATE_RESET_METHOD: unique symbol;
 declare const PRIVATE_DESTROY_METHOD: unique symbol;
+declare const PRIVATE_VALIDATE_METHOD: unique symbol;
 export declare class MssqlDriver implements Driver {
     #private;
     constructor(config: MssqlDialectConfig);
@@ -51,8 +52,8 @@ declare class MssqlConnection implements DatabaseConnection {
     rollbackTransaction(savepointName?: string): Promise<void>;
     savepoint(savepointName: string): Promise<void>;
     streamQuery<O>(compiledQuery: CompiledQuery, chunkSize: number): AsyncIterableIterator<QueryResult<O>>;
-    validate(): Promise<boolean>;
-    [PRIVATE_RESET_METHOD](): Promise<void>;
     [PRIVATE_DESTROY_METHOD](): Promise<void>;
+    [PRIVATE_RESET_METHOD](): Promise<void>;
+    [PRIVATE_VALIDATE_METHOD](): Promise<boolean>;
 }
 export {};

package/dist/cjs/dialect/mssql/mssql-driver.js

@@ -8,6 +8,7 @@ const random_string_js_1 = require("../../util/random-string.js");
 const deferred_js_1 = require("../../util/deferred.js");
 const PRIVATE_RESET_METHOD = Symbol();
 const PRIVATE_DESTROY_METHOD = Symbol();
+const PRIVATE_VALIDATE_METHOD = Symbol();
 class MssqlDriver {
     #config;
     #pool;
@@ -29,7 +30,7 @@ class MssqlDriver {
             validate: validateConnections === false ||
                 deprecatedValidateConnections === false
                 ? undefined
-                : (connection) => connection.validate(),
+                : (connection) => connection[PRIVATE_VALIDATE_METHOD](),
         });
     }
     async init() {
@@ -67,14 +68,12 @@ class MssqlDriver {
 exports.MssqlDriver = MssqlDriver;
 class MssqlConnection {
     #connection;
+    #hasSocketError;
     #tedious;
     constructor(connection, tedious) {
         this.#connection = connection;
+        this.#hasSocketError = false;
         this.#tedious = tedious;
-        this.#connection.on('error', console.error);
-        this.#connection.once('end', () => {
-            this.#connection.off('error', console.error);
-        });
     }
     async beginTransaction(settings) {
         const { isolationLevel } = settings;
@@ -96,17 +95,28 @@ class MssqlConnection {
         }));
     }
     async connect() {
-        await new Promise((resolve, reject) => {
-            this.#connection.connect((error) => {
-                if (error) {
-                    console.error(error);
-                    reject(error);
-                }
-                else {
-                    resolve(undefined);
-                }
-            });
+        const { promise: waitForConnected, reject, resolve } = new deferred_js_1.Deferred();
+        this.#connection.connect((error) => {
+            if (error) {
+                return reject(error);
+            }
+            resolve();
         });
+        this.#connection.on('error', (error) => {
+            if (error instanceof Error &&
+                'code' in error &&
+                error.code === 'ESOCKET') {
+                this.#hasSocketError = true;
+            }
+            console.error(error);
+            reject(error);
+        });
+        function endListener() {
+            reject(new Error('The connection ended without ever completing the connection'));
+        }
+        this.#connection.once('end', endListener);
+        await waitForConnected;
+        this.#connection.off('end', endListener);
         return this;
     }
     async executeQuery(compiledQuery) {
@@ -170,22 +180,6 @@ class MssqlConnection {
             await this.#cancelRequest(request);
         }
     }
-    async validate() {
-        try {
-            const deferred = new deferred_js_1.Deferred();
-            const request = new MssqlRequest({
-                compiledQuery: compiled_query_js_1.CompiledQuery.raw('select 1'),
-                onDone: deferred,
-                tedious: this.#tedious,
-            });
-            this.#connection.execSql(request.request);
-            await deferred.promise;
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
     #getTediousIsolationLevel(isolationLevel) {
         const { ISOLATION_LEVEL } = this.#tedious;
         const mapper = {
@@ -207,27 +201,50 @@ class MssqlConnection {
             const wasCanceled = this.#connection.cancel();
             if (!wasCanceled) {
                 request.request.off('requestCompleted', resolve);
-                resolve(undefined);
+                resolve();
             }
         });
     }
+    [PRIVATE_DESTROY_METHOD]() {
+        if ('closed' in this.#connection && this.#connection.closed) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve) => {
+            this.#connection.once('end', resolve);
+            this.#connection.close();
+        });
+    }
     async [PRIVATE_RESET_METHOD]() {
         await new Promise((resolve, reject) => {
             this.#connection.reset((error) => {
-                if (error)
-                    reject(error);
-                else
-                    resolve(undefined);
+                if (error) {
+                    return reject(error);
+                }
+                resolve();
             });
         });
     }
-    [PRIVATE_DESTROY_METHOD]() {
-        return new Promise((resolve) => {
-            this.#connection.once('end', () => {
-                resolve(undefined);
+    async [PRIVATE_VALIDATE_METHOD]() {
+        if (this.#hasSocketError || this.#isConnectionClosed()) {
+            return false;
+        }
+        try {
+            const deferred = new deferred_js_1.Deferred();
+            const request = new MssqlRequest({
+                compiledQuery: compiled_query_js_1.CompiledQuery.raw('select 1'),
+                onDone: deferred,
+                tedious: this.#tedious,
             });
-            this.#connection.close();
-        });
+            this.#connection.execSql(request.request);
+            await deferred.promise;
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    #isConnectionClosed() {
+        return 'closed' in this.#connection && Boolean(this.#connection.closed);
     }
 }
 class MssqlRequest {
@@ -251,23 +268,19 @@ class MssqlRequest {
                 }
                 delete this.#subscribers[subscriptionKey];
                 if (event === 'error') {
-                    onDone.reject(error);
-                }
-                else {
-                    onDone.resolve({
-                        rowCount: this.#rowCount,
-                        rows: this.#rows,
-                    });
+                    return onDone.reject(error);
                 }
+                onDone.resolve({
+                    rowCount: this.#rowCount,
+                    rows: this.#rows,
+                });
             };
         }
         this.#request = new this.#tedious.Request(compiledQuery.sql, (err, rowCount) => {
             if (err) {
-                Object.values(this.#subscribers).forEach((subscriber) => subscriber('error', err instanceof AggregateError ? err.errors : err));
-            }
-            else {
-                this.#rowCount = rowCount;
+                return Object.values(this.#subscribers).forEach((subscriber) => subscriber('error', err instanceof AggregateError ? err.errors : err));
             }
+            this.#rowCount = rowCount;
         });
         this.#addParametersToRequest(compiledQuery.parameters);
         this.#attachListeners();
@@ -281,11 +294,9 @@ class MssqlRequest {
             this.#subscribers[subscriptionKey] = (event, error) => {
                 delete this.#subscribers[subscriptionKey];
                 if (event === 'error') {
-                    reject(error);
-                }
-                else {
-                    resolve(this.#rows.splice(0, this.#streamChunkSize));
+                    return reject(error);
                 }
+                resolve(this.#rows.splice(0, this.#streamChunkSize));
             };
             this.#request.resume();
         });

package/dist/cjs/dialect/postgres/postgres-introspector.js

@@ -48,6 +48,8 @@ class PostgresIntrospector {
         ])
             .where('ns.nspname', '!~', '^pg_')
             .where('ns.nspname', '!=', 'information_schema')
+            // Filter out internal cockroachdb schema
+            .where('ns.nspname', '!=', 'crdb_internal')
             // No system columns
             .where('a.attnum', '>=', 0)
             .where('a.attisdropped', '!=', true)

package/dist/cjs/helpers/mssql.d.ts

@@ -1,6 +1,6 @@
 import { Expression } from '../expression/expression.js';
 import { RawBuilder } from '../raw-builder/raw-builder.js';
-import { Simplify } from '../util/type-utils.js';
+import { ShallowDehydrateObject, ShallowDehydrateValue, Simplify } from '../util/type-utils.js';
 /**
  * An MS SQL Server helper for aggregating a subquery into a JSON array.
  *
@@ -73,7 +73,7 @@ import { Simplify } from '../util/type-utils.js';
  * from "person"
  * ```
  */
-export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O>[]>;
+export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>>[]>;
 /**
  * An MS SQL Server helper for turning a subquery into a JSON object.
  *
@@ -146,7 +146,7 @@ export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simpli
  * from "person"
  * ```
  */
-export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O> | null>;
+export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>> | null>;
 /**
  * The MS SQL Server `json_query` function, single argument variant.
  *
@@ -208,5 +208,5 @@ export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simpl
  * ```
  */
 export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
-    [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
+    [K in keyof O]: O[K] extends Expression<infer V> ? ShallowDehydrateValue<V> : never;
 }>>;

package/dist/cjs/helpers/mysql.d.ts

@@ -1,7 +1,7 @@
 import { Expression } from '../expression/expression.js';
 import { SelectQueryBuilderExpression } from '../query-builder/select-query-builder-expression.js';
 import { RawBuilder } from '../raw-builder/raw-builder.js';
-import { Simplify } from '../util/type-utils.js';
+import { ShallowDehydrateObject, ShallowDehydrateValue, Simplify } from '../util/type-utils.js';
 /**
  * A MySQL helper for aggregating a subquery into a JSON array.
  *
@@ -50,7 +50,7 @@ import { Simplify } from '../util/type-utils.js';
  * from `person`
  * ```
  */
-export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<O>[]>;
+export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>>[]>;
 /**
  * A MySQL helper for turning a subquery into a JSON object.
  *
@@ -101,7 +101,7 @@ export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>):
  * from `person`
  * ```
  */
-export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<O> | null>;
+export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>> | null>;
 /**
  * The MySQL `json_object` function.
  *
@@ -143,5 +143,5 @@ export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>)
  * ```
  */
 export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
-    [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
+    [K in keyof O]: O[K] extends Expression<infer V> ? ShallowDehydrateValue<V> : never;
 }>>;

package/dist/cjs/helpers/postgres.d.ts

@@ -1,6 +1,6 @@
 import { Expression } from '../expression/expression.js';
 import { RawBuilder } from '../raw-builder/raw-builder.js';
-import { Simplify } from '../util/type-utils.js';
+import { ShallowDehydrateValue, ShallowDehydrateObject, Simplify } from '../util/type-utils.js';
 /**
  * A postgres helper for aggregating a subquery (or other expression) into a JSONB array.
  *
@@ -50,7 +50,7 @@ import { Simplify } from '../util/type-utils.js';
  * from "person"
  * ```
  */
-export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O>[]>;
+export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>>[]>;
 /**
  * A postgres helper for turning a subquery (or other expression) into a JSON object.
  *
@@ -102,7 +102,7 @@ export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simpli
  * from "person"
  * ```
  */
-export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O> | null>;
+export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>> | null>;
 /**
  * The PostgreSQL `json_build_object` function.
  *
@@ -147,7 +147,7 @@ export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simpl
  * ```
  */
 export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
-    [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
+    [K in keyof O]: O[K] extends Expression<infer V> ? ShallowDehydrateValue<V> : never;
 }>>;
 export type MergeAction = 'INSERT' | 'UPDATE' | 'DELETE';
 /**

package/dist/cjs/helpers/sqlite.d.ts

@@ -1,7 +1,7 @@
 import { Expression } from '../expression/expression.js';
 import { SelectQueryBuilderExpression } from '../query-builder/select-query-builder-expression.js';
 import { RawBuilder } from '../raw-builder/raw-builder.js';
-import { Simplify } from '../util/type-utils.js';
+import { ShallowDehydrateObject, ShallowDehydrateValue, Simplify } from '../util/type-utils.js';
 /**
  * A SQLite helper for aggregating a subquery into a JSON array.
  *
@@ -63,7 +63,7 @@ import { Simplify } from '../util/type-utils.js';
  * from "person"
  * ```
  */
-export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<O>[]>;
+export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>>[]>;
 /**
  * A SQLite helper for turning a subquery into a JSON object.
  *
@@ -127,7 +127,7 @@ export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>):
  * from "person";
  * ```
  */
-export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<O> | null>;
+export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>> | null>;
 /**
  * The SQLite `json_object` function.
  *
@@ -185,5 +185,5 @@ export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>)
  * ```
  */
 export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
-    [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
+    [K in keyof O]: O[K] extends Expression<infer V> ? ShallowDehydrateValue<V> : never;
 }>>;

package/dist/cjs/index.d.ts

@@ -204,7 +204,7 @@ export * from './util/compilable.js';
 export * from './util/explainable.js';
 export * from './util/streamable.js';
 export * from './util/log.js';
-export { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, Equals, UnknownRow, Simplify, SqlBool, Nullable, NotNull, } from './util/type-utils.js';
+export { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, Equals, UnknownRow, Simplify, SqlBool, Nullable, NotNull, ShallowDehydrateObject, ShallowDehydrateValue, StringsWhenDataTypeNotAvailable, } from './util/type-utils.js';
 export * from './util/infer-result.js';
 export { logOnce } from './util/log-once.js';
 export { createQueryId, QueryId } from './util/query-id.js';

package/dist/cjs/kysely.d.ts

@@ -18,6 +18,10 @@ import { Expression } from './expression/expression.js';
 import { DrainOuterGeneric } from './util/type-utils.js';
 import { ReleaseSavepoint, RollbackToSavepoint } from './parser/savepoint-parser.js';
 import { ControlledConnection } from './util/provide-controlled-connection.js';
+declare global {
+    interface AsyncDisposable {
+    }
+}
 /**
  * The main Kysely class.
  *

package/dist/cjs/kysely.js

@@ -20,6 +20,7 @@ const case_node_js_1 = require("./operation-node/case-node.js");
 const expression_parser_js_1 = require("./parser/expression-parser.js");
 const with_schema_plugin_js_1 = require("./plugin/with-schema/with-schema-plugin.js");
 const provide_controlled_connection_js_1 = require("./util/provide-controlled-connection.js");
+const log_once_js_1 = require("./util/log-once.js");
 // @ts-ignore
 Symbol.asyncDispose ??= Symbol('Symbol.asyncDispose');
 /**
@@ -460,9 +461,14 @@ class Kysely extends query_creator_js_1.QueryCreator {
      *
      * See {@link https://github.com/kysely-org/kysely/blob/master/site/docs/recipes/0004-splitting-query-building-and-execution.md#execute-compiled-queries splitting build, compile and execute code recipe} for more information.
      */
-    executeQuery(query, queryId = (0, query_id_js_1.createQueryId)()) {
+    executeQuery(query, 
+    // TODO: remove this in the future. deprecated in  0.28.x
+    queryId) {
+        if (queryId !== undefined) {
+            (0, log_once_js_1.logOnce)('Passing `queryId` in `db.executeQuery` is deprecated and will result in a compile-time error in the future.');
+        }
         const compiledQuery = (0, compilable_js_1.isCompilable)(query) ? query.compile() : query;
-        return this.getExecutor().executeQuery(compiledQuery, queryId);
+        return this.getExecutor().executeQuery(compiledQuery);
     }
     async [Symbol.asyncDispose]() {
         await this.destroy();
@@ -888,13 +894,13 @@ class NotCommittedOrRolledBackAssertingExecutor {
     provideConnection(consumer) {
         return this.#executor.provideConnection(consumer);
     }
-    executeQuery(compiledQuery, queryId) {
+    executeQuery(compiledQuery) {
         assertNotCommittedOrRolledBack(this.#state);
-        return this.#executor.executeQuery(compiledQuery, queryId);
+        return this.#executor.executeQuery(compiledQuery);
     }
-    stream(compiledQuery, chunkSize, queryId) {
+    stream(compiledQuery, chunkSize) {
         assertNotCommittedOrRolledBack(this.#state);
-        return this.#executor.stream(compiledQuery, chunkSize, queryId);
+        return this.#executor.stream(compiledQuery, chunkSize);
     }
     withConnectionProvider(connectionProvider) {
         return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withConnectionProvider(connectionProvider), this.#state);

package/dist/cjs/migration/migrator.js

@@ -178,7 +178,8 @@ class Migrator {
      */
     async migrateTo(targetMigrationName) {
         return this.#migrate(({ migrations, executedMigrations, pendingMigrations, }) => {
-            if (targetMigrationName === exports.NO_MIGRATIONS) {
+            if ((0, object_utils_js_1.isObject)(targetMigrationName) &&
+                targetMigrationName.__noMigrations__ === true) {
                 return { direction: 'Down', step: Infinity };
             }
             if (!migrations.find((m) => m.name === targetMigrationName)) {

package/dist/cjs/parser/delete-from-parser.d.ts

@@ -2,4 +2,8 @@ import type { DeleteQueryBuilder } from '../query-builder/delete-query-builder.j
 import type { DeleteResult } from '../query-builder/delete-result.js';
 import type { ShallowRecord } from '../util/type-utils.js';
 import type { ExtractTableAlias, From, FromTables, TableExpressionOrList } from './table-parser.js';
-export type DeleteFrom<DB, TE extends TableExpressionOrList<DB, never>> = TE extends ReadonlyArray<infer T> ? DeleteQueryBuilder<From<DB, T>, FromTables<DB, never, T>, DeleteResult> : TE extends keyof DB & string ? DeleteQueryBuilder<DB, ExtractTableAlias<DB, TE>, DeleteResult> : TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? DeleteQueryBuilder<DB & ShallowRecord<A, DB[T]>, A, DeleteResult> : never : DeleteQueryBuilder<From<DB, TE>, FromTables<DB, never, TE>, DeleteResult>;
+export type DeleteFrom<DB, TE extends TableExpressionOrList<DB, never>> = [
+    TE
+] extends [keyof DB] ? DeleteQueryBuilder<DB, ExtractTableAlias<DB, TE>, DeleteResult> : [
+    TE
+] extends [`${infer T} as ${infer A}`] ? T extends keyof DB ? DeleteQueryBuilder<DB & ShallowRecord<A, DB[T]>, A, DeleteResult> : never : TE extends ReadonlyArray<infer T> ? DeleteQueryBuilder<From<DB, T>, FromTables<DB, never, T>, DeleteResult> : DeleteQueryBuilder<From<DB, TE>, FromTables<DB, never, TE>, DeleteResult>;

package/dist/cjs/parser/merge-into-parser.d.ts

@@ -2,4 +2,6 @@ import type { MergeQueryBuilder } from '../query-builder/merge-query-builder.js'
 import type { MergeResult } from '../query-builder/merge-result.js';
 import type { ShallowRecord } from '../util/type-utils.js';
 import type { ExtractTableAlias, SimpleTableReference } from './table-parser.js';
-export type MergeInto<DB, TE extends SimpleTableReference<DB>> = TE extends keyof DB & string ? MergeQueryBuilder<DB, ExtractTableAlias<DB, TE>, MergeResult> : TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? MergeQueryBuilder<DB & ShallowRecord<A, DB[T]>, A, MergeResult> : never : never;
+export type MergeInto<DB, TE extends SimpleTableReference<DB>> = [TE] extends [
+    keyof DB
+] ? MergeQueryBuilder<DB, ExtractTableAlias<DB, TE>, MergeResult> : [TE] extends [`${infer T} as ${infer A}`] ? T extends keyof DB ? MergeQueryBuilder<DB & ShallowRecord<A, DB[T]>, A, MergeResult> : never : never;

package/dist/cjs/parser/select-from-parser.d.ts

@@ -1,4 +1,6 @@
 import type { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
 import type { ShallowRecord } from '../util/type-utils.js';
 import type { ExtractTableAlias, From, FromTables, TableExpressionOrList } from './table-parser.js';
-export type SelectFrom<DB, TB extends keyof DB, TE extends TableExpressionOrList<DB, TB>> = TE extends keyof DB & string ? SelectQueryBuilder<DB, TB | ExtractTableAlias<DB, TE>, {}> : TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? SelectQueryBuilder<DB & ShallowRecord<A, DB[T]>, TB | A, {}> : never : TE extends ReadonlyArray<infer T> ? SelectQueryBuilder<From<DB, T>, FromTables<DB, TB, T>, {}> : SelectQueryBuilder<From<DB, TE>, FromTables<DB, TB, TE>, {}>;
+export type SelectFrom<DB, TB extends keyof DB, TE extends TableExpressionOrList<DB, TB>> = [TE] extends [keyof DB] ? SelectQueryBuilder<DB, TB | ExtractTableAlias<DB, TE>, {}> : [
+    TE
+] extends [`${infer T} as ${infer A}`] ? T extends keyof DB ? SelectQueryBuilder<DB & ShallowRecord<A, DB[T]>, TB | A, {}> : never : TE extends ReadonlyArray<infer T> ? SelectQueryBuilder<From<DB, T>, FromTables<DB, TB, T>, {}> : SelectQueryBuilder<From<DB, TE>, FromTables<DB, TB, TE>, {}>;

package/dist/cjs/parser/update-parser.d.ts

@@ -2,4 +2,8 @@ import type { UpdateQueryBuilder } from '../query-builder/update-query-builder.j
 import type { UpdateResult } from '../query-builder/update-result.js';
 import type { ShallowRecord } from '../util/type-utils.js';
 import type { ExtractTableAlias, From, FromTables, TableExpressionOrList } from './table-parser.js';
-export type UpdateTable<DB, TE extends TableExpressionOrList<DB, never>> = TE extends ReadonlyArray<infer T> ? UpdateQueryBuilder<From<DB, T>, FromTables<DB, never, T>, FromTables<DB, never, T>, UpdateResult> : TE extends keyof DB & string ? UpdateQueryBuilder<DB, ExtractTableAlias<DB, TE>, ExtractTableAlias<DB, TE>, UpdateResult> : TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? UpdateQueryBuilder<DB & ShallowRecord<A, DB[T]>, A, A, UpdateResult> : never : UpdateQueryBuilder<From<DB, TE>, FromTables<DB, never, TE>, FromTables<DB, never, TE>, UpdateResult>;
+export type UpdateTable<DB, TE extends TableExpressionOrList<DB, never>> = [
+    TE
+] extends [keyof DB] ? UpdateQueryBuilder<DB, ExtractTableAlias<DB, TE>, ExtractTableAlias<DB, TE>, UpdateResult> : [
+    TE
+] extends [`${infer T} as ${infer A}`] ? T extends keyof DB ? UpdateQueryBuilder<DB & ShallowRecord<A, DB[T]>, A, A, UpdateResult> : never : TE extends ReadonlyArray<infer T> ? UpdateQueryBuilder<From<DB, T>, FromTables<DB, never, T>, FromTables<DB, never, T>, UpdateResult> : UpdateQueryBuilder<From<DB, TE>, FromTables<DB, never, TE>, FromTables<DB, never, TE>, UpdateResult>;

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

@@ -451,7 +451,7 @@ class DeleteQueryBuilder {
      */
     async execute() {
         const compiledQuery = this.compile();
-        const result = await this.#props.executor.executeQuery(compiledQuery, this.#props.queryId);
+        const result = await this.#props.executor.executeQuery(compiledQuery);
         const { adapter } = this.#props.executor;
         const query = compiledQuery.query;
         if ((query.returning && adapter.supportsReturning) ||
@@ -488,7 +488,7 @@ class DeleteQueryBuilder {
     }
     async *stream(chunkSize = 100) {
         const compiledQuery = this.compile();
-        const stream = this.#props.executor.stream(compiledQuery, chunkSize, this.#props.queryId);
+        const stream = this.#props.executor.stream(compiledQuery, chunkSize);
         for await (const item of stream) {
             yield* item.rows;
         }

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

@@ -3,10 +3,10 @@ import { Expression } from '../expression/expression.js';
 import { ExtractTypeFromCoalesce1, ExtractTypeFromCoalesce3, ExtractTypeFromCoalesce2, ExtractTypeFromCoalesce4, ExtractTypeFromCoalesce5 } from '../parser/coalesce-parser.js';
 import { ExtractTypeFromReferenceExpression, ReferenceExpression, StringReference, ExtractTypeFromStringReference } from '../parser/reference-parser.js';
 import { KyselyTypeError } from '../util/type-error.js';
-import { IsNever } from '../util/type-utils.js';
+import { IsNever, ShallowDehydrateObject, ShallowDehydrateValue, Simplify } from '../util/type-utils.js';
 import { AggregateFunctionBuilder } from './aggregate-function-builder.js';
 import { SelectQueryBuilderExpression } from '../query-builder/select-query-builder-expression.js';
-import { Selectable } from '../util/column-type.js';
+import { Selectable, SelectType } from '../util/column-type.js';
 /**
  * Helpers for type safe SQL function calls.
  *
@@ -565,8 +565,8 @@ export interface FunctionModule<DB, TB extends keyof DB> {
      * group by "person"."first_name"
      * ```
      */
-    jsonAgg<T extends (TB & string) | Expression<unknown>>(table: T): AggregateFunctionBuilder<DB, TB, T extends TB ? Selectable<DB[T]>[] : T extends Expression<infer O> ? O[] : never>;
-    jsonAgg<RE extends StringReference<DB, TB>>(column: RE): AggregateFunctionBuilder<DB, TB, ExtractTypeFromStringReference<DB, TB, RE>[] | null>;
+    jsonAgg<T extends (TB & string) | Expression<unknown>>(table: T): AggregateFunctionBuilder<DB, TB, T extends TB ? Simplify<ShallowDehydrateObject<Selectable<DB[T]>>>[] : T extends Expression<infer O> ? Simplify<ShallowDehydrateObject<O>>[] : never>;
+    jsonAgg<RE extends StringReference<DB, TB>>(column: RE): AggregateFunctionBuilder<DB, TB, ShallowDehydrateValue<SelectType<ExtractTypeFromStringReference<DB, TB, RE>>>[] | null>;
     /**
      * Creates a to_json function call.
      *
@@ -587,6 +587,6 @@ export interface FunctionModule<DB, TB extends keyof DB> {
      * inner join "pet" on "pet"."owner_id" = "person"."id"
      * ```
      */
-    toJson<T extends (TB & string) | Expression<unknown>>(table: T): ExpressionWrapper<DB, TB, T extends TB ? Selectable<DB[T]> : T extends Expression<infer O> ? O : never>;
+    toJson<T extends (TB & string) | Expression<unknown>>(table: T): ExpressionWrapper<DB, TB, T extends TB ? Simplify<ShallowDehydrateObject<Selectable<DB[T]>>> : T extends Expression<infer O> ? Simplify<ShallowDehydrateObject<O>> : never>;
 }
 export declare function createFunctionModule<DB, TB extends keyof DB>(): FunctionModule<DB, TB>;

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

@@ -1105,7 +1105,7 @@ class InsertQueryBuilder {
      */
     async execute() {
         const compiledQuery = this.compile();
-        const result = await this.#props.executor.executeQuery(compiledQuery, this.#props.queryId);
+        const result = await this.#props.executor.executeQuery(compiledQuery);
         const { adapter } = this.#props.executor;
         const query = compiledQuery.query;
         if ((query.returning && adapter.supportsReturning) ||
@@ -1144,7 +1144,7 @@ class InsertQueryBuilder {
     }
     async *stream(chunkSize = 100) {
         const compiledQuery = this.compile();
-        const stream = this.#props.executor.stream(compiledQuery, chunkSize, this.#props.queryId);
+        const stream = this.#props.executor.stream(compiledQuery, chunkSize);
         for await (const item of stream) {
             yield* item.rows;
         }

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

@@ -419,7 +419,7 @@ class WheneableMergeQueryBuilder {
      */
     async execute() {
         const compiledQuery = this.compile();
-        const result = await this.#props.executor.executeQuery(compiledQuery, this.#props.queryId);
+        const result = await this.#props.executor.executeQuery(compiledQuery);
         const { adapter } = this.#props.executor;
         const query = compiledQuery.query;
         if ((query.returning && adapter.supportsReturning) ||

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

@@ -316,7 +316,7 @@ class SelectQueryBuilderImpl {
     }
     async execute() {
         const compiledQuery = this.compile();
-        const result = await this.#props.executor.executeQuery(compiledQuery, this.#props.queryId);
+        const result = await this.#props.executor.executeQuery(compiledQuery);
         return result.rows;
     }
     async executeTakeFirst() {
@@ -335,7 +335,7 @@ class SelectQueryBuilderImpl {
     }
     async *stream(chunkSize = 100) {
         const compiledQuery = this.compile();
-        const stream = this.#props.executor.stream(compiledQuery, chunkSize, this.#props.queryId);
+        const stream = this.#props.executor.stream(compiledQuery, chunkSize);
         for await (const item of stream) {
             yield* item.rows;
         }

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

@@ -458,7 +458,7 @@ class UpdateQueryBuilder {
      */
     async execute() {
         const compiledQuery = this.compile();
-        const result = await this.#props.executor.executeQuery(compiledQuery, this.#props.queryId);
+        const result = await this.#props.executor.executeQuery(compiledQuery);
         const { adapter } = this.#props.executor;
         const query = compiledQuery.query;
         if ((query.returning && adapter.supportsReturning) ||
@@ -497,7 +497,7 @@ class UpdateQueryBuilder {
     }
     async *stream(chunkSize = 100) {
         const compiledQuery = this.compile();
-        const stream = this.#props.executor.stream(compiledQuery, chunkSize, this.#props.queryId);
+        const stream = this.#props.executor.stream(compiledQuery, chunkSize);
         for await (const item of stream) {
             yield* item.rows;
         }

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

@@ -1320,7 +1320,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         if ((0, object_utils_js_1.isString)(value)) {
             this.appendStringLiteral(value);
         }
-        else if ((0, object_utils_js_1.isNumber)(value) || (0, object_utils_js_1.isBoolean)(value)) {
+        else if ((0, object_utils_js_1.isNumber)(value) || (0, object_utils_js_1.isBoolean)(value) || (0, object_utils_js_1.isBigInt)(value)) {
             this.append(value.toString());
         }
         else if ((0, object_utils_js_1.isNull)(value)) {
@@ -1329,9 +1329,6 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         else if ((0, object_utils_js_1.isDate)(value)) {
             this.appendImmediateValue(value.toISOString());
         }
-        else if ((0, object_utils_js_1.isBigInt)(value)) {
-            this.appendImmediateValue(value.toString());
-        }
         else {
             throw new Error(`invalid immediate value ${value}`);
         }

package/dist/cjs/query-executor/query-executor-base.d.ts

@@ -35,13 +35,13 @@ export declare abstract class QueryExecutorBase implements QueryExecutor {
      * Executes a compiled query and runs the result through all plugins'
      * `transformResult` method.
      */
-    executeQuery<R>(compiledQuery: CompiledQuery, queryId: QueryId): Promise<QueryResult<R>>;
+    executeQuery<R>(compiledQuery: CompiledQuery): Promise<QueryResult<R>>;
     /**
      * Executes a compiled query and runs the result through all plugins'
      * `transformResult` method. Results are streamead instead of loaded
      * at once.
      */
-    stream<R>(compiledQuery: CompiledQuery, chunkSize: number, queryId: QueryId): AsyncIterableIterator<QueryResult<R>>;
+    stream<R>(compiledQuery: CompiledQuery, chunkSize: number): AsyncIterableIterator<QueryResult<R>>;
     /**
      * Returns a copy of this executor with a new connection provider.
      */