drizzle-orm 1.0.0-beta.21 → 1.0.0-beta.21-4fa69ab

package/bun-sql/postgres/migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.js","names":["coreMigrate"],"sources":["../../../src/bun-sql/postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/async/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { BunSQLDatabase } from './driver.ts';\n\nexport async function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(\n\tdb: BunSQLDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn await coreMigrate(migrations, db, config);\n}\n"],"mappings":";;;;AAMA,eAAsB,QACrB,IACA,QACC;AAED,QAAO,MAAMA,UADM,mBAAmB,OAAO,EACR,IAAI,OAAO"}
+{"version":3,"file":"migrator.js","names":["coreMigrate"],"sources":["../../../src/bun-sql/postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/async/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { BunSQLDatabase } from './driver.ts';\n\nexport async function migrate<TRelations extends AnyRelations>(\n\tdb: BunSQLDatabase<TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn await coreMigrate(migrations, db, config);\n}\n"],"mappings":";;;;AAMA,eAAsB,QACrB,IACA,QACC;AAED,QAAO,MAAMA,UADM,mBAAmB,OAAO,EACR,IAAI,OAAO"}

package/bun-sql/postgres/session.cjs

@@ -1,129 +1,35 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../../_virtual/_rolldown/runtime.cjs');
 let __entity_ts = require("../../entity.cjs");
-let __tracing_ts = require("../../tracing.cjs");
-let __utils_ts = require("../../utils.cjs");
-let __sql_sql_ts = require("../../sql/sql.cjs");
 let __logger_ts = require("../../logger.cjs");
 let __cache_core_index_ts = require("../../cache/core/index.cjs");
 let __pg_core_async_session_ts = require("../../pg-core/async/session.cjs");
 
 //#region src/bun-sql/postgres/session.ts
-var BunSQLPreparedQuery = class extends __pg_core_async_session_ts.PgAsyncPreparedQuery {
-	static [__entity_ts.entityKind] = "BunSQLPreparedQuery";
-	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
-		super(query, cache, queryMetadata, cacheConfig);
-		this.client = client;
-		this.logger = logger;
-		this.fields = fields;
-		this._isResponseInArrayMode = _isResponseInArrayMode;
-		this.customResultMapper = customResultMapper;
-		this.isRqbV2Query = isRqbV2Query;
-	}
-	async execute(placeholderValues = {}) {
-		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
-		return __tracing_ts.tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-			span?.setAttributes({
-				"drizzle.query.text": this.query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			this.logger.logQuery(this.query.sql, params);
-			const { fields, query, client, joinsNotNullableMap, customResultMapper } = this;
-			if (!fields && !customResultMapper) return __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				return await this.queryWithCache(query.sql, params, async () => {
-					return await client.unsafe(query.sql, params);
-				});
-			});
-			const rows = await __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				span?.setAttributes({
-					"drizzle.query.text": query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return await this.queryWithCache(query.sql, params, async () => {
-					return client.unsafe(query.sql, params).values();
-				});
-			});
-			return __tracing_ts.tracer.startActiveSpan("drizzle.mapResponse", () => {
-				return customResultMapper ? customResultMapper(rows) : rows.map((row) => (0, __utils_ts.mapResultRow)(fields, row, joinsNotNullableMap));
-			});
-		});
-	}
-	async executeRqbV2(placeholderValues = {}) {
-		return __tracing_ts.tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-			span?.setAttributes({
-				"drizzle.query.text": this.query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			this.logger.logQuery(this.query.sql, params);
-			const { query, client, customResultMapper } = this;
-			const rows = await __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", () => {
-				span?.setAttributes({
-					"drizzle.query.text": query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return client.unsafe(query.sql, params);
-			});
-			return __tracing_ts.tracer.startActiveSpan("drizzle.mapResponse", () => {
-				return customResultMapper(rows);
-			});
-		});
-	}
-	all(placeholderValues = {}) {
-		return __tracing_ts.tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-			span?.setAttributes({
-				"drizzle.query.text": this.query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			this.logger.logQuery(this.query.sql, params);
-			return __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				span?.setAttributes({
-					"drizzle.query.text": this.query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return await this.queryWithCache(this.query.sql, params, async () => {
-					return await this.client.unsafe(this.query.sql, params);
-				});
-			});
-		});
-	}
-	/** @internal */
-	isResponseInArrayMode() {
-		return this._isResponseInArrayMode;
-	}
-};
 var BunSQLSession = class BunSQLSession extends __pg_core_async_session_ts.PgAsyncSession {
 	static [__entity_ts.entityKind] = "BunSQLSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, schema, options = {}) {
+	constructor(client, dialect, relations, options = {}) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
-		this.schema = schema;
 		this.options = options;
 		this.logger = options.logger ?? new __logger_ts.NoopLogger();
 		this.cache = options.cache ?? new __cache_core_index_ts.NoopCache();
 	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new BunSQLPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new BunSQLPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, true, customResultMapper, true);
