drizzle-orm 1.0.0-beta.20-afec359 → 1.0.0-beta.21

package/neon-serverless/session.cjs

@@ -1,56 +1,131 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 let __entity_ts = require("../entity.cjs");
+let __utils_ts = require("../utils.cjs");
 let __sql_sql_ts = require("../sql/sql.cjs");
 let __logger_ts = require("../logger.cjs");
 let __pg_core_async_session_ts = require("../pg-core/async/session.cjs");
 let __cache_core_cache_ts = require("../cache/core/cache.cjs");
-let __query_name_generator_ts = require("../query-name-generator.cjs");
 let _neondatabase_serverless = require("@neondatabase/serverless");
 
 //#region src/neon-serverless/session.ts
-const noop = (val) => val;
-const typeConfig = { getTypeParser: ((typeId, format) => {
-	switch (typeId) {
-		case _neondatabase_serverless.types.builtins.TIMESTAMPTZ: return noop;
-		case _neondatabase_serverless.types.builtins.TIMESTAMP: return noop;
-		case _neondatabase_serverless.types.builtins.DATE: return noop;
-		case _neondatabase_serverless.types.builtins.INTERVAL: return noop;
-		case 1231: return noop;
-		case 1115: return noop;
-		case 1185: return noop;
-		case 1187: return noop;
-		case 1182: return noop;
-		default: return _neondatabase_serverless.types.getTypeParser(typeId, format);
+const parsers = { getTypeParser: (typeId, format) => {
+	if (typeId === _neondatabase_serverless.types.builtins.TIMESTAMPTZ) return (val) => val;
+	if (typeId === _neondatabase_serverless.types.builtins.TIMESTAMP) return (val) => val;
+	if (typeId === _neondatabase_serverless.types.builtins.DATE) return (val) => val;
+	if (typeId === _neondatabase_serverless.types.builtins.INTERVAL) return (val) => val;
+	if (typeId === 1231) return (val) => val;
+	if (typeId === 1115) return (val) => val;
+	if (typeId === 1185) return (val) => val;
+	if (typeId === 1187) return (val) => val;
+	if (typeId === 1182) return (val) => val;
+	return _neondatabase_serverless.types.getTypeParser(typeId, format);
+} };
+var NeonPreparedQuery = class extends __pg_core_async_session_ts.PgAsyncPreparedQuery {
+	static [__entity_ts.entityKind] = "NeonPreparedQuery";
+	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
+		super(query, cache, queryMetadata, cacheConfig);
+		this.client = client;
+		this.logger = logger;
+		this.fields = fields;
+		this.name = name;
+		this._isResponseInArrayMode = _isResponseInArrayMode;
+		this.customResultMapper = customResultMapper;
+		this.isRqbV2Query = isRqbV2Query;
+	}
+	async execute(placeholderValues = {}) {
+		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
+		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		const { fields, client, query, joinsNotNullableMap, customResultMapper } = this;
+		if (!fields && !customResultMapper) return await this.queryWithCache(query.sql, params, async () => {
+			return await client.query({
+				text: this.query.sql,
+				name: this.name,
+				types: parsers
+			}, params);
+		});
+		const result = await this.queryWithCache(query.sql, params, async () => {
+			return await client.query({
+				text: this.query.sql,
+				name: this.name,
+				types: parsers,
+				rowMode: "array"
+			}, params);
+		});
+		return customResultMapper ? customResultMapper(result.rows) : result.rows.map((row) => (0, __utils_ts.mapResultRow)(fields, row, joinsNotNullableMap));
+	}
+	async executeRqbV2(placeholderValues = {}) {
+		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		const { client, customResultMapper } = this;
+		return customResultMapper((await client.query({
+			text: this.query.sql,
+			name: this.name,
+			types: parsers
+		}, params)).rows);
+	}
+	all(placeholderValues = {}) {
+		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		return this.queryWithCache(this.query.sql, params, async () => {
+			return await this.client.query({
+				text: this.query.sql,
+				name: this.name,
+				types: parsers
+			}, params);
+		}).then((result) => result.rows);
+	}
+	values(placeholderValues = {}) {
+		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		return this.queryWithCache(this.query.sql, params, async () => {
+			return await this.client.query({
+				text: this.query.sql,
+				name: this.name,
+				types: parsers,
+				rowMode: "array"
+			}, params);
+		}).then((result) => result.rows);
+	}
+	/** @internal */
+	isResponseInArrayMode() {
+		return this._isResponseInArrayMode;
 	}
-}) };
+};
 var NeonSession = class NeonSession extends __pg_core_async_session_ts.PgAsyncSession {
 	static [__entity_ts.entityKind] = "NeonSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, options = {}) {
+	constructor(client, dialect, relations, schema, 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_cache_ts.NoopCache();
 	}
-	prepareQuery(query, mode, name, mapper, queryMetadata, cacheConfig) {
-		const queryName = typeof name === "string" ? name : name === true ? (0, __query_name_generator_ts.preparedStatementName)(query.sql, query.params) : void 0;
-		const executor = async (params) => {
-			return this.client.query({
-				name: queryName,
-				rowMode: mode === "arrays" ? "array" : void 0,
-				text: query.sql,
-				types: typeConfig
-			}, params).then((r) => mode === "raw" ? r : r.rows);
-		};
-		return new __pg_core_async_session_ts.PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
+	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
+		return new NeonPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, name, isResponseInArrayMode, customResultMapper);
+	}
+	prepareRelationalQuery(query, fields, name, customResultMapper) {
+		return new NeonPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, name, false, customResultMapper, true);
+	}
+	async query(query, params) {
+		this.logger.logQuery(query, params);
+		return await this.client.query({
+			rowMode: "array",
+			text: query,
+			values: params
+		});
+	}
+	async queryObjects(query, params) {
+		return this.client.query(query, params);
 	}
 	async transaction(transaction, config = {}) {
-		const session = this.client instanceof _neondatabase_serverless.Pool ? new NeonSession(await this.client.connect(), this.dialect, this.relations, this.options) : this;
-		const tx = new NeonTransaction(this.dialect, session, this.relations, void 0, false);
+		const session = this.client instanceof _neondatabase_serverless.Pool ? new NeonSession(await this.client.connect(), this.dialect, this.relations, this.schema, this.options) : this;
+		const tx = new NeonTransaction(this.dialect, session, this.relations, this.schema);
 		await tx.execute(__sql_sql_ts.sql`begin ${tx.getTransactionConfigSQL(config)}`);
 		try {
 			const result = await transaction(tx);
@@ -66,9 +141,9 @@ var NeonSession = class NeonSession extends __pg_core_async_session_ts.PgAsyncSe
 };
 var NeonTransaction = class NeonTransaction extends __pg_core_async_session_ts.PgAsyncTransaction {
 	static [__entity_ts.entityKind] = "NeonTransaction";
-	transaction = async (transaction) => {
+	async transaction(transaction) {
 		const savepointName = `sp${this.nestedIndex + 1}`;
-		const tx = new NeonTransaction(this.dialect, this.session, this._.relations, this.nestedIndex + 1, false);
+		const tx = new NeonTransaction(this.dialect, this.session, this.relations, this.schema, this.nestedIndex + 1);
 		await tx.execute(__sql_sql_ts.sql.raw(`savepoint ${savepointName}`));
 		try {
 			const result = await transaction(tx);
@@ -78,10 +153,11 @@ var NeonTransaction = class NeonTransaction extends __pg_core_async_session_ts.P
 			await tx.execute(__sql_sql_ts.sql.raw(`rollback to savepoint ${savepointName}`));
 			throw e;
 		}
-	};
+	}
 };
 
 //#endregion
+exports.NeonPreparedQuery = NeonPreparedQuery;
 exports.NeonSession = NeonSession;
 exports.NeonTransaction = NeonTransaction;
 //# sourceMappingURL=session.cjs.map

package/neon-serverless/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["types","PgAsyncSession","entityKind","NoopLogger","NoopCache","PgAsyncPreparedQuery","Pool","PgAsyncTransaction","sql"],"sources":["../../src/neon-serverless/session.ts"],"sourcesContent":["import {\n\ttype Client,\n\ttype CustomTypesConfig,\n\tPool,\n\ttype PoolClient,\n\ttype QueryResult,\n\ttype QueryResultRow,\n\ttypes,\n} from '@neondatabase/serverless';\nimport { type Cache, NoopCache } from '~/cache/core/cache.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 { preparedStatementName } from '~/query-name-generator.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { type Query, sql } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\n\nexport type NeonClient = Pool | PoolClient | Client;\n\nconst noop = (val: any) => val;\nconst typeConfig: CustomTypesConfig = {\n\tgetTypeParser: <CustomTypesConfig['getTypeParser']> ((typeId, format) => {\n\t\tswitch (typeId as number) {\n\t\t\tcase types.builtins.TIMESTAMPTZ:\n\t\t\t\treturn noop;\n\t\t\tcase types.builtins.TIMESTAMP:\n\t\t\t\treturn noop;\n\t\t\tcase types.builtins.DATE:\n\t\t\t\treturn noop;\n\t\t\tcase types.builtins.INTERVAL:\n\t\t\t\treturn noop;\n\t\t\t// numeric[]\n\t\t\tcase 1231:\n\t\t\t\treturn noop;\n\t\t\t// timestamp[]\n\t\t\tcase 1115:\n\t\t\t\treturn noop;\n\t\t\t// timestamp with timezone[]\n\t\t\tcase 1185:\n\t\t\t\treturn noop;\n\t\t\t// interval[]\n\t\t\tcase 1187:\n\t\t\t\treturn noop;\n\t\t\t// date[]\n\t\t\tcase 1182:\n\t\t\t\treturn noop;\n\t\t\tdefault:\n\t\t\t\treturn types.getTypeParser(typeId, format as any);\n\t\t}\n\t}),\n};\n\nexport interface NeonSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class NeonSession<TRelations extends AnyRelations> extends PgAsyncSession<NeonQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'NeonSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: NeonClient,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate options: NeonSessionOptions = {},\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): PgAsyncPreparedQuery<T> {\n\t\tconst queryName = typeof name === 'string'\n\t\t\t? name\n\t\t\t: name === true\n\t\t\t? preparedStatementName(query.sql, query.params)\n\t\t\t: undefined;\n\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\treturn this.client.query({\n\t\t\t\tname: queryName,\n\t\t\t\trowMode: mode === 'arrays' ? 'array' : undefined as any,\n\t\t\t\ttext: query.sql,\n\t\t\t\ttypes: typeConfig,\n\t\t\t}, params).then((r) => mode === 'raw' ? r : r.rows);\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 async transaction<T>(\n\t\ttransaction: (tx: NeonTransaction<TRelations>) => Promise<T>,\n\t\tconfig: PgTransactionConfig = {},\n\t): Promise<T> {\n\t\tconst session = this.client instanceof Pool // oxlint-disable-line drizzle-internal/no-instanceof\n\t\t\t? new NeonSession(await this.client.connect(), this.dialect, this.relations, this.options)\n\t\t\t: this;\n\t\tconst tx = new NeonTransaction<TRelations>(\n\t\t\tthis.dialect,\n\t\t\tsession,\n\t\t\tthis.relations,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t);\n\t\tawait tx.execute(sql`begin ${tx.getTransactionConfigSQL(config)}`);\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql`commit`);\n\t\t\treturn result;\n\t\t} catch (error) {\n\t\t\tawait tx.execute(sql`rollback`);\n\t\t\tthrow error;\n\t\t} finally {\n\t\t\tif (this.client instanceof Pool) { // oxlint-disable-line drizzle-internal/no-instanceof\n\t\t\t\t(session.client as PoolClient).release();\n\t\t\t}\n\t\t}\n\t}\n}\n\nexport class NeonTransaction<\n\tTRelations extends AnyRelations,\n> extends PgAsyncTransaction<NeonQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'NeonTransaction';\n\n\toverride transaction = async <T>(\n\t\ttransaction: (tx: NeonTransaction<TRelations>) => Promise<T>,\n\t): Promise<T> => {\n\t\tconst savepointName = `sp${this.nestedIndex + 1}`;\n\t\tconst tx = new NeonTransaction<TRelations>(\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis._.relations,\n\t\t\tthis.nestedIndex + 1,\n\t\t\tfalse,\n\t\t);\n\t\tawait tx.execute(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (e) {\n\t\t\tawait tx.execute(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow e;\n\t\t}\n\t};\n}\n\nexport interface NeonQueryResultHKT extends PgQueryResultHKT {\n\ttype: QueryResult<Assume<this['row'], QueryResultRow>>;\n}\n"],"mappings":";;;;;;;;;;;AAwBA,MAAM,QAAQ,QAAa;AAC3B,MAAM,aAAgC,EACrC,iBAAsD,QAAQ,WAAW;AACxE,SAAQ,QAAR;EACC,KAAKA,+BAAM,SAAS,YACnB,QAAO;EACR,KAAKA,+BAAM,SAAS,UACnB,QAAO;EACR,KAAKA,+BAAM,SAAS,KACnB,QAAO;EACR,KAAKA,+BAAM,SAAS,SACnB,QAAO;EAER,KAAK,KACJ,QAAO;EAER,KAAK,KACJ,QAAO;EAER,KAAK,KACJ,QAAO;EAER,KAAK,KACJ,QAAO;EAER,KAAK,KACJ,QAAO;EACR,QACC,QAAOA,+BAAM,cAAc,QAAQ,OAAc;;IAGpD;AAQD,IAAa,cAAb,MAAa,oBAAqDC,0CAA+C;CAChH,QAA0BC,0BAAsB;CAEhD,AAAQ;CACR,AAAQ;CAER,YACC,AAAQ,QACR,SACA,AAAQ,WACR,AAAQ,UAA8B,EAAE,EACvC;AACD,QAAM,QAAQ;EALN;EAEA;EACA;AAGR,OAAK,SAAS,QAAQ,UAAU,IAAIC,wBAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAIC,iCAAW;;CAG9C,aACC,OACA,MACA,MACA,QACA,eAIA,aAC0B;EAC1B,MAAM,YAAY,OAAO,SAAS,WAC/B,OACA,SAAS,4DACa,MAAM,KAAK,MAAM,OAAO,GAC9C;EAEH,MAAM,WAAW,OAAO,WAAuB;AAC9C,UAAO,KAAK,OAAO,MAAM;IACxB,MAAM;IACN,SAAS,SAAS,WAAW,UAAU;IACvC,MAAM,MAAM;IACZ,OAAO;IACP,EAAE,OAAO,CAAC,MAAM,MAAM,SAAS,QAAQ,IAAI,EAAE,KAAK;;AAGpD,SAAO,IAAIC,gDACV,UACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAGF,MAAe,YACd,aACA,SAA8B,EAAE,EACnB;EACb,MAAM,UAAU,KAAK,kBAAkBC,gCACpC,IAAI,YAAY,MAAM,KAAK,OAAO,SAAS,EAAE,KAAK,SAAS,KAAK,WAAW,KAAK,QAAQ,GACxF;EACH,MAAM,KAAK,IAAI,gBACd,KAAK,SACL,SACA,KAAK,WACL,QACA,MACA;AACD,QAAM,GAAG,QAAQ,gBAAG,SAAS,GAAG,wBAAwB,OAAO,GAAG;AAClE,MAAI;GACH,MAAM,SAAS,MAAM,YAAY,GAAG;AACpC,SAAM,GAAG,QAAQ,gBAAG,SAAS;AAC7B,UAAO;WACC,OAAO;AACf,SAAM,GAAG,QAAQ,gBAAG,WAAW;AAC/B,SAAM;YACG;AACT,OAAI,KAAK,kBAAkBA,8BAC1B,CAAC,QAAQ,OAAsB,SAAS;;;;AAM5C,IAAa,kBAAb,MAAa,wBAEHC,8CAAmD;CAC5D,QAA0BL,0BAAsB;CAEhD,AAAS,cAAc,OACtB,gBACgB;EAChB,MAAM,gBAAgB,KAAK,KAAK,cAAc;EAC9C,MAAM,KAAK,IAAI,gBACd,KAAK,SACL,KAAK,SACL,KAAK,EAAE,WACP,KAAK,cAAc,GACnB,MACA;AACD,QAAM,GAAG,QAAQM,iBAAI,IAAI,aAAa,gBAAgB,CAAC;AACvD,MAAI;GACH,MAAM,SAAS,MAAM,YAAY,GAAG;AACpC,SAAM,GAAG,QAAQA,iBAAI,IAAI,qBAAqB,gBAAgB,CAAC;AAC/D,UAAO;WACC,GAAG;AACX,SAAM,GAAG,QAAQA,iBAAI,IAAI,yBAAyB,gBAAgB,CAAC;AACnE,SAAM"}
+{"version":3,"file":"session.cjs","names":["types","PgAsyncPreparedQuery","entityKind","PgAsyncSession","NoopLogger","NoopCache","Pool","PgAsyncTransaction","sql"],"sources":["../../src/neon-serverless/session.ts"],"sourcesContent":["import {\n\ttype Client,\n\ttype CustomTypesConfig,\n\tPool,\n\ttype PoolClient,\n\ttype QueryResult,\n\ttype QueryResultRow,\n\ttypes,\n} from '@neondatabase/serverless';\nimport type * as V1 from '~/_relations.ts';\nimport { type Cache, NoopCache } from '~/cache/core/cache.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, sql } from '~/sql/sql.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\n\nexport type NeonClient = Pool | PoolClient | Client;\n\nconst parsers: CustomTypesConfig = {\n\t// @ts-ignore\n\tgetTypeParser: (typeId, format) => {\n\t\tif (typeId === types.builtins.TIMESTAMPTZ) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\tif (typeId === types.builtins.TIMESTAMP) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\tif (typeId === types.builtins.DATE) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\tif (typeId === types.builtins.INTERVAL) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\t// numeric[]\n\t\tif (typeId === 1231) {\n\t\t\treturn (val: any) => val;\n\t\t}\n\t\t// timestamp[]\n\t\tif (typeId === 1115) {\n\t\t\treturn (val) => val;\n\t\t}\n\t\t// timestamp with timezone[]\n\t\tif (typeId === 1185) {\n\t\t\treturn (val) => val;\n\t\t}\n\t\t// interval[]\n\t\tif (typeId === 1187) {\n\t\t\treturn (val) => val;\n\t\t}\n\t\t// date[]\n\t\tif (typeId === 1182) {\n\t\t\treturn (val) => val;\n\t\t}\n\t\t// @ts-ignore\n\t\treturn types.getTypeParser(typeId, format);\n\t},\n};\n\nexport class NeonPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends PgAsyncPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'NeonPreparedQuery';\n\n\tconstructor(\n\t\tprivate client: NeonClient,\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 name: string | 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\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst { fields, client, query, joinsNotNullableMap, customResultMapper } = this;\n\t\tif (!fields && !customResultMapper) {\n\t\t\treturn await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\treturn await client.query({\n\t\t\t\t\ttext: this.query.sql,\n\t\t\t\t\tname: this.name,\n\t\t\t\t\ttypes: parsers,\n\t\t\t\t}, params);\n\t\t\t});\n\t\t}\n\n\t\tconst result = await this.queryWithCache(query.sql, params, async () => {\n\t\t\treturn await client.query({\n\t\t\t\ttext: this.query.sql,\n\t\t\t\tname: this.name,\n\t\t\t\ttypes: parsers,\n\t\t\t\trowMode: 'array',\n\t\t\t}, params);\n\t\t});\n\n\t\treturn customResultMapper\n\t\t\t? (customResultMapper as (rows: unknown[][]) => T['execute'])(result.rows)\n\t\t\t: result.rows.map((row) => mapResultRow<T['execute']>(fields!, row, joinsNotNullableMap));\n\t}\n\n\tprivate async executeRqbV2(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst { client, customResultMapper } = this;\n\n\t\tconst result = await client.query({\n\t\t\ttext: this.query.sql,\n\t\t\tname: this.name,\n\t\t\ttypes: parsers,\n\t\t}, params);\n\n\t\treturn customResultMapper!(result.rows);\n\t}\n\n\tall(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['all']> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\tthis.logger.logQuery(this.query.sql, params);\n\t\treturn this.queryWithCache(this.query.sql, params, async () => {\n\t\t\treturn await this.client.query({\n\t\t\t\ttext: this.query.sql,\n\t\t\t\tname: this.name,\n\t\t\t\ttypes: parsers,\n\t\t\t}, params);\n\t\t}).then((result) => result.rows);\n\t}\n\n\tvalues(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['values']> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\tthis.logger.logQuery(this.query.sql, params);\n\t\treturn this.queryWithCache(this.query.sql, params, async () => {\n\t\t\treturn await this.client.query({\n\t\t\t\ttext: this.query.sql,\n\t\t\t\tname: this.name,\n\t\t\t\ttypes: parsers,\n\t\t\t\trowMode: 'array',\n\t\t\t}, params);\n\t\t}).then((result) => result.rows);\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport interface NeonSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class NeonSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<NeonQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'NeonSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: NeonClient,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tprivate options: NeonSessionOptions = {},\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 NeonPreparedQuery(\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\tname,\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 NeonPreparedQuery(\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\tname,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\tasync query(query: string, params: unknown[]): Promise<QueryResult> {\n\t\tthis.logger.logQuery(query, params);\n\t\tconst result = await this.client.query({\n\t\t\trowMode: 'array',\n\t\t\ttext: query,\n\t\t\tvalues: params,\n\t\t});\n\t\treturn result;\n\t}\n\n\tasync queryObjects<T extends QueryResultRow>(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<QueryResult<T>> {\n\t\treturn this.client.query<T>(query, params);\n\t}\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\tconfig: PgTransactionConfig = {},\n\t): Promise<T> {\n\t\tconst session = this.client instanceof Pool // oxlint-disable-line drizzle-internal/no-instanceof\n\t\t\t? new NeonSession(await this.client.connect(), this.dialect, this.relations, this.schema, this.options)\n\t\t\t: this;\n\t\tconst tx = new NeonTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\tthis.dialect,\n\t\t\tsession,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t);\n\t\tawait tx.execute(sql`begin ${tx.getTransactionConfigSQL(config)}`);\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql`commit`);\n\t\t\treturn result;\n\t\t} catch (error) {\n\t\t\tawait tx.execute(sql`rollback`);\n\t\t\tthrow error;\n\t\t} finally {\n\t\t\tif (this.client instanceof Pool) { // oxlint-disable-line drizzle-internal/no-instanceof\n\t\t\t\t(session.client as PoolClient).release();\n\t\t\t}\n\t\t}\n\t}\n}\n\nexport class NeonTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<NeonQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'NeonTransaction';\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tconst savepointName = `sp${this.nestedIndex + 1}`;\n\t\tconst tx = new NeonTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t\tthis.nestedIndex + 1,\n\t\t);\n\t\tawait tx.execute(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (e) {\n\t\t\tawait tx.execute(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow e;\n\t\t}\n\t}\n}\n\nexport interface NeonQueryResultHKT extends PgQueryResultHKT {\n\ttype: QueryResult<Assume<this['row'], QueryResultRow>>;\n}\n"],"mappings":"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"}

