drizzle-orm 1.0.0-beta.21 → 1.0.0-beta.21-af6b4cb

package/postgres-js/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 __logger_ts = require("../logger.cjs");
 let __pg_core_async_session_ts = require("../pg-core/async/session.cjs");
 
 //#region src/postgres-js/session.ts
-var PostgresJsPreparedQuery = class extends __pg_core_async_session_ts.PgAsyncPreparedQuery {
-	static [__entity_ts.entityKind] = "PostgresJsPreparedQuery";
-	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", () => {
-				return this.queryWithCache(query.sql, params, async () => {
-					return await client.unsafe(query.sql, params);
-				});
-			});
-			const rows = await __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", () => {
-				span?.setAttributes({
-					"drizzle.query.text": query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return this.queryWithCache(query.sql, params, async () => {
-					return await 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", () => {
-				span?.setAttributes({
-					"drizzle.query.text": this.query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return this.queryWithCache(this.query.sql, params, async () => {
-					return this.client.unsafe(this.query.sql, params);
-				});
-			});
-		});
-	}
-	/** @internal */
-	isResponseInArrayMode() {
-		return this._isResponseInArrayMode;
-	}
-};
 var PostgresJsSession = class PostgresJsSession extends __pg_core_async_session_ts.PgAsyncSession {
 	static [__entity_ts.entityKind] = "PostgresJsSession";
 	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 PostgresJsPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new PostgresJsPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, false, 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 === "objects") return this.client.unsafe(query.sql, params ?? [], { prepare: name !== false }).then((rows) => Object.values(rows));
+			if (mode === "raw") return this.client.unsafe(query.sql, params ?? [], { prepare: name !== false });
+			return this.client.unsafe(query.sql, params ?? [], { prepare: name !== false }).values();
+		};
+		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 PostgresJsSession(client, this.dialect, this.relations, this.schema, this.options);
-			const tx = new PostgresJsTransaction(this.dialect, session, this.schema, this.relations);
+			const session = new PostgresJsSession(client, this.dialect, this.relations, this.options);
+			const tx = new PostgresJsTransaction(this.dialect, session, this.relations);
 			if (config) await tx.setTransaction(config);
 			return transaction(tx);
 		});
@@ -131,20 +37,19 @@ var PostgresJsSession = class PostgresJsSession extends __pg_core_async_session_
 };
 var PostgresJsTransaction = class PostgresJsTransaction extends __pg_core_async_session_ts.PgAsyncTransaction {
 	static [__entity_ts.entityKind] = "PostgresJsTransaction";
-	constructor(dialect, session, schema, relations, 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 PostgresJsSession(client, this.dialect, this.relations, this.schema, this.session.options);
-			return transaction(new PostgresJsTransaction(this.dialect, session, this.schema, this.relations));
+			const session = new PostgresJsSession(client, this.dialect, this._.relations, this.session.options);
+			return transaction(new PostgresJsTransaction(this.dialect, session, this._.relations));
 		});
-	}
+	};
 };
 
 //#endregion
-exports.PostgresJsPreparedQuery = PostgresJsPreparedQuery;
 exports.PostgresJsSession = PostgresJsSession;
 exports.PostgresJsTransaction = PostgresJsTransaction;
 //# sourceMappingURL=session.cjs.map

