kysely 0.17.0 → 0.17.1

package/dist/cjs/driver/connection-provider.d.ts

@@ -4,5 +4,5 @@ export interface ConnectionProvider {
      * Provides a connection for the callback and takes care of disposing
      * the connection after the callback has been run.
      */
-    withConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
+    provideConnection<T>(consumer: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
 }

package/dist/cjs/driver/default-connection-provider.d.ts

@@ -8,5 +8,5 @@ export declare class DefaultConnectionProvider implements ConnectionProvider {
      * Provides a connection for the callback and takes care of disposing
      * the connection after the callback has been run.
      */
-    withConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
+    provideConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
 }

package/dist/cjs/driver/default-connection-provider.js

@@ -6,7 +6,7 @@ class DefaultConnectionProvider {
     constructor(driver) {
         this.#driver = driver;
     }
-    async withConnection(runner) {
+    async provideConnection(runner) {
         const connection = await this.#driver.acquireConnection();
         try {
             return await runner(connection);

package/dist/cjs/driver/single-connection-provider.d.ts

@@ -7,5 +7,5 @@ export declare class SingleConnectionProvider implements ConnectionProvider {
      * Provides a connection for the callback and takes care of disposing
      * the connection after the callback has been run.
      */
-    withConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
+    provideConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
 }

package/dist/cjs/driver/single-connection-provider.js

@@ -7,7 +7,7 @@ class SingleConnectionProvider {
     constructor(connection) {
         this.#connection = connection;
     }
-    async withConnection(runner) {
+    async provideConnection(runner) {
         while (this.#runningPromise) {
             await this.#runningPromise;
         }

package/dist/cjs/kysely.js

@@ -338,18 +338,14 @@ class ConnectionBuilder {
         this.#props = (0, object_utils_js_1.freeze)(props);
     }
     async execute(callback) {
-        const connection = await this.#props.driver.acquireConnection();
-        const connectionProvider = new single_connection_provider_js_1.SingleConnectionProvider(connection);
-        const db = new Kysely({
-            ...this.#props,
-            executor: this.#props.executor.withConnectionProvider(connectionProvider),
-        });
-        try {
+        return this.#props.executor.provideConnection(async (connection) => {
+            const executor = this.#props.executor.withConnectionProvider(new single_connection_provider_js_1.SingleConnectionProvider(connection));
+            const db = new Kysely({
+                ...this.#props,
+                executor,
+            });
             return await callback(db);
-        }
-        finally {
-            await this.#props.driver.releaseConnection(connection);
-        }
+        });
     }
 }
 exports.ConnectionBuilder = ConnectionBuilder;
@@ -369,25 +365,23 @@ class TransactionBuilder {
         const { isolationLevel, ...kyselyProps } = this.#props;
         const settings = { isolationLevel };
         validateTransactionSettings(settings);
-        const connection = await this.#props.driver.acquireConnection();
-        const connectionProvider = new single_connection_provider_js_1.SingleConnectionProvider(connection);
-        const transaction = new Transaction({
-            ...kyselyProps,
-            executor: this.#props.executor.withConnectionProvider(connectionProvider),
+        return this.#props.executor.provideConnection(async (connection) => {
+            const executor = this.#props.executor.withConnectionProvider(new single_connection_provider_js_1.SingleConnectionProvider(connection));
+            const transaction = new Transaction({
+                ...kyselyProps,
+                executor,
+            });
+            try {
+                await this.#props.driver.beginTransaction(connection, settings);
+                const result = await callback(transaction);
+                await this.#props.driver.commitTransaction(connection);
+                return result;
+            }
+            catch (error) {
+                await this.#props.driver.rollbackTransaction(connection);
+                throw error;
+            }
         });
-        try {
-            await this.#props.driver.beginTransaction(connection, settings);
-            const result = await callback(transaction);
-            await this.#props.driver.commitTransaction(connection);
-            return result;
-        }
-        catch (error) {
-            await this.#props.driver.rollbackTransaction(connection);
-            throw error;
-        }
-        finally {
-            await this.#props.driver.releaseConnection(connection);
-        }
     }
 }
 exports.TransactionBuilder = TransactionBuilder;

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

@@ -1,5 +1,5 @@
 import { ConnectionProvider } from '../driver/connection-provider.js';
-import { QueryResult } from '../driver/database-connection.js';
+import { DatabaseConnection } from '../driver/database-connection.js';
 import { CompiledQuery } from '../query-compiler/compiled-query.js';
 import { RootOperationNode, QueryCompiler } from '../query-compiler/query-compiler.js';
 import { KyselyPlugin } from '../plugin/kysely-plugin.js';
@@ -15,7 +15,11 @@ export declare class DefaultQueryExecutor extends QueryExecutor {
      * compile any query using this method.
      */
     compileQuery(node: RootOperationNode): CompiledQuery;
-    protected executeQueryImpl<R>(compiledQuery: CompiledQuery): Promise<QueryResult<R>>;
+    /**
+     * Provides a connection for the callback and takes care of disposing
+     * the connection after the callback has been run.
+     */
+    provideConnection<T>(consumer: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
     /**
      * Returns a copy of this executor with a list of plugins added
      * as the last plugins.

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

@@ -18,10 +18,8 @@ class DefaultQueryExecutor extends query_executor_js_1.QueryExecutor {
     compileQuery(node) {
         return this.#compiler.compileQuery(node);
     }
-    async executeQueryImpl(compiledQuery) {
-        return this.#connectionProvider.withConnection((connection) => {
-            return connection.executeQuery(compiledQuery);
-        });
+    provideConnection(consumer) {
+        return this.#connectionProvider.provideConnection(consumer);
     }
     withPlugins(plugins) {
         return new DefaultQueryExecutor(this.#compiler, this.#adapter, this.#connectionProvider, [...this.plugins, ...plugins]);

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

@@ -1,4 +1,3 @@
-import { QueryResult } from '../driver/database-connection.js';
 import { CompiledQuery } from '../query-compiler/compiled-query.js';
 import { QueryExecutor } from './query-executor.js';
 import { KyselyPlugin } from '../plugin/kysely-plugin.js';
@@ -16,7 +15,11 @@ export declare class NoopQueryExecutor extends QueryExecutor {
      * compile any query using this method.
      */
     compileQuery(): CompiledQuery;
-    protected executeQueryImpl<R>(): Promise<QueryResult<R>>;
+    /**
+     * Provides a connection for the callback and takes care of disposing
+     * the connection after the callback has been run.
+     */
+    provideConnection<T>(): Promise<T>;
     /**
      * Returns a copy of this executor with a new connection provider.
      */

package/dist/cjs/query-executor/noop-query-executor.js

@@ -14,7 +14,7 @@ class NoopQueryExecutor extends query_executor_js_1.QueryExecutor {
     compileQuery() {
         throw new Error('this query cannot be compiled to SQL');
     }
-    async executeQueryImpl() {
+    provideConnection() {
         throw new Error('this query cannot be executed');
     }
     withConnectionProvider() {

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

@@ -1,5 +1,5 @@
 import { ConnectionProvider } from '../driver/connection-provider.js';
-import { QueryResult } from '../driver/database-connection.js';
+import { DatabaseConnection, QueryResult } from '../driver/database-connection.js';
 import { CompiledQuery } from '../query-compiler/compiled-query.js';
 import { RootOperationNode } from '../query-compiler/query-compiler.js';
 import { KyselyPlugin } from '../plugin/kysely-plugin.js';
@@ -11,7 +11,7 @@ import { DialectAdapter } from '../dialect/dialect-adapter.js';
  * and other classes that execute queries can just pass around and instance of
  * `QueryExecutor`.
  */
-export declare abstract class QueryExecutor {
+export declare abstract class QueryExecutor implements ConnectionProvider {
     #private;
     constructor(plugins?: KyselyPlugin[]);
     abstract get adapter(): DialectAdapter;
@@ -28,15 +28,16 @@ export declare abstract class QueryExecutor {
      * compile any query using this method.
      */
     abstract compileQuery(node: RootOperationNode, queryId: QueryId): CompiledQuery;
+    /**
+     * Provides a connection for the callback and takes care of disposing
+     * the connection after the callback has been run.
+     */
+    abstract provideConnection<T>(consumer: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
     /**
      * Executes a compiled query and runs the result through all plugins'
      * `transformResult` method.
      */
     executeQuery<R>(compiledQuery: CompiledQuery, queryId: QueryId): Promise<QueryResult<R>>;
-    /**
-     * Executes a compiled query.
-     */
-    protected abstract executeQueryImpl<R>(compiledQuery: CompiledQuery, queryId: QueryId): Promise<QueryResult<R>>;
     /**
      * Returns a copy of this executor with a new connection provider.
      */

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

@@ -46,8 +46,10 @@ class QueryExecutor {
      * `transformResult` method.
      */
     async executeQuery(compiledQuery, queryId) {
-        const result = await this.executeQueryImpl(compiledQuery, queryId);
-        return this.#transformResult(result, queryId);
+        return await this.provideConnection(async (connection) => {
+            const result = await connection.executeQuery(compiledQuery);
+            return this.#transformResult(result, queryId);
+        });
     }
     async #transformResult(result, queryId) {
         for (const plugin of this.#plugins) {

package/dist/esm/driver/connection-provider.d.ts

@@ -4,5 +4,5 @@ export interface ConnectionProvider {
      * Provides a connection for the callback and takes care of disposing
      * the connection after the callback has been run.
      */
-    withConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
+    provideConnection<T>(consumer: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
 }

package/dist/esm/driver/default-connection-provider.d.ts

@@ -8,5 +8,5 @@ export declare class DefaultConnectionProvider implements ConnectionProvider {
      * Provides a connection for the callback and takes care of disposing
      * the connection after the callback has been run.
      */
-    withConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
+    provideConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
 }

package/dist/esm/driver/default-connection-provider.js

@@ -4,7 +4,7 @@ export class DefaultConnectionProvider {
     constructor(driver) {
         this.#driver = driver;
     }
-    async withConnection(runner) {
+    async provideConnection(runner) {
         const connection = await this.#driver.acquireConnection();
         try {
             return await runner(connection);

package/dist/esm/driver/single-connection-provider.d.ts

@@ -7,5 +7,5 @@ export declare class SingleConnectionProvider implements ConnectionProvider {
      * Provides a connection for the callback and takes care of disposing
      * the connection after the callback has been run.
      */
-    withConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
+    provideConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
 }

package/dist/esm/driver/single-connection-provider.js

@@ -5,7 +5,7 @@ export class SingleConnectionProvider {
     constructor(connection) {
         this.#connection = connection;
     }
-    async withConnection(runner) {
+    async provideConnection(runner) {
         while (this.#runningPromise) {
             await this.#runningPromise;
         }

package/dist/esm/kysely.js

@@ -333,18 +333,14 @@ export class ConnectionBuilder {
         this.#props = freeze(props);
     }
     async execute(callback) {
-        const connection = await this.#props.driver.acquireConnection();
-        const connectionProvider = new SingleConnectionProvider(connection);
-        const db = new Kysely({
-            ...this.#props,
-            executor: this.#props.executor.withConnectionProvider(connectionProvider),
-        });
-        try {
+        return this.#props.executor.provideConnection(async (connection) => {
+            const executor = this.#props.executor.withConnectionProvider(new SingleConnectionProvider(connection));
+            const db = new Kysely({
+                ...this.#props,
+                executor,
+            });
             return await callback(db);
-        }
-        finally {
-            await this.#props.driver.releaseConnection(connection);
-        }
+        });
     }
 }
 preventAwait(ConnectionBuilder, "don't await ConnectionBuilder instances directly. To execute the query you need to call the `execute` method");
@@ -363,25 +359,23 @@ export class TransactionBuilder {
         const { isolationLevel, ...kyselyProps } = this.#props;
         const settings = { isolationLevel };
         validateTransactionSettings(settings);
-        const connection = await this.#props.driver.acquireConnection();
-        const connectionProvider = new SingleConnectionProvider(connection);
-        const transaction = new Transaction({
-            ...kyselyProps,
-            executor: this.#props.executor.withConnectionProvider(connectionProvider),
+        return this.#props.executor.provideConnection(async (connection) => {
+            const executor = this.#props.executor.withConnectionProvider(new SingleConnectionProvider(connection));
+            const transaction = new Transaction({
+                ...kyselyProps,
+                executor,
+            });
+            try {
+                await this.#props.driver.beginTransaction(connection, settings);
+                const result = await callback(transaction);
+                await this.#props.driver.commitTransaction(connection);
+                return result;
+            }
+            catch (error) {
+                await this.#props.driver.rollbackTransaction(connection);
+                throw error;
+            }
         });
-        try {
-            await this.#props.driver.beginTransaction(connection, settings);
-            const result = await callback(transaction);
-            await this.#props.driver.commitTransaction(connection);
-            return result;
-        }
-        catch (error) {
-            await this.#props.driver.rollbackTransaction(connection);
-            throw error;
-        }
-        finally {
-            await this.#props.driver.releaseConnection(connection);
-        }
     }
 }
 preventAwait(TransactionBuilder, "don't await TransactionBuilder instances directly. To execute the transaction you need to call the `execute` method");

package/dist/esm/query-executor/default-query-executor.d.ts

@@ -1,5 +1,5 @@
 import { ConnectionProvider } from '../driver/connection-provider.js';
-import { QueryResult } from '../driver/database-connection.js';
+import { DatabaseConnection } from '../driver/database-connection.js';
 import { CompiledQuery } from '../query-compiler/compiled-query.js';
 import { RootOperationNode, QueryCompiler } from '../query-compiler/query-compiler.js';
 import { KyselyPlugin } from '../plugin/kysely-plugin.js';
@@ -15,7 +15,11 @@ export declare class DefaultQueryExecutor extends QueryExecutor {
      * compile any query using this method.
      */
     compileQuery(node: RootOperationNode): CompiledQuery;
-    protected executeQueryImpl<R>(compiledQuery: CompiledQuery): Promise<QueryResult<R>>;
+    /**
+     * Provides a connection for the callback and takes care of disposing
+     * the connection after the callback has been run.
+     */
+    provideConnection<T>(consumer: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
     /**
      * Returns a copy of this executor with a list of plugins added
      * as the last plugins.

package/dist/esm/query-executor/default-query-executor.js

@@ -16,10 +16,8 @@ export class DefaultQueryExecutor extends QueryExecutor {
     compileQuery(node) {
         return this.#compiler.compileQuery(node);
     }
-    async executeQueryImpl(compiledQuery) {
-        return this.#connectionProvider.withConnection((connection) => {
-            return connection.executeQuery(compiledQuery);
-        });
+    provideConnection(consumer) {
+        return this.#connectionProvider.provideConnection(consumer);
     }
     withPlugins(plugins) {
         return new DefaultQueryExecutor(this.#compiler, this.#adapter, this.#connectionProvider, [...this.plugins, ...plugins]);

package/dist/esm/query-executor/noop-query-executor.d.ts

@@ -1,4 +1,3 @@
-import { QueryResult } from '../driver/database-connection.js';
 import { CompiledQuery } from '../query-compiler/compiled-query.js';
 import { QueryExecutor } from './query-executor.js';
 import { KyselyPlugin } from '../plugin/kysely-plugin.js';
@@ -16,7 +15,11 @@ export declare class NoopQueryExecutor extends QueryExecutor {
      * compile any query using this method.
      */
     compileQuery(): CompiledQuery;
-    protected executeQueryImpl<R>(): Promise<QueryResult<R>>;
+    /**
+     * Provides a connection for the callback and takes care of disposing
+     * the connection after the callback has been run.
+     */
+    provideConnection<T>(): Promise<T>;
     /**
      * Returns a copy of this executor with a new connection provider.
      */

package/dist/esm/query-executor/noop-query-executor.js

@@ -12,7 +12,7 @@ export class NoopQueryExecutor extends QueryExecutor {
     compileQuery() {
         throw new Error('this query cannot be compiled to SQL');
     }
-    async executeQueryImpl() {
+    provideConnection() {
         throw new Error('this query cannot be executed');
     }
     withConnectionProvider() {

package/dist/esm/query-executor/query-executor.d.ts

@@ -1,5 +1,5 @@
 import { ConnectionProvider } from '../driver/connection-provider.js';
-import { QueryResult } from '../driver/database-connection.js';
+import { DatabaseConnection, QueryResult } from '../driver/database-connection.js';
 import { CompiledQuery } from '../query-compiler/compiled-query.js';
 import { RootOperationNode } from '../query-compiler/query-compiler.js';
 import { KyselyPlugin } from '../plugin/kysely-plugin.js';
@@ -11,7 +11,7 @@ import { DialectAdapter } from '../dialect/dialect-adapter.js';
  * and other classes that execute queries can just pass around and instance of
  * `QueryExecutor`.
  */
-export declare abstract class QueryExecutor {
+export declare abstract class QueryExecutor implements ConnectionProvider {
     #private;
     constructor(plugins?: KyselyPlugin[]);
     abstract get adapter(): DialectAdapter;
@@ -28,15 +28,16 @@ export declare abstract class QueryExecutor {
      * compile any query using this method.
      */
     abstract compileQuery(node: RootOperationNode, queryId: QueryId): CompiledQuery;
+    /**
+     * Provides a connection for the callback and takes care of disposing
+     * the connection after the callback has been run.
+     */
+    abstract provideConnection<T>(consumer: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
     /**
      * Executes a compiled query and runs the result through all plugins'
      * `transformResult` method.
      */
     executeQuery<R>(compiledQuery: CompiledQuery, queryId: QueryId): Promise<QueryResult<R>>;
-    /**
-     * Executes a compiled query.
-     */
-    protected abstract executeQueryImpl<R>(compiledQuery: CompiledQuery, queryId: QueryId): Promise<QueryResult<R>>;
     /**
      * Returns a copy of this executor with a new connection provider.
      */

package/dist/esm/query-executor/query-executor.js

@@ -44,8 +44,10 @@ export class QueryExecutor {
      * `transformResult` method.
      */
     async executeQuery(compiledQuery, queryId) {
-        const result = await this.executeQueryImpl(compiledQuery, queryId);
-        return this.#transformResult(result, queryId);
+        return await this.provideConnection(async (connection) => {
+            const result = await connection.executeQuery(compiledQuery);
+            return this.#transformResult(result, queryId);
+        });
     }
     async #transformResult(result, queryId) {
         for (const plugin of this.#plugins) {

package/package.json

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