package/neon-serverless/session.d.cts

@@ -1,43 +1,66 @@
 import { entityKind } from "../entity.cjs";
 import { Query } from "../sql/sql.cjs";
 import { Assume } from "../utils.cjs";
+import * as V1 from "../_relations.cjs";
 import { Cache } from "../cache/core/cache.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 { Logger } from "../logger.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 { Client, Pool, PoolClient, QueryResult, QueryResultRow } from "@neondatabase/serverless";
 
 //#region src/neon-serverless/session.d.ts
 type NeonClient = Pool | PoolClient | Client;
+declare class NeonPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
+  private client;
+  private logger;
+  private fields;
+  private name;
+  private _isResponseInArrayMode;
+  private customResultMapper?;
+  private isRqbV2Query?;
+  static readonly [entityKind]: string;
+  constructor(client: NeonClient, query: Query, logger: Logger, cache: Cache, queryMetadata: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, name: string | 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']>;
+  values(placeholderValues?: Record<string, unknown> | undefined): Promise<T['values']>;
+}
 interface NeonSessionOptions {
   logger?: Logger;
   cache?: Cache;
-  useJitMapper?: boolean;
 }
-declare class NeonSession<TRelations extends AnyRelations> extends PgAsyncSession<NeonQueryResultHKT, TRelations> {
+declare class NeonSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<NeonQueryResultHKT, TFullSchema, TRelations, TSchema> {
   private client;
   private relations;
+  private schema;
   private options;
   static readonly [entityKind]: string;
   private logger;
   private cache;
-  constructor(client: NeonClient, dialect: PgDialect, relations: TRelations, options?: NeonSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
+  constructor(client: NeonClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: NeonSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  transaction<T>(transaction: (tx: NeonTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<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<QueryResult>;
+  queryObjects<T extends QueryResultRow>(query: string, params: unknown[]): Promise<QueryResult<T>>;
+  transaction<T>(transaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
-declare class NeonTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<NeonQueryResultHKT, TRelations> {
+declare class NeonTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<NeonQueryResultHKT, TFullSchema, TRelations, TSchema> {
   static readonly [entityKind]: string;
-  transaction: <T>(transaction: (tx: NeonTransaction<TRelations>) => Promise<T>) => Promise<T>;
+  transaction<T>(transaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
 }
 interface NeonQueryResultHKT extends PgQueryResultHKT {
   type: QueryResult<Assume<this['row'], QueryResultRow>>;
 }
 //#endregion
-export { NeonClient, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction };
+export { NeonClient, NeonPreparedQuery, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction };
 //# sourceMappingURL=session.d.cts.map

package/neon-serverless/session.d.ts

@@ -1,43 +1,66 @@
 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 { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
-import { AnyRelations } from "../relations.js";
 import { PgDialect } from "../pg-core/dialect.js";
+import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
 import { Cache } from "../cache/core/cache.js";
 import { Client, Pool, PoolClient, QueryResult, QueryResultRow } from "@neondatabase/serverless";
+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/neon-serverless/session.d.ts
 type NeonClient = Pool | PoolClient | Client;
+declare class NeonPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
+  private client;
+  private logger;
+  private fields;
+  private name;
+  private _isResponseInArrayMode;
+  private customResultMapper?;
+  private isRqbV2Query?;
+  static readonly [entityKind]: string;
+  constructor(client: NeonClient, query: Query, logger: Logger, cache: Cache, queryMetadata: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, name: string | 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']>;
+  values(placeholderValues?: Record<string, unknown> | undefined): Promise<T['values']>;
+}
 interface NeonSessionOptions {
   logger?: Logger;
   cache?: Cache;
-  useJitMapper?: boolean;
 }
-declare class NeonSession<TRelations extends AnyRelations> extends PgAsyncSession<NeonQueryResultHKT, TRelations> {
+declare class NeonSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<NeonQueryResultHKT, TFullSchema, TRelations, TSchema> {
   private client;
   private relations;
+  private schema;
   private options;
   static readonly [entityKind]: string;
   private logger;
   private cache;
-  constructor(client: NeonClient, dialect: PgDialect, relations: TRelations, options?: NeonSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
+  constructor(client: NeonClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: NeonSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  transaction<T>(transaction: (tx: NeonTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<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<QueryResult>;
+  queryObjects<T extends QueryResultRow>(query: string, params: unknown[]): Promise<QueryResult<T>>;
+  transaction<T>(transaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
-declare class NeonTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<NeonQueryResultHKT, TRelations> {
+declare class NeonTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<NeonQueryResultHKT, TFullSchema, TRelations, TSchema> {
   static readonly [entityKind]: string;
-  transaction: <T>(transaction: (tx: NeonTransaction<TRelations>) => Promise<T>) => Promise<T>;
+  transaction<T>(transaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
 }
 interface NeonQueryResultHKT extends PgQueryResultHKT {
   type: QueryResult<Assume<this['row'], QueryResultRow>>;
 }
 //#endregion
-export { NeonClient, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction };
+export { NeonClient, NeonPreparedQuery, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction };
 //# sourceMappingURL=session.d.ts.map

package/neon-serverless/session.js

@@ -1,54 +1,129 @@
 import { entityKind } from "../entity.js";
-import { sql } from "../sql/sql.js";
+import { mapResultRow } from "../utils.js";
+import { fillPlaceholders, sql } from "../sql/sql.js";
 import { NoopLogger } from "../logger.js";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
 import { NoopCache } from "../cache/core/cache.js";
-import { preparedStatementName } from "../query-name-generator.js";
 import { Pool, types } from "@neondatabase/serverless";
 
 //#region src/neon-serverless/session.ts
-const noop = (val) => val;
-const typeConfig = { getTypeParser: ((typeId, format) => {
-	switch (typeId) {
-		case types.builtins.TIMESTAMPTZ: return noop;
-		case types.builtins.TIMESTAMP: return noop;
-		case types.builtins.DATE: return noop;
-		case types.builtins.INTERVAL: return noop;
-		case 1231: return noop;
-		case 1115: return noop;
-		case 1185: return noop;
-		case 1187: return noop;
-		case 1182: return noop;
-		default: return types.getTypeParser(typeId, format);
+const parsers = { getTypeParser: (typeId, format) => {
+	if (typeId === types.builtins.TIMESTAMPTZ) return (val) => val;
+	if (typeId === types.builtins.TIMESTAMP) return (val) => val;
+	if (typeId === types.builtins.DATE) return (val) => val;
+	if (typeId === types.builtins.INTERVAL) return (val) => val;
+	if (typeId === 1231) return (val) => val;
+	if (typeId === 1115) return (val) => val;
+	if (typeId === 1185) return (val) => val;
+	if (typeId === 1187) return (val) => val;
+	if (typeId === 1182) return (val) => val;
+	return types.getTypeParser(typeId, format);
+} };
+var NeonPreparedQuery = class extends PgAsyncPreparedQuery {
+	static [entityKind] = "NeonPreparedQuery";
+	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
+		super(query, cache, queryMetadata, cacheConfig);
+		this.client = client;
+		this.logger = logger;
+		this.fields = fields;
+		this.name = name;
+		this._isResponseInArrayMode = _isResponseInArrayMode;
+		this.customResultMapper = customResultMapper;
+		this.isRqbV2Query = isRqbV2Query;
+	}
+	async execute(placeholderValues = {}) {
+		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
+		const params = fillPlaceholders(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		const { fields, client, query, joinsNotNullableMap, customResultMapper } = this;
+		if (!fields && !customResultMapper) return await this.queryWithCache(query.sql, params, async () => {
+			return await client.query({
+				text: this.query.sql,
+				name: this.name,
+				types: parsers
+			}, params);
+		});
+		const result = await this.queryWithCache(query.sql, params, async () => {
+			return await client.query({
+				text: this.query.sql,
+				name: this.name,
+				types: parsers,
+				rowMode: "array"
+			}, params);
+		});
+		return customResultMapper ? customResultMapper(result.rows) : result.rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
+	}
+	async executeRqbV2(placeholderValues = {}) {
+		const params = fillPlaceholders(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		const { client, customResultMapper } = this;
+		return customResultMapper((await client.query({
+			text: this.query.sql,
+			name: this.name,
+			types: parsers
+		}, params)).rows);
+	}
+	all(placeholderValues = {}) {
+		const params = fillPlaceholders(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		return this.queryWithCache(this.query.sql, params, async () => {
+			return await this.client.query({
+				text: this.query.sql,
+				name: this.name,
+				types: parsers
+			}, params);
+		}).then((result) => result.rows);
+	}
+	values(placeholderValues = {}) {
+		const params = fillPlaceholders(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		return this.queryWithCache(this.query.sql, params, async () => {
+			return await this.client.query({
+				text: this.query.sql,
+				name: this.name,
+				types: parsers,
+				rowMode: "array"
+			}, params);
+		}).then((result) => result.rows);
+	}
+	/** @internal */
+	isResponseInArrayMode() {
+		return this._isResponseInArrayMode;
 	}
-}) };
+};
 var NeonSession = class NeonSession extends PgAsyncSession {
 	static [entityKind] = "NeonSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, options = {}) {
+	constructor(client, dialect, relations, schema, 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, mode, name, mapper, queryMetadata, cacheConfig) {
-		const queryName = typeof name === "string" ? name : name === true ? preparedStatementName(query.sql, query.params) : void 0;
-		const executor = async (params) => {
-			return this.client.query({
-				name: queryName,
-				rowMode: mode === "arrays" ? "array" : void 0,
-				text: query.sql,
-				types: typeConfig
-			}, params).then((r) => mode === "raw" ? r : r.rows);
-		};
-		return new PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
+	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
+		return new NeonPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, name, isResponseInArrayMode, customResultMapper);
+	}
+	prepareRelationalQuery(query, fields, name, customResultMapper) {
+		return new NeonPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, name, false, customResultMapper, true);
+	}
+	async query(query, params) {
+		this.logger.logQuery(query, params);
+		return await this.client.query({
+			rowMode: "array",
+			text: query,
+			values: params
+		});
+	}
+	async queryObjects(query, params) {
+		return this.client.query(query, params);
 	}
 	async transaction(transaction, config = {}) {
-		const session = this.client instanceof Pool ? new NeonSession(await this.client.connect(), this.dialect, this.relations, this.options) : this;
-		const tx = new NeonTransaction(this.dialect, session, this.relations, void 0, false);
+		const session = this.client instanceof Pool ? new NeonSession(await this.client.connect(), this.dialect, this.relations, this.schema, this.options) : this;
+		const tx = new NeonTransaction(this.dialect, session, this.relations, this.schema);
 		await tx.execute(sql`begin ${tx.getTransactionConfigSQL(config)}`);
 		try {
 			const result = await transaction(tx);
@@ -64,9 +139,9 @@ var NeonSession = class NeonSession extends PgAsyncSession {
 };
 var NeonTransaction = class NeonTransaction extends PgAsyncTransaction {
 	static [entityKind] = "NeonTransaction";
-	transaction = async (transaction) => {
+	async transaction(transaction) {
 		const savepointName = `sp${this.nestedIndex + 1}`;
-		const tx = new NeonTransaction(this.dialect, this.session, this._.relations, this.nestedIndex + 1, false);
+		const tx = new NeonTransaction(this.dialect, this.session, this.relations, this.schema, this.nestedIndex + 1);
 		await tx.execute(sql.raw(`savepoint ${savepointName}`));
 		try {
 			const result = await transaction(tx);
@@ -76,9 +151,9 @@ var NeonTransaction = class NeonTransaction extends PgAsyncTransaction {
 			await tx.execute(sql.raw(`rollback to savepoint ${savepointName}`));
 			throw e;
 		}
-	};
+	}
 };
 
 //#endregion
-export { NeonSession, NeonTransaction };
+export { NeonPreparedQuery, NeonSession, NeonTransaction };
 //# sourceMappingURL=session.js.map