package/postgres-js/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["PgAsyncPreparedQuery","entityKind","tracer","PgAsyncSession","NoopLogger","NoopCache","PgAsyncTransaction"],"sources":["../../src/postgres-js/session.ts"],"sourcesContent":["import type { Row, RowList, Sql, TransactionSql } from 'postgres';\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 } from '~/pg-core/session.ts';\nimport type { 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 PostgresJsPreparedQuery<\n\tT extends PreparedQueryConfig,\n\tTIsRqbV2 extends boolean = false,\n> extends PgAsyncPreparedQuery<T> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsPreparedQuery';\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', () => {\n\t\t\t\t\treturn 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 = 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\t\t\t\treturn this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\treturn await 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 as (rows: unknown[][]) => T['execute'])(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\tprivate async 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', () => {\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 this.queryWithCache(this.query.sql, params, async () => {\n\t\t\t\t\treturn 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 PostgresJsSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class PostgresJsSession<\n\tTSQL extends Sql,\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsSession';\n\n\tlogger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tpublic 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: PostgresJsSessionOptions = {},\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 PostgresJsPreparedQuery(\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 PostgresJsPreparedQuery(\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\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\tquery(query: string, params: unknown[]): Promise<RowList<Row[]>> {\n\t\tthis.logger.logQuery(query, params);\n\t\treturn this.client.unsafe(query, params as any[]).values();\n\t}\n\n\tqueryObjects<T extends Row>(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<RowList<T[]>> {\n\t\treturn this.client.unsafe(query, params as any[]);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: PostgresJsTransaction<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 PostgresJsSession<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 PostgresJsTransaction(this.dialect, session, this.schema, 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 PostgresJsTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\t/** @internal */\n\t\toverride readonly session: PostgresJsSession<TransactionSql, TFullSchema, TRelations, TSchema>,\n\t\tschema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\trelations: TRelations,\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: PostgresJsTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\treturn this.session.client.savepoint((client) => {\n\t\t\tconst session = new PostgresJsSession<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.session.options,\n\t\t\t);\n\t\t\tconst tx = new PostgresJsTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\t\tthis.dialect,\n\t\t\t\tsession,\n\t\t\t\tthis.schema,\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 PostgresJsQueryResultHKT extends PgQueryResultHKT {\n\ttype: RowList<Assume<this['row'], Row>[]>;\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.cjs","names":["PgAsyncSession","entityKind","NoopLogger","NoopCache","PgAsyncPreparedQuery","PgAsyncTransaction"],"sources":["../../src/postgres-js/session.ts"],"sourcesContent":["import type { Row, RowList, Sql, TransactionSql } from 'postgres';\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 } from '~/pg-core/session.ts';\nimport type { PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\n\nexport interface PostgresJsSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class PostgresJsSession<TSQL extends Sql, TRelations extends AnyRelations>\n\textends PgAsyncSession<PostgresJsQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'PostgresJsSession';\n\n\tlogger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tpublic client: TSQL,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\t/** @internal */\n\t\treadonly options: PostgresJsSessionOptions = {},\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\tname: 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) {\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\tif (mode === 'objects') {\n\t\t\t\treturn this.client.unsafe(query.sql, params ?? [] as any[], {\n\t\t\t\t\tprepare: name !== false,\n\t\t\t\t}).then((rows) => Object.values(rows));\n\t\t\t}\n\t\t\tif (mode === 'raw') {\n\t\t\t\treturn this.client.unsafe(query.sql, params ?? [] as any[], {\n\t\t\t\t\tprepare: name !== false,\n\t\t\t\t});\n\t\t\t}\n\t\t\treturn this.client.unsafe(query.sql, params ?? [] as any[], {\n\t\t\t\tprepare: name !== false,\n\t\t\t}).values();\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\toverride transaction<T>(\n\t\ttransaction: (tx: PostgresJsTransaction<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 PostgresJsSession<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 PostgresJsTransaction(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 PostgresJsTransaction<\n\tTRelations extends AnyRelations,\n> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\t/** @internal */\n\t\toverride readonly session: PostgresJsSession<TransactionSql, TRelations>,\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: PostgresJsTransaction<TRelations>) => Promise<T>,\n\t): Promise<T> => {\n\t\treturn this.session.client.savepoint((client) => {\n\t\t\tconst session = new PostgresJsSession<TransactionSql, 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 PostgresJsTransaction<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 PostgresJsQueryResultHKT extends PgQueryResultHKT {\n\ttype: RowList<Assume<this['row'], Row>[]>;\n}\n"],"mappings":";;;;;;;;AAoBA,IAAa,oBAAb,MAAa,0BACJA,0CACT;CACC,QAA0BC,0BAAsB;CAEhD;CACA,AAAQ;CAER,YACC,AAAO,QACP,SACA,AAAQ,WAER,AAAS,UAAoC,EAAE,EAC9C;AACD,QAAM,QAAQ;EANP;EAEC;EAEC;AAGT,OAAK,SAAS,QAAQ,UAAU,IAAIC,wBAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAIC,iCAAW;;CAG9C,aACC,OACA,MACA,MACA,QACA,eAIA,aACC;EACD,MAAM,WAAW,OAAO,WAAuB;AAC9C,OAAI,SAAS,UACZ,QAAO,KAAK,OAAO,OAAO,MAAM,KAAK,UAAU,EAAE,EAAW,EAC3D,SAAS,SAAS,OAClB,CAAC,CAAC,MAAM,SAAS,OAAO,OAAO,KAAK,CAAC;AAEvC,OAAI,SAAS,MACZ,QAAO,KAAK,OAAO,OAAO,MAAM,KAAK,UAAU,EAAE,EAAW,EAC3D,SAAS,SAAS,OAClB,CAAC;AAEH,UAAO,KAAK,OAAO,OAAO,MAAM,KAAK,UAAU,EAAE,EAAW,EAC3D,SAAS,SAAS,OAClB,CAAC,CAAC,QAAQ;;AAGZ,SAAO,IAAIC,gDACV,UACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAEF,AAAS,YACR,aACA,QACa;AACb,SAAO,KAAK,OAAO,MAAM,OAAO,WAAW;GAC1C,MAAM,UAAU,IAAI,kBACnB,QACA,KAAK,SACL,KAAK,WACL,KAAK,QACL;GACD,MAAM,KAAK,IAAI,sBAAsB,KAAK,SAAS,SAAS,KAAK,UAAU;AAC3E,OAAI,OACH,OAAM,GAAG,eAAe,OAAO;AAEhC,UAAO,YAAY,GAAG;IACrB;;;AAIJ,IAAa,wBAAb,MAAa,8BAEHC,8CAAyD;CAClE,QAA0BJ,0BAAsB;CAEhD,YACC,SAEA,AAAkB,SAClB,WACA,cAAc,GACb;AACD,QAAM,SAAS,SAAS,WAAW,aAAa,MAAM;EAJpC;;CAOnB,AAAS,eACR,gBACgB;AAChB,SAAO,KAAK,QAAQ,OAAO,WAAW,WAAW;GAChD,MAAM,UAAU,IAAI,kBACnB,QACA,KAAK,SACL,KAAK,EAAE,WACP,KAAK,QAAQ,QACb;AAMD,UAAO,YALI,IAAI,sBACd,KAAK,SACL,SACA,KAAK,EAAE,UACP,CACqB;IACrB"}

package/postgres-js/session.d.cts

@@ -1,67 +1,46 @@
 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 { Row, RowList, Sql, TransactionSql } from "postgres";
 
 //#region src/postgres-js/session.d.ts
-declare class PostgresJsPreparedQuery<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, 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']>;
-  private executeRqbV2;
-  all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
-}
 interface PostgresJsSessionOptions {
   logger?: Logger;
   cache?: Cache;
+  useJitMapper?: boolean;
 }
-declare class PostgresJsSession<TSQL extends Sql, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class PostgresJsSession<TSQL extends Sql, TRelations extends AnyRelations> extends PgAsyncSession<PostgresJsQueryResultHKT, TRelations> {
   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?: PostgresJsSessionOptions);
-  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<RowList<Row[]>>;
-  queryObjects<T extends Row>(query: string, params: unknown[]): Promise<RowList<T[]>>;
-  transaction<T>(transaction: (tx: PostgresJsTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
+  transaction<T>(transaction: (tx: PostgresJsTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
-declare class PostgresJsTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class PostgresJsTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
   constructor(dialect: PgDialect, /** @internal */
 
-  session: PostgresJsSession<TransactionSql, TFullSchema, TRelations, TSchema>, schema: V1.RelationalSchemaConfig<TSchema> | undefined, relations: TRelations, nestedIndex?: number);
-  transaction<T>(transaction: (tx: PostgresJsTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
+  session: PostgresJsSession<TransactionSql, TRelations>, relations: TRelations, nestedIndex?: number);
+  transaction: <T>(transaction: (tx: PostgresJsTransaction<TRelations>) => Promise<T>) => Promise<T>;
 }
 interface PostgresJsQueryResultHKT extends PgQueryResultHKT {
   type: RowList<Assume<this['row'], Row>[]>;
 }
 //#endregion
-export { PostgresJsPreparedQuery, PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction };
+export { PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction };
 //# sourceMappingURL=session.d.cts.map

package/postgres-js/session.d.ts

@@ -1,67 +1,46 @@
 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";
+import { Logger } from "../logger.js";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
 import { AnyRelations } from "../relations.js";
+import { PgDialect } from "../pg-core/dialect.js";
 import { Row, RowList, Sql, TransactionSql } from "postgres";
 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/postgres-js/session.d.ts
-declare class PostgresJsPreparedQuery<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, 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']>;
-  private executeRqbV2;
-  all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
-}
 interface PostgresJsSessionOptions {
   logger?: Logger;
   cache?: Cache;
+  useJitMapper?: boolean;
 }
-declare class PostgresJsSession<TSQL extends Sql, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class PostgresJsSession<TSQL extends Sql, TRelations extends AnyRelations> extends PgAsyncSession<PostgresJsQueryResultHKT, TRelations> {
   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?: PostgresJsSessionOptions);
-  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<RowList<Row[]>>;
-  queryObjects<T extends Row>(query: string, params: unknown[]): Promise<RowList<T[]>>;
-  transaction<T>(transaction: (tx: PostgresJsTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
+  transaction<T>(transaction: (tx: PostgresJsTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
-declare class PostgresJsTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class PostgresJsTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
   constructor(dialect: PgDialect, /** @internal */
 
-  session: PostgresJsSession<TransactionSql, TFullSchema, TRelations, TSchema>, schema: V1.RelationalSchemaConfig<TSchema> | undefined, relations: TRelations, nestedIndex?: number);
-  transaction<T>(transaction: (tx: PostgresJsTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
+  session: PostgresJsSession<TransactionSql, TRelations>, relations: TRelations, nestedIndex?: number);
+  transaction: <T>(transaction: (tx: PostgresJsTransaction<TRelations>) => Promise<T>) => Promise<T>;
 }
 interface PostgresJsQueryResultHKT extends PgQueryResultHKT {
   type: RowList<Assume<this['row'], Row>[]>;
 }
 //#endregion
-export { PostgresJsPreparedQuery, PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction };
+export { PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction };
 //# sourceMappingURL=session.d.ts.map

package/postgres-js/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 { NoopLogger } from "../logger.js";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
 
 //#region src/postgres-js/session.ts
-var PostgresJsPreparedQuery = class extends PgAsyncPreparedQuery {
-	static [entityKind] = "PostgresJsPreparedQuery";
-	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", () => {
-				return this.queryWithCache(query.sql, params, async () => {
-					return await client.unsafe(query.sql, params);
-				});
-			});
-			const rows = await tracer.startActiveSpan("drizzle.driver.execute", () => {
-				span?.setAttributes({
-					"drizzle.query.text": query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return this.queryWithCache(query.sql, params, async () => {
-					return await 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", () => {
-				span?.setAttributes({
-					"drizzle.query.text": this.query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return this.queryWithCache(this.query.sql, params, async () => {
-					return this.client.unsafe(this.query.sql, params);
-				});
-			});
-		});
-	}
-	/** @internal */
-	isResponseInArrayMode() {
-		return this._isResponseInArrayMode;
-	}
-};
 var PostgresJsSession = class PostgresJsSession extends PgAsyncSession {
 	static [entityKind] = "PostgresJsSession";
 	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 PostgresJsPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new PostgresJsPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, false, 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 === "objects") return this.client.unsafe(query.sql, params ?? [], { prepare: name !== false }).then((rows) => Object.values(rows));
+			if (mode === "raw") return this.client.unsafe(query.sql, params ?? [], { prepare: name !== false });
+			return this.client.unsafe(query.sql, params ?? [], { prepare: name !== false }).values();
+		};
+		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 PostgresJsSession(client, this.dialect, this.relations, this.schema, this.options);
-			const tx = new PostgresJsTransaction(this.dialect, session, this.schema, this.relations);
+			const session = new PostgresJsSession(client, this.dialect, this.relations, this.options);
+			const tx = new PostgresJsTransaction(this.dialect, session, this.relations);
 			if (config) await tx.setTransaction(config);
 			return transaction(tx);
 		});
@@ -129,18 +35,18 @@ var PostgresJsSession = class PostgresJsSession extends PgAsyncSession {
 };
 var PostgresJsTransaction = class PostgresJsTransaction extends PgAsyncTransaction {
 	static [entityKind] = "PostgresJsTransaction";
-	constructor(dialect, session, schema, relations, 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 PostgresJsSession(client, this.dialect, this.relations, this.schema, this.session.options);
-			return transaction(new PostgresJsTransaction(this.dialect, session, this.schema, this.relations));
+			const session = new PostgresJsSession(client, this.dialect, this._.relations, this.session.options);
+			return transaction(new PostgresJsTransaction(this.dialect, session, this._.relations));
 		});
-	}
+	};
 };
 
 //#endregion
-export { PostgresJsPreparedQuery, PostgresJsSession, PostgresJsTransaction };
+export { PostgresJsSession, PostgresJsTransaction };
 //# sourceMappingURL=session.js.map

package/postgres-js/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":[],"sources":["../../src/postgres-js/session.ts"],"sourcesContent":["import type { Row, RowList, Sql, TransactionSql } from 'postgres';\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 } from '~/pg-core/session.ts';\nimport type { 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 PostgresJsPreparedQuery<\n\tT extends PreparedQueryConfig,\n\tTIsRqbV2 extends boolean = false,\n> extends PgAsyncPreparedQuery<T> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsPreparedQuery';\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', () => {\n\t\t\t\t\treturn 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 = 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\t\t\t\treturn this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\treturn await 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 as (rows: unknown[][]) => T['execute'])(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\tprivate async 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', () => {\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 this.queryWithCache(this.query.sql, params, async () => {\n\t\t\t\t\treturn 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 PostgresJsSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class PostgresJsSession<\n\tTSQL extends Sql,\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsSession';\n\n\tlogger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tpublic 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: PostgresJsSessionOptions = {},\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 PostgresJsPreparedQuery(\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 PostgresJsPreparedQuery(\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\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\tquery(query: string, params: unknown[]): Promise<RowList<Row[]>> {\n\t\tthis.logger.logQuery(query, params);\n\t\treturn this.client.unsafe(query, params as any[]).values();\n\t}\n\n\tqueryObjects<T extends Row>(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<RowList<T[]>> {\n\t\treturn this.client.unsafe(query, params as any[]);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: PostgresJsTransaction<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 PostgresJsSession<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 PostgresJsTransaction(this.dialect, session, this.schema, 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 PostgresJsTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\t/** @internal */\n\t\toverride readonly session: PostgresJsSession<TransactionSql, TFullSchema, TRelations, TSchema>,\n\t\tschema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\trelations: TRelations,\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: PostgresJsTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\treturn this.session.client.savepoint((client) => {\n\t\t\tconst session = new PostgresJsSession<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.session.options,\n\t\t\t);\n\t\t\tconst tx = new PostgresJsTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\t\tthis.dialect,\n\t\t\t\tsession,\n\t\t\t\tthis.schema,\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 PostgresJsQueryResultHKT extends PgQueryResultHKT {\n\ttype: RowList<Assume<this['row'], Row>[]>;\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.js","names":[],"sources":["../../src/postgres-js/session.ts"],"sourcesContent":["import type { Row, RowList, Sql, TransactionSql } from 'postgres';\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 } from '~/pg-core/session.ts';\nimport type { PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\n\nexport interface PostgresJsSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class PostgresJsSession<TSQL extends Sql, TRelations extends AnyRelations>\n\textends PgAsyncSession<PostgresJsQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'PostgresJsSession';\n\n\tlogger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tpublic client: TSQL,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\t/** @internal */\n\t\treadonly options: PostgresJsSessionOptions = {},\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\tname: 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) {\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\tif (mode === 'objects') {\n\t\t\t\treturn this.client.unsafe(query.sql, params ?? [] as any[], {\n\t\t\t\t\tprepare: name !== false,\n\t\t\t\t}).then((rows) => Object.values(rows));\n\t\t\t}\n\t\t\tif (mode === 'raw') {\n\t\t\t\treturn this.client.unsafe(query.sql, params ?? [] as any[], {\n\t\t\t\t\tprepare: name !== false,\n\t\t\t\t});\n\t\t\t}\n\t\t\treturn this.client.unsafe(query.sql, params ?? [] as any[], {\n\t\t\t\tprepare: name !== false,\n\t\t\t}).values();\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\toverride transaction<T>(\n\t\ttransaction: (tx: PostgresJsTransaction<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 PostgresJsSession<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 PostgresJsTransaction(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 PostgresJsTransaction<\n\tTRelations extends AnyRelations,\n> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\t/** @internal */\n\t\toverride readonly session: PostgresJsSession<TransactionSql, TRelations>,\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: PostgresJsTransaction<TRelations>) => Promise<T>,\n\t): Promise<T> => {\n\t\treturn this.session.client.savepoint((client) => {\n\t\t\tconst session = new PostgresJsSession<TransactionSql, 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 PostgresJsTransaction<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 PostgresJsQueryResultHKT extends PgQueryResultHKT {\n\ttype: RowList<Assume<this['row'], Row>[]>;\n}\n"],"mappings":";;;;;;AAoBA,IAAa,oBAAb,MAAa,0BACJ,eACT;CACC,QAA0B,cAAsB;CAEhD;CACA,AAAQ;CAER,YACC,AAAO,QACP,SACA,AAAQ,WAER,AAAS,UAAoC,EAAE,EAC9C;AACD,QAAM,QAAQ;EANP;EAEC;EAEC;AAGT,OAAK,SAAS,QAAQ,UAAU,IAAI,YAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAI,WAAW;;CAG9C,aACC,OACA,MACA,MACA,QACA,eAIA,aACC;EACD,MAAM,WAAW,OAAO,WAAuB;AAC9C,OAAI,SAAS,UACZ,QAAO,KAAK,OAAO,OAAO,MAAM,KAAK,UAAU,EAAE,EAAW,EAC3D,SAAS,SAAS,OAClB,CAAC,CAAC,MAAM,SAAS,OAAO,OAAO,KAAK,CAAC;AAEvC,OAAI,SAAS,MACZ,QAAO,KAAK,OAAO,OAAO,MAAM,KAAK,UAAU,EAAE,EAAW,EAC3D,SAAS,SAAS,OAClB,CAAC;AAEH,UAAO,KAAK,OAAO,OAAO,MAAM,KAAK,UAAU,EAAE,EAAW,EAC3D,SAAS,SAAS,OAClB,CAAC,CAAC,QAAQ;;AAGZ,SAAO,IAAI,qBACV,UACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAEF,AAAS,YACR,aACA,QACa;AACb,SAAO,KAAK,OAAO,MAAM,OAAO,WAAW;GAC1C,MAAM,UAAU,IAAI,kBACnB,QACA,KAAK,SACL,KAAK,WACL,KAAK,QACL;GACD,MAAM,KAAK,IAAI,sBAAsB,KAAK,SAAS,SAAS,KAAK,UAAU;AAC3E,OAAI,OACH,OAAM,GAAG,eAAe,OAAO;AAEhC,UAAO,YAAY,GAAG;IACrB;;;AAIJ,IAAa,wBAAb,MAAa,8BAEH,mBAAyD;CAClE,QAA0B,cAAsB;CAEhD,YACC,SAEA,AAAkB,SAClB,WACA,cAAc,GACb;AACD,QAAM,SAAS,SAAS,WAAW,aAAa,MAAM;EAJpC;;CAOnB,AAAS,eACR,gBACgB;AAChB,SAAO,KAAK,QAAQ,OAAO,WAAW,WAAW;GAChD,MAAM,UAAU,IAAI,kBACnB,QACA,KAAK,SACL,KAAK,EAAE,WACP,KAAK,QAAQ,QACb;AAMD,UAAO,YALI,IAAI,sBACd,KAAK,SACL,SACA,KAAK,EAAE,UACP,CACqB;IACrB"}

package/prisma/mysql/driver.cjs

@@ -3,8 +3,8 @@ const require_runtime = require('../../_virtual/_rolldown/runtime.cjs');
 const require_prisma_mysql_session = require('./session.cjs');
 let __entity_ts = require("../../entity.cjs");
 let __logger_ts = require("../../logger.cjs");
-let _prisma_client = require("@prisma/client");
 let __mysql_core_index_ts = require("../../mysql-core/index.cjs");
+let _prisma_client = require("@prisma/client");
 
 //#region src/prisma/mysql/driver.ts
 var PrismaMySqlDatabase = class extends __mysql_core_index_ts.MySqlDatabase {

package/prisma/mysql/driver.js

@@ -1,8 +1,8 @@
 import { PrismaMySqlSession } from "./session.js";
 import { entityKind } from "../../entity.js";
 import { DefaultLogger } from "../../logger.js";
-import { Prisma } from "@prisma/client";
 import { MySqlDatabase, MySqlDialect } from "../../mysql-core/index.js";
+import { Prisma } from "@prisma/client";
 
 //#region src/prisma/mysql/driver.ts
 var PrismaMySqlDatabase = class extends MySqlDatabase {

package/prisma/mysql/session.cjs

@@ -12,8 +12,9 @@ var PrismaMySqlPreparedQuery = class extends __mysql_core_index_ts.MySqlPrepared
 	}
 	static [__entity_ts.entityKind] = "PrismaMySqlPreparedQuery";
 	constructor(prisma, query, logger) {
-		super(query, void 0, void 0, void 0);
+		super(void 0, void 0, void 0);
 		this.prisma = prisma;
+		this.query = query;
 		this.logger = logger;
 	}
 	execute(placeholderValues) {