-	}
-	query(query, params) {
-		this.logger.logQuery(query, params);
-		return this.client.unsafe(query, params).values();
-	}
-	queryObjects(query, params) {
-		return this.client.unsafe(query, params);
+	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
+		const executor = async (params) => {
+			if (mode === "arrays") return this.client.unsafe(query.sql, params).values();
+			if (mode === "objects") return this.client.unsafe(query.sql, params);
+			return this.client.unsafe(query.sql, params);
+		};
+		return new __pg_core_async_session_ts.PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
 	}
 	transaction(transaction, config) {
 		return this.client.begin(async (client) => {
-			const session = new BunSQLSession(client, this.dialect, this.relations, this.schema, this.options);
-			const tx = new BunSQLTransaction(this.dialect, session, this.relations, this.schema);
+			const session = new BunSQLSession(client, this.dialect, this.relations, this.options);
+			const tx = new BunSQLTransaction(this.dialect, session, this.relations);
 			if (config) await tx.setTransaction(config);
 			return transaction(tx);
 		});
@@ -131,20 +37,19 @@ var BunSQLSession = class BunSQLSession extends __pg_core_async_session_ts.PgAsy
 };
 var BunSQLTransaction = class BunSQLTransaction extends __pg_core_async_session_ts.PgAsyncTransaction {
 	static [__entity_ts.entityKind] = "BunSQLTransaction";
-	constructor(dialect, session, relations, schema, nestedIndex = 0) {
-		super(dialect, session, relations, schema, nestedIndex);
+	constructor(dialect, session, relations, nestedIndex = 0) {
+		super(dialect, session, relations, nestedIndex, false);
 		this.session = session;
 	}
-	transaction(transaction) {
+	transaction = (transaction) => {
 		return this.session.client.savepoint((client) => {
-			const session = new BunSQLSession(client, this.dialect, this.relations, this.schema, this.session.options);
-			return transaction(new BunSQLTransaction(this.dialect, session, this.relations, this.schema));
+			const session = new BunSQLSession(client, this.dialect, this._.relations, this.session.options);
+			return transaction(new BunSQLTransaction(this.dialect, session, this._.relations));
 		});
-	}
+	};
 };
 
 //#endregion
-exports.BunSQLPreparedQuery = BunSQLPreparedQuery;
 exports.BunSQLSession = BunSQLSession;
 exports.BunSQLTransaction = BunSQLTransaction;
 //# sourceMappingURL=session.cjs.map

package/bun-sql/postgres/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["PgAsyncPreparedQuery","entityKind","tracer","PgAsyncSession","NoopLogger","NoopCache","PgAsyncTransaction"],"sources":["../../../src/bun-sql/postgres/session.ts"],"sourcesContent":["/// <reference types=\"bun-types\" />\n\nimport type { SavepointSQL, SQL, TransactionSQL } from 'bun';\nimport type * as V1 from '~/_relations.ts';\nimport { type Cache, NoopCache } from '~/cache/core/index.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { SelectedFieldsOrdered } from '~/pg-core/query-builders/select.types.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { fillPlaceholders, type Query } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\n\nexport class BunSQLPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends PgAsyncPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'BunSQLPreparedQuery';\n\n\tconstructor(\n\t\tprivate client: SQL,\n\t\tquery: Query,\n\t\tprivate logger: Logger,\n\t\tcache: Cache,\n\t\tqueryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\tcacheConfig: WithCacheConfig | undefined,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => T['execute'],\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t) {\n\t\tsuper(query, cache, queryMetadata, cacheConfig);\n\t}\n\n\tasync execute(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);\n\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\t\tconst { fields, query, client, joinsNotNullableMap, customResultMapper } = this;\n\t\t\tif (!fields && !customResultMapper) {\n\t\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\t\treturn await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\t\treturn await client.unsafe(query.sql, params as any[]);\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tconst rows: any[] = await tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\n\t\t\t\treturn await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\treturn client.unsafe(query.sql, params as any[]).values();\n\t\t\t\t});\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn customResultMapper\n\t\t\t\t\t? customResultMapper(rows)\n\t\t\t\t\t: rows.map((row) => mapResultRow<T['execute']>(fields!, row, joinsNotNullableMap));\n\t\t\t});\n\t\t});\n\t}\n\n\tasync executeRqbV2(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\t\tconst { query, client, customResultMapper } = this;\n\n\t\t\tconst rows = await tracer.startActiveSpan('drizzle.driver.execute', () => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\n\t\t\t\treturn client.unsafe(query.sql, params as any[]);\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(rows);\n\t\t\t});\n\t\t});\n\t}\n\n\tall(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['all']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\t\t\t\treturn await this.queryWithCache(this.query.sql, params, async () => {\n\t\t\t\t\treturn await this.client.unsafe(this.query.sql, params as any[]);\n\t\t\t\t});\n\t\t\t});\n\t\t});\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport interface BunSQLSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class BunSQLSession<\n\tTSQL extends SQL,\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<BunSQLQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'BunSQLSession';\n\n\tlogger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\treadonly client: TSQL,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\t/** @internal */\n\t\treadonly options: BunSQLSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new BunSQLPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t\tfields,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper?: (rows: Record<string, unknown>[]) => T['execute'],\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new BunSQLPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfields,\n\t\t\ttrue,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\tquery(query: string, params: unknown[]): Promise<any> {\n\t\tthis.logger.logQuery(query, params);\n\t\treturn this.client.unsafe(query, params as any[]).values();\n\t}\n\n\tqueryObjects(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<any> {\n\t\treturn this.client.unsafe(query, params as any[]);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: BunSQLTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig,\n\t): Promise<T> {\n\t\treturn this.client.begin(async (client) => {\n\t\t\tconst session = new BunSQLSession<TransactionSQL, TFullSchema, TRelations, TSchema>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t\tthis.options,\n\t\t\t);\n\t\t\tconst tx = new BunSQLTransaction(this.dialect, session, this.relations, this.schema);\n\t\t\tif (config) {\n\t\t\t\tawait tx.setTransaction(config);\n\t\t\t}\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t}\n}\n\nexport class BunSQLTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<BunSQLQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'BunSQLTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\t/** @internal */\n\t\toverride readonly session: BunSQLSession<\n\t\t\tTransactionSQL | SavepointSQL,\n\t\t\tTFullSchema,\n\t\t\tTRelations,\n\t\t\tTSchema\n\t\t>,\n\t\trelations: TRelations,\n\t\tschema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tnestedIndex = 0,\n\t) {\n\t\tsuper(dialect, session, relations, schema, nestedIndex);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: BunSQLTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\treturn (this.session.client as TransactionSQL).savepoint((client) => {\n\t\t\tconst session = new BunSQLSession<SavepointSQL, TFullSchema, TRelations, TSchema>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t\tthis.session.options,\n\t\t\t);\n\t\t\tconst tx = new BunSQLTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\t\tthis.dialect,\n\t\t\t\tsession,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t);\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t}\n}\n\nexport interface BunSQLQueryResultHKT extends PgQueryResultHKT {\n\ttype: Assume<this['row'], Record<string, any>[]>;\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.cjs","names":["PgAsyncSession","entityKind","NoopLogger","NoopCache","PgAsyncPreparedQuery","PgAsyncTransaction"],"sources":["../../../src/bun-sql/postgres/session.ts"],"sourcesContent":["/// <reference types=\"bun-types\" />\n\nimport type { SavepointSQL, SQL, TransactionSQL } from 'bun';\nimport { type Cache, NoopCache } from '~/cache/core/index.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query } from '~/sql/sql.ts';\n\nexport interface BunSQLSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class BunSQLSession<\n\tTSQL extends SQL,\n\tTRelations extends AnyRelations,\n> extends PgAsyncSession<BunSQLQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'BunSQLSession';\n\n\tlogger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\treadonly client: TSQL,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\t/** @internal */\n\t\treadonly options: BunSQLSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\t_name: string | boolean,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PgAsyncPreparedQuery<T> {\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\tif (mode === 'arrays') {\n\t\t\t\treturn this.client.unsafe(query.sql, params).values();\n\t\t\t}\n\t\t\tif (mode === 'objects') {\n\t\t\t\treturn this.client.unsafe(query.sql, params);\n\t\t\t}\n\n\t\t\treturn this.client.unsafe(query.sql, params);\n\t\t};\n\n\t\treturn new PgAsyncPreparedQuery<T>(\n\t\t\texecutor,\n\t\t\tquery,\n\t\t\tmapper,\n\t\t\tmode,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: BunSQLTransaction<TRelations>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig,\n\t): Promise<T> {\n\t\treturn this.client.begin(async (client) => {\n\t\t\tconst session = new BunSQLSession<TransactionSQL, TRelations>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.options,\n\t\t\t);\n\t\t\tconst tx = new BunSQLTransaction(this.dialect, session, this.relations);\n\t\t\tif (config) {\n\t\t\t\tawait tx.setTransaction(config);\n\t\t\t}\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t}\n}\n\nexport class BunSQLTransaction<\n\tTRelations extends AnyRelations,\n> extends PgAsyncTransaction<BunSQLQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'BunSQLTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\t/** @internal */\n\t\toverride readonly session: BunSQLSession<\n\t\t\tTransactionSQL | SavepointSQL,\n\t\t\tTRelations\n\t\t>,\n\t\trelations: TRelations,\n\t\tnestedIndex = 0,\n\t) {\n\t\tsuper(dialect, session, relations, nestedIndex, false);\n\t}\n\n\toverride transaction = <T>(\n\t\ttransaction: (tx: BunSQLTransaction<TRelations>) => Promise<T>,\n\t): Promise<T> => {\n\t\treturn (this.session.client as TransactionSQL).savepoint((client) => {\n\t\t\tconst session = new BunSQLSession<SavepointSQL, TRelations>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis._.relations,\n\t\t\t\tthis.session.options,\n\t\t\t);\n\t\t\tconst tx = new BunSQLTransaction<TRelations>(\n\t\t\t\tthis.dialect,\n\t\t\t\tsession,\n\t\t\t\tthis._.relations,\n\t\t\t);\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t};\n}\n\nexport interface BunSQLQueryResultHKT extends PgQueryResultHKT {\n\ttype: this['row'][];\n}\n"],"mappings":";;;;;;;;AAoBA,IAAa,gBAAb,MAAa,sBAGHA,0CAAiD;CAC1D,QAA0BC,0BAAsB;CAEhD;CACA,AAAQ;CAER,YACC,AAAS,QACT,SACA,AAAQ,WAER,AAAS,UAAgC,EAAE,EAC1C;AACD,QAAM,QAAQ;EANL;EAED;EAEC;AAGT,OAAK,SAAS,QAAQ,UAAU,IAAIC,wBAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAIC,iCAAW;;CAG9C,aACC,OACA,MACA,OACA,QACA,eAIA,aAC0B;EAC1B,MAAM,WAAW,OAAO,WAAuB;AAC9C,OAAI,SAAS,SACZ,QAAO,KAAK,OAAO,OAAO,MAAM,KAAK,OAAO,CAAC,QAAQ;AAEtD,OAAI,SAAS,UACZ,QAAO,KAAK,OAAO,OAAO,MAAM,KAAK,OAAO;AAG7C,UAAO,KAAK,OAAO,OAAO,MAAM,KAAK,OAAO;;AAG7C,SAAO,IAAIC,gDACV,UACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAGF,AAAS,YACR,aACA,QACa;AACb,SAAO,KAAK,OAAO,MAAM,OAAO,WAAW;GAC1C,MAAM,UAAU,IAAI,cACnB,QACA,KAAK,SACL,KAAK,WACL,KAAK,QACL;GACD,MAAM,KAAK,IAAI,kBAAkB,KAAK,SAAS,SAAS,KAAK,UAAU;AACvE,OAAI,OACH,OAAM,GAAG,eAAe,OAAO;AAEhC,UAAO,YAAY,GAAG;IACrB;;;AAIJ,IAAa,oBAAb,MAAa,0BAEHC,8CAAqD;CAC9D,QAA0BJ,0BAAsB;CAEhD,YACC,SAEA,AAAkB,SAIlB,WACA,cAAc,GACb;AACD,QAAM,SAAS,SAAS,WAAW,aAAa,MAAM;EAPpC;;CAUnB,AAAS,eACR,gBACgB;AAChB,SAAQ,KAAK,QAAQ,OAA0B,WAAW,WAAW;GACpE,MAAM,UAAU,IAAI,cACnB,QACA,KAAK,SACL,KAAK,EAAE,WACP,KAAK,QAAQ,QACb;AAMD,UAAO,YALI,IAAI,kBACd,KAAK,SACL,SACA,KAAK,EAAE,UACP,CACqB;IACrB"}

package/bun-sql/postgres/session.d.cts

@@ -1,67 +1,45 @@
 import { entityKind } from "../../entity.cjs";
 import { Query } from "../../sql/sql.cjs";
-import { Assume } from "../../utils.cjs";
-import * as V1 from "../../_relations.cjs";
 import { WithCacheConfig } from "../../cache/core/types.cjs";
 import { AnyRelations } from "../../relations.cjs";
 import { PgDialect } from "../../pg-core/dialect.cjs";
 import { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from "../../pg-core/session.cjs";
-import { SelectedFieldsOrdered } from "../../pg-core/query-builders/select.types.cjs";
-import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../../pg-core/async/session.cjs";
 import { Logger } from "../../logger.cjs";
+import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../../pg-core/async/session.cjs";
 import { Cache } from "../../cache/core/index.cjs";
 import { SQL as SQL$1, SavepointSQL, TransactionSQL } from "bun";
 
 //#region src/bun-sql/postgres/session.d.ts
-declare class BunSQLPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
-  private client;
-  private logger;
-  private fields;
-  private _isResponseInArrayMode;
-  private customResultMapper?;
-  private isRqbV2Query?;
-  static readonly [entityKind]: string;
-  constructor(client: SQL$1, query: Query, logger: Logger, cache: Cache, queryMetadata: {
-    type: 'select' | 'update' | 'delete' | 'insert';
-    tables: string[];
-  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
-  execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
-  executeRqbV2(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
-  all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
-}
 interface BunSQLSessionOptions {
   logger?: Logger;
   cache?: Cache;
+  useJitMapper?: boolean;
 }
-declare class BunSQLSession<TSQL extends SQL$1, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<BunSQLQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class BunSQLSession<TSQL extends SQL$1, TRelations extends AnyRelations> extends PgAsyncSession<BunSQLQueryResultHKT, TRelations> {
   readonly client: TSQL;
   private relations;
-  private schema;
   static readonly [entityKind]: string;
   logger: Logger;
   private cache;
-  constructor(client: TSQL, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, /** @internal */
+  constructor(client: TSQL, dialect: PgDialect, relations: TRelations, /** @internal */
 
   options?: BunSQLSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): PgAsyncPreparedQuery<T>;
-  query(query: string, params: unknown[]): Promise<any>;
-  queryObjects(query: string, params: unknown[]): Promise<any>;
-  transaction<T>(transaction: (tx: BunSQLTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
+  transaction<T>(transaction: (tx: BunSQLTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
-declare class BunSQLTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<BunSQLQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class BunSQLTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<BunSQLQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
   constructor(dialect: PgDialect, /** @internal */
 
-  session: BunSQLSession<TransactionSQL | SavepointSQL, TFullSchema, TRelations, TSchema>, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, nestedIndex?: number);
-  transaction<T>(transaction: (tx: BunSQLTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
+  session: BunSQLSession<TransactionSQL | SavepointSQL, TRelations>, relations: TRelations, nestedIndex?: number);
+  transaction: <T>(transaction: (tx: BunSQLTransaction<TRelations>) => Promise<T>) => Promise<T>;
 }
 interface BunSQLQueryResultHKT extends PgQueryResultHKT {
-  type: Assume<this['row'], Record<string, any>[]>;
+  type: this['row'][];
 }
 //#endregion
-export { BunSQLPreparedQuery, BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction };
+export { BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction };
 //# sourceMappingURL=session.d.cts.map

package/bun-sql/postgres/session.d.ts

@@ -1,7 +1,5 @@
 import { entityKind } from "../../entity.js";
-import { Assume } from "../../utils.js";
 import { Query } from "../../sql/sql.js";
-import * as V1 from "../../_relations.js";
 import { Logger } from "../../logger.js";
 import { PgDialect } from "../../pg-core/dialect.js";
 import { Cache } from "../../cache/core/index.js";
@@ -10,58 +8,38 @@ import { SQL as SQL$1, SavepointSQL, TransactionSQL } from "bun";
 import { AnyRelations } from "../../relations.js";
 import { WithCacheConfig } from "../../cache/core/types.js";
 import { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from "../../pg-core/session.js";
-import { SelectedFieldsOrdered } from "../../pg-core/query-builders/select.types.js";
 
 //#region src/bun-sql/postgres/session.d.ts
-declare class BunSQLPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
-  private client;
-  private logger;
-  private fields;
-  private _isResponseInArrayMode;
-  private customResultMapper?;
-  private isRqbV2Query?;
-  static readonly [entityKind]: string;
-  constructor(client: SQL$1, query: Query, logger: Logger, cache: Cache, queryMetadata: {
-    type: 'select' | 'update' | 'delete' | 'insert';
-    tables: string[];
-  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
-  execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
-  executeRqbV2(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
-  all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
-}
 interface BunSQLSessionOptions {
   logger?: Logger;
   cache?: Cache;
+  useJitMapper?: boolean;
 }
-declare class BunSQLSession<TSQL extends SQL$1, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<BunSQLQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class BunSQLSession<TSQL extends SQL$1, TRelations extends AnyRelations> extends PgAsyncSession<BunSQLQueryResultHKT, TRelations> {
   readonly client: TSQL;
   private relations;
-  private schema;
   static readonly [entityKind]: string;
   logger: Logger;
   private cache;
-  constructor(client: TSQL, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, /** @internal */
+  constructor(client: TSQL, dialect: PgDialect, relations: TRelations, /** @internal */
 
   options?: BunSQLSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): PgAsyncPreparedQuery<T>;
-  query(query: string, params: unknown[]): Promise<any>;
-  queryObjects(query: string, params: unknown[]): Promise<any>;
-  transaction<T>(transaction: (tx: BunSQLTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
+  transaction<T>(transaction: (tx: BunSQLTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
-declare class BunSQLTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<BunSQLQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class BunSQLTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<BunSQLQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
   constructor(dialect: PgDialect, /** @internal */
 
-  session: BunSQLSession<TransactionSQL | SavepointSQL, TFullSchema, TRelations, TSchema>, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, nestedIndex?: number);
-  transaction<T>(transaction: (tx: BunSQLTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
+  session: BunSQLSession<TransactionSQL | SavepointSQL, TRelations>, relations: TRelations, nestedIndex?: number);
+  transaction: <T>(transaction: (tx: BunSQLTransaction<TRelations>) => Promise<T>) => Promise<T>;
 }
 interface BunSQLQueryResultHKT extends PgQueryResultHKT {
-  type: Assume<this['row'], Record<string, any>[]>;
+  type: this['row'][];
 }
 //#endregion
-export { BunSQLPreparedQuery, BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction };
+export { BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction };
 //# sourceMappingURL=session.d.ts.map

package/bun-sql/postgres/session.js

@@ -1,127 +1,33 @@
 import { entityKind } from "../../entity.js";
-import { tracer } from "../../tracing.js";
-import { mapResultRow } from "../../utils.js";
-import { fillPlaceholders } from "../../sql/sql.js";
 import { NoopLogger } from "../../logger.js";
 import { NoopCache } from "../../cache/core/index.js";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../../pg-core/async/session.js";
 
 //#region src/bun-sql/postgres/session.ts
-var BunSQLPreparedQuery = class extends PgAsyncPreparedQuery {
-	static [entityKind] = "BunSQLPreparedQuery";
-	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
-		super(query, cache, queryMetadata, cacheConfig);
-		this.client = client;
-		this.logger = logger;
-		this.fields = fields;
-		this._isResponseInArrayMode = _isResponseInArrayMode;
-		this.customResultMapper = customResultMapper;
-		this.isRqbV2Query = isRqbV2Query;
-	}
-	async execute(placeholderValues = {}) {
-		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
-		return tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = fillPlaceholders(this.query.params, placeholderValues);
-			span?.setAttributes({
-				"drizzle.query.text": this.query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			this.logger.logQuery(this.query.sql, params);
-			const { fields, query, client, joinsNotNullableMap, customResultMapper } = this;
-			if (!fields && !customResultMapper) return tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				return await this.queryWithCache(query.sql, params, async () => {
-					return await client.unsafe(query.sql, params);
-				});
-			});
-			const rows = await tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				span?.setAttributes({
-					"drizzle.query.text": query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return await this.queryWithCache(query.sql, params, async () => {
-					return client.unsafe(query.sql, params).values();
-				});
-			});
-			return tracer.startActiveSpan("drizzle.mapResponse", () => {
-				return customResultMapper ? customResultMapper(rows) : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
-			});
-		});
-	}
-	async executeRqbV2(placeholderValues = {}) {
-		return tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = fillPlaceholders(this.query.params, placeholderValues);
-			span?.setAttributes({
-				"drizzle.query.text": this.query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			this.logger.logQuery(this.query.sql, params);
-			const { query, client, customResultMapper } = this;
-			const rows = await tracer.startActiveSpan("drizzle.driver.execute", () => {
-				span?.setAttributes({
-					"drizzle.query.text": query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return client.unsafe(query.sql, params);
-			});
-			return tracer.startActiveSpan("drizzle.mapResponse", () => {
-				return customResultMapper(rows);
-			});
-		});
-	}
-	all(placeholderValues = {}) {
-		return tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = fillPlaceholders(this.query.params, placeholderValues);
-			span?.setAttributes({
-				"drizzle.query.text": this.query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			this.logger.logQuery(this.query.sql, params);
-			return tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				span?.setAttributes({
-					"drizzle.query.text": this.query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return await this.queryWithCache(this.query.sql, params, async () => {
-					return await this.client.unsafe(this.query.sql, params);
-				});
-			});
-		});
-	}
-	/** @internal */
-	isResponseInArrayMode() {
-		return this._isResponseInArrayMode;
-	}
-};
 var BunSQLSession = class BunSQLSession extends PgAsyncSession {
 	static [entityKind] = "BunSQLSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, schema, options = {}) {
+	constructor(client, dialect, relations, options = {}) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
-		this.schema = schema;
 		this.options = options;
 		this.logger = options.logger ?? new NoopLogger();
 		this.cache = options.cache ?? new NoopCache();
 	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new BunSQLPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new BunSQLPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, true, customResultMapper, true);
-	}
-	query(query, params) {
-		this.logger.logQuery(query, params);
-		return this.client.unsafe(query, params).values();
-	}
-	queryObjects(query, params) {
-		return this.client.unsafe(query, params);
+	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
+		const executor = async (params) => {
+			if (mode === "arrays") return this.client.unsafe(query.sql, params).values();
+			if (mode === "objects") return this.client.unsafe(query.sql, params);
+			return this.client.unsafe(query.sql, params);
+		};
+		return new PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
 	}
 	transaction(transaction, config) {
 		return this.client.begin(async (client) => {
-			const session = new BunSQLSession(client, this.dialect, this.relations, this.schema, this.options);
-			const tx = new BunSQLTransaction(this.dialect, session, this.relations, this.schema);
+			const session = new BunSQLSession(client, this.dialect, this.relations, this.options);
+			const tx = new BunSQLTransaction(this.dialect, session, this.relations);
 			if (config) await tx.setTransaction(config);
 			return transaction(tx);
 		});
@@ -129,18 +35,18 @@ var BunSQLSession = class BunSQLSession extends PgAsyncSession {
 };
 var BunSQLTransaction = class BunSQLTransaction extends PgAsyncTransaction {
 	static [entityKind] = "BunSQLTransaction";
-	constructor(dialect, session, relations, schema, nestedIndex = 0) {
-		super(dialect, session, relations, schema, nestedIndex);
+	constructor(dialect, session, relations, nestedIndex = 0) {
+		super(dialect, session, relations, nestedIndex, false);
 		this.session = session;
 	}
-	transaction(transaction) {
+	transaction = (transaction) => {
 		return this.session.client.savepoint((client) => {
-			const session = new BunSQLSession(client, this.dialect, this.relations, this.schema, this.session.options);
-			return transaction(new BunSQLTransaction(this.dialect, session, this.relations, this.schema));
+			const session = new BunSQLSession(client, this.dialect, this._.relations, this.session.options);
+			return transaction(new BunSQLTransaction(this.dialect, session, this._.relations));
 		});
-	}
+	};
 };
 
 //#endregion
-export { BunSQLPreparedQuery, BunSQLSession, BunSQLTransaction };
+export { BunSQLSession, BunSQLTransaction };
 //# sourceMappingURL=session.js.map

package/bun-sql/postgres/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":[],"sources":["../../../src/bun-sql/postgres/session.ts"],"sourcesContent":["/// <reference types=\"bun-types\" />\n\nimport type { SavepointSQL, SQL, TransactionSQL } from 'bun';\nimport type * as V1 from '~/_relations.ts';\nimport { type Cache, NoopCache } from '~/cache/core/index.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { SelectedFieldsOrdered } from '~/pg-core/query-builders/select.types.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { fillPlaceholders, type Query } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\n\nexport class BunSQLPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends PgAsyncPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'BunSQLPreparedQuery';\n\n\tconstructor(\n\t\tprivate client: SQL,\n\t\tquery: Query,\n\t\tprivate logger: Logger,\n\t\tcache: Cache,\n\t\tqueryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\tcacheConfig: WithCacheConfig | undefined,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => T['execute'],\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t) {\n\t\tsuper(query, cache, queryMetadata, cacheConfig);\n\t}\n\n\tasync execute(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);\n\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\t\tconst { fields, query, client, joinsNotNullableMap, customResultMapper } = this;\n\t\t\tif (!fields && !customResultMapper) {\n\t\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\t\treturn await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\t\treturn await client.unsafe(query.sql, params as any[]);\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tconst rows: any[] = await tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\n\t\t\t\treturn await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\treturn client.unsafe(query.sql, params as any[]).values();\n\t\t\t\t});\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn customResultMapper\n\t\t\t\t\t? customResultMapper(rows)\n\t\t\t\t\t: rows.map((row) => mapResultRow<T['execute']>(fields!, row, joinsNotNullableMap));\n\t\t\t});\n\t\t});\n\t}\n\n\tasync executeRqbV2(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\t\tconst { query, client, customResultMapper } = this;\n\n\t\t\tconst rows = await tracer.startActiveSpan('drizzle.driver.execute', () => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\n\t\t\t\treturn client.unsafe(query.sql, params as any[]);\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(rows);\n\t\t\t});\n\t\t});\n\t}\n\n\tall(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['all']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\t\t\t\treturn await this.queryWithCache(this.query.sql, params, async () => {\n\t\t\t\t\treturn await this.client.unsafe(this.query.sql, params as any[]);\n\t\t\t\t});\n\t\t\t});\n\t\t});\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport interface BunSQLSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class BunSQLSession<\n\tTSQL extends SQL,\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<BunSQLQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'BunSQLSession';\n\n\tlogger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\treadonly client: TSQL,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\t/** @internal */\n\t\treadonly options: BunSQLSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new BunSQLPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t\tfields,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper?: (rows: Record<string, unknown>[]) => T['execute'],\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new BunSQLPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfields,\n\t\t\ttrue,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\tquery(query: string, params: unknown[]): Promise<any> {\n\t\tthis.logger.logQuery(query, params);\n\t\treturn this.client.unsafe(query, params as any[]).values();\n\t}\n\n\tqueryObjects(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<any> {\n\t\treturn this.client.unsafe(query, params as any[]);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: BunSQLTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig,\n\t): Promise<T> {\n\t\treturn this.client.begin(async (client) => {\n\t\t\tconst session = new BunSQLSession<TransactionSQL, TFullSchema, TRelations, TSchema>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t\tthis.options,\n\t\t\t);\n\t\t\tconst tx = new BunSQLTransaction(this.dialect, session, this.relations, this.schema);\n\t\t\tif (config) {\n\t\t\t\tawait tx.setTransaction(config);\n\t\t\t}\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t}\n}\n\nexport class BunSQLTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<BunSQLQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'BunSQLTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\t/** @internal */\n\t\toverride readonly session: BunSQLSession<\n\t\t\tTransactionSQL | SavepointSQL,\n\t\t\tTFullSchema,\n\t\t\tTRelations,\n\t\t\tTSchema\n\t\t>,\n\t\trelations: TRelations,\n\t\tschema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tnestedIndex = 0,\n\t) {\n\t\tsuper(dialect, session, relations, schema, nestedIndex);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: BunSQLTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\treturn (this.session.client as TransactionSQL).savepoint((client) => {\n\t\t\tconst session = new BunSQLSession<SavepointSQL, TFullSchema, TRelations, TSchema>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t\tthis.session.options,\n\t\t\t);\n\t\t\tconst tx = new BunSQLTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\t\tthis.dialect,\n\t\t\t\tsession,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t);\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t}\n}\n\nexport interface BunSQLQueryResultHKT extends PgQueryResultHKT {\n\ttype: Assume<this['row'], Record<string, any>[]>;\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.js","names":[],"sources":["../../../src/bun-sql/postgres/session.ts"],"sourcesContent":["/// <reference types=\"bun-types\" />\n\nimport type { SavepointSQL, SQL, TransactionSQL } from 'bun';\nimport { type Cache, NoopCache } from '~/cache/core/index.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query } from '~/sql/sql.ts';\n\nexport interface BunSQLSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class BunSQLSession<\n\tTSQL extends SQL,\n\tTRelations extends AnyRelations,\n> extends PgAsyncSession<BunSQLQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'BunSQLSession';\n\n\tlogger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\treadonly client: TSQL,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\t/** @internal */\n\t\treadonly options: BunSQLSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\t_name: string | boolean,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PgAsyncPreparedQuery<T> {\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\tif (mode === 'arrays') {\n\t\t\t\treturn this.client.unsafe(query.sql, params).values();\n\t\t\t}\n\t\t\tif (mode === 'objects') {\n\t\t\t\treturn this.client.unsafe(query.sql, params);\n\t\t\t}\n\n\t\t\treturn this.client.unsafe(query.sql, params);\n\t\t};\n\n\t\treturn new PgAsyncPreparedQuery<T>(\n\t\t\texecutor,\n\t\t\tquery,\n\t\t\tmapper,\n\t\t\tmode,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: BunSQLTransaction<TRelations>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig,\n\t): Promise<T> {\n\t\treturn this.client.begin(async (client) => {\n\t\t\tconst session = new BunSQLSession<TransactionSQL, TRelations>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.options,\n\t\t\t);\n\t\t\tconst tx = new BunSQLTransaction(this.dialect, session, this.relations);\n\t\t\tif (config) {\n\t\t\t\tawait tx.setTransaction(config);\n\t\t\t}\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t}\n}\n\nexport class BunSQLTransaction<\n\tTRelations extends AnyRelations,\n> extends PgAsyncTransaction<BunSQLQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'BunSQLTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\t/** @internal */\n\t\toverride readonly session: BunSQLSession<\n\t\t\tTransactionSQL | SavepointSQL,\n\t\t\tTRelations\n\t\t>,\n\t\trelations: TRelations,\n\t\tnestedIndex = 0,\n\t) {\n\t\tsuper(dialect, session, relations, nestedIndex, false);\n\t}\n\n\toverride transaction = <T>(\n\t\ttransaction: (tx: BunSQLTransaction<TRelations>) => Promise<T>,\n\t): Promise<T> => {\n\t\treturn (this.session.client as TransactionSQL).savepoint((client) => {\n\t\t\tconst session = new BunSQLSession<SavepointSQL, TRelations>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis._.relations,\n\t\t\t\tthis.session.options,\n\t\t\t);\n\t\t\tconst tx = new BunSQLTransaction<TRelations>(\n\t\t\t\tthis.dialect,\n\t\t\t\tsession,\n\t\t\t\tthis._.relations,\n\t\t\t);\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t};\n}\n\nexport interface BunSQLQueryResultHKT extends PgQueryResultHKT {\n\ttype: this['row'][];\n}\n"],"mappings":";;;;;;AAoBA,IAAa,gBAAb,MAAa,sBAGH,eAAiD;CAC1D,QAA0B,cAAsB;CAEhD;CACA,AAAQ;CAER,YACC,AAAS,QACT,SACA,AAAQ,WAER,AAAS,UAAgC,EAAE,EAC1C;AACD,QAAM,QAAQ;EANL;EAED;EAEC;AAGT,OAAK,SAAS,QAAQ,UAAU,IAAI,YAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAI,WAAW;;CAG9C,aACC,OACA,MACA,OACA,QACA,eAIA,aAC0B;EAC1B,MAAM,WAAW,OAAO,WAAuB;AAC9C,OAAI,SAAS,SACZ,QAAO,KAAK,OAAO,OAAO,MAAM,KAAK,OAAO,CAAC,QAAQ;AAEtD,OAAI,SAAS,UACZ,QAAO,KAAK,OAAO,OAAO,MAAM,KAAK,OAAO;AAG7C,UAAO,KAAK,OAAO,OAAO,MAAM,KAAK,OAAO;;AAG7C,SAAO,IAAI,qBACV,UACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAGF,AAAS,YACR,aACA,QACa;AACb,SAAO,KAAK,OAAO,MAAM,OAAO,WAAW;GAC1C,MAAM,UAAU,IAAI,cACnB,QACA,KAAK,SACL,KAAK,WACL,KAAK,QACL;GACD,MAAM,KAAK,IAAI,kBAAkB,KAAK,SAAS,SAAS,KAAK,UAAU;AACvE,OAAI,OACH,OAAM,GAAG,eAAe,OAAO;AAEhC,UAAO,YAAY,GAAG;IACrB;;;AAIJ,IAAa,oBAAb,MAAa,0BAEH,mBAAqD;CAC9D,QAA0B,cAAsB;CAEhD,YACC,SAEA,AAAkB,SAIlB,WACA,cAAc,GACb;AACD,QAAM,SAAS,SAAS,WAAW,aAAa,MAAM;EAPpC;;CAUnB,AAAS,eACR,gBACgB;AAChB,SAAQ,KAAK,QAAQ,OAA0B,WAAW,WAAW;GACpE,MAAM,UAAU,IAAI,cACnB,QACA,KAAK,SACL,KAAK,EAAE,WACP,KAAK,QAAQ,QACb;AAMD,UAAO,YALI,IAAI,kBACd,KAAK,SACL,SACA,KAAK,EAAE,UACP,CACqB;IACrB"}

package/bun-sql/session.cjs

@@ -1,6 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_bun_sql_postgres_session = require('./postgres/session.cjs');
 
-exports.BunSQLPreparedQuery = require_bun_sql_postgres_session.BunSQLPreparedQuery;
 exports.BunSQLSession = require_bun_sql_postgres_session.BunSQLSession;
 exports.BunSQLTransaction = require_bun_sql_postgres_session.BunSQLTransaction;

package/bun-sql/session.d.cts

@@ -1,2 +1,2 @@
-import { BunSQLPreparedQuery, BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction } from "./postgres/session.cjs";
-export { BunSQLPreparedQuery, BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction };
+import { BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction } from "./postgres/session.cjs";
+export { BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction };

package/bun-sql/session.d.ts

@@ -1,2 +1,2 @@
-import { BunSQLPreparedQuery, BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction } from "./postgres/session.js";
-export { BunSQLPreparedQuery, BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction };
+import { BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction } from "./postgres/session.js";
+export { BunSQLQueryResultHKT, BunSQLSession, BunSQLSessionOptions, BunSQLTransaction };

package/bun-sql/session.js

@@ -1,3 +1,3 @@
-import { BunSQLPreparedQuery, BunSQLSession, BunSQLTransaction } from "./postgres/session.js";
+import { BunSQLSession, BunSQLTransaction } from "./postgres/session.js";
 
-export { BunSQLPreparedQuery, BunSQLSession, BunSQLTransaction };
+export { BunSQLSession, BunSQLTransaction };