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

package/aws-data-api/pg/migrator.d.cts

@@ -4,7 +4,7 @@ import { MigrationConfig } from "../../migrator.cjs";
 import { AnyRelations } from "../../relations.cjs";
 
 //#region src/aws-data-api/pg/migrator.d.ts
-declare function migrate<TRelations extends AnyRelations>(db: AwsDataApiPgDatabase<TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: AwsDataApiPgDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.cts.map

package/aws-data-api/pg/migrator.d.ts

@@ -4,7 +4,7 @@ import { MigrationConfig } from "../../migrator.js";
 import { AnyRelations } from "../../relations.js";
 
 //#region src/aws-data-api/pg/migrator.d.ts
-declare function migrate<TRelations extends AnyRelations>(db: AwsDataApiPgDatabase<TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: AwsDataApiPgDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.ts.map

package/aws-data-api/pg/migrator.js.map

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

package/aws-data-api/pg/session.cjs

@@ -2,23 +2,119 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../../_virtual/_rolldown/runtime.cjs');
 const require_aws_data_api_common_index = require('../common/index.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 _aws_sdk_client_rds_data = require("@aws-sdk/client-rds-data");
 
 //#region src/aws-data-api/pg/session.ts
+var AwsDataApiPreparedQuery = class extends __pg_core_async_session_ts.PgAsyncPreparedQuery {
+	static [__entity_ts.entityKind] = "AwsDataApiPreparedQuery";
+	constructor(client, query, options, cache, queryMetadata, cacheConfig, fields, transactionId, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
+		super(query, cache, queryMetadata, cacheConfig);
+		this.client = client;
+		this.options = options;
+		this.fields = fields;
+		this.transactionId = transactionId;
+		this._isResponseInArrayMode = _isResponseInArrayMode;
+		this.customResultMapper = customResultMapper;
+		this.isRqbV2Query = isRqbV2Query;
+	}
+	async execute(placeholderValues = {}) {
+		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
+		const { fields, joinsNotNullableMap, customResultMapper } = this;
+		const result = await this.values(placeholderValues);
+		if (!fields && !customResultMapper) {
+			const { columnMetadata, rows } = result;
+			if (!columnMetadata) return result;
+			const mappedRows = rows.map((sourceRow) => {
+				const row = {};
+				for (const [index, value] of sourceRow.entries()) {
+					const metadata = columnMetadata[index];
+					if (!metadata) throw new Error(`Unexpected state: no column metadata found for index ${index}. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`);
+					if (!metadata.name) throw new Error(`Unexpected state: no column name for index ${index} found in the column metadata. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`);
+					row[metadata.name] = value;
+				}
+				return row;
+			});
+			return Object.assign(result, { rows: mappedRows });
+		}
+		return customResultMapper ? customResultMapper(result.rows) : result.rows.map((row) => (0, __utils_ts.mapResultRow)(fields, row, joinsNotNullableMap));
+	}
+	async executeRqbV2(placeholderValues = {}) {
+		const { customResultMapper } = this;
+		const { columnMetadata, rows } = await this.values(placeholderValues);
+		if (!columnMetadata) return customResultMapper(rows);
+		return customResultMapper(rows.map((sourceRow) => {
+			const row = {};
+			for (const [index, value] of sourceRow.entries()) {
+				const metadata = columnMetadata[index];
+				if (!metadata) throw new Error(`Unexpected state: no column metadata found for index ${index}. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`);
+				if (!metadata.name) throw new Error(`Unexpected state: no column name for index ${index} found in the column metadata. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`);
+				row[metadata.name] = value;
+			}
+			return row;
+		}));
+	}
+	async all(placeholderValues) {
+		const result = await this.execute(placeholderValues);
+		if (!this.fields && !this.customResultMapper) return result.rows;
+		return result;
+	}
+	async values(placeholderValues = {}) {
+		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues ?? {});
+		const command = new _aws_sdk_client_rds_data.ExecuteStatementCommand({
+			sql: this.query.sql,
+			parameters: [],
+			secretArn: this.options.secretArn,
+			resourceArn: this.options.resourceArn,
+			database: this.options.database,
+			transactionId: this.transactionId,
+			includeResultMetadata: this.isRqbV2Query || !this.fields && !this.customResultMapper
+		});
+		command.input.parameters = params.map((param, index) => ({
+			name: `${index + 1}`,
+			...require_aws_data_api_common_index.toValueParam(param, this.query.typings?.[index])
+		}));
+		this.options.logger?.logQuery(command.input.sql, command.input.parameters);
+		const result = await this.queryWithCache(this.query.sql, params, async () => {
+			return await this.client.send(command);
+		});
+		const rows = result.records?.map((row) => {
+			return row.map((field) => require_aws_data_api_common_index.getValueFromDataApi(field));
+		}) ?? [];
+		return {
+			...result,
+			rows
+		};
+	}
+	/** @internal */
+	mapResultRows(records, columnMetadata) {
+		return records.map((record) => {
+			const row = {};
+			for (const [index, field] of record.entries()) {
+				const { name } = columnMetadata[index];
+				row[name ?? index] = require_aws_data_api_common_index.getValueFromDataApi(field);
+			}
+			return row;
+		});
+	}
+	/** @internal */
+	isResponseInArrayMode() {
+		return this._isResponseInArrayMode;
+	}
+};
 var AwsDataApiSession = class AwsDataApiSession extends __pg_core_async_session_ts.PgAsyncSession {
 	static [__entity_ts.entityKind] = "AwsDataApiSession";
 	/** @internal */
 	rawQuery;
 	cache;
-	logger;
-	constructor(client, dialect, relations, options, transactionId) {
+	constructor(client, dialect, relations, schema, options, transactionId) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
+		this.schema = schema;
 		this.options = options;
 		this.transactionId = transactionId;
 		this.rawQuery = {
@@ -27,48 +123,20 @@ var AwsDataApiSession = class AwsDataApiSession extends __pg_core_async_session_
 			database: options.database
 		};
 		this.cache = options.cache ?? new __cache_core_cache_ts.NoopCache();
-		this.logger = options.logger ?? new __logger_ts.NoopLogger();
 	}
-	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
-		const executor = async (params) => {
-			const command = new _aws_sdk_client_rds_data.ExecuteStatementCommand({
-				sql: query.sql,
-				parameters: params ? params.map((param, index) => ({
-					name: `${index + 1}`,
-					...require_aws_data_api_common_index.toValueParam(param, query.typings?.[index])
-				})) : [],
-				secretArn: this.options.secretArn,
-				resourceArn: this.options.resourceArn,
-				database: this.options.database,
-				transactionId: this.transactionId,
-				includeResultMetadata: mode === "objects" || mode === "raw"
-			});
-			const result = await this.client.send(command);
-			const rows = result.records?.map((row) => {
-				return row.map((field) => require_aws_data_api_common_index.getValueFromDataApi(field));
-			}) ?? [];
-			if (mode === "arrays") return rows;
-			const { columnMetadata } = result;
-			if (!columnMetadata) return Object.assign(result, { rows });
-			const mappedRows = rows.map((sourceRow) => {
-				const row = {};
-				for (const [index, value] of sourceRow.entries()) {
-					const metadata = columnMetadata[index];
-					if (!metadata) throw new Error(`Unexpected state: no column metadata found for index ${index}. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`);
-					if (!metadata.name) throw new Error(`Unexpected state: no column name for index ${index} found in the column metadata. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`);
-					row[metadata.name] = value;
-				}
-				return row;
-			});
-			if (mode === "objects") return mappedRows;
-			return Object.assign(result, { rows: mappedRows });
-		};
-		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, transactionId) {
+		return new AwsDataApiPreparedQuery(this.client, query, this.options, this.cache, queryMetadata, cacheConfig, fields, transactionId ?? this.transactionId, isResponseInArrayMode, customResultMapper);
+	}
+	prepareRelationalQuery(query, fields, name, customResultMapper, transactionId) {
+		return new AwsDataApiPreparedQuery(this.client, query, this.options, this.cache, void 0, void 0, fields, transactionId ?? this.transactionId, false, customResultMapper, true);
+	}
+	execute(query) {
+		return this.prepareQuery(this.dialect.sqlToQuery(query), void 0, void 0, false, void 0, void 0, void 0, this.transactionId).execute();
 	}
 	async transaction(transaction, config) {
 		const { transactionId } = await this.client.send(new _aws_sdk_client_rds_data.BeginTransactionCommand(this.rawQuery));
-		const session = new AwsDataApiSession(this.client, this.dialect, this.relations, this.options, transactionId);
-		const tx = new AwsDataApiTransaction(this.dialect, session, this.relations, void 0, true);
+		const session = new AwsDataApiSession(this.client, this.dialect, this.relations, this.schema, this.options, transactionId);
+		const tx = new AwsDataApiTransaction(this.dialect, session, this.relations, this.schema, void 0, true);
 		if (config) await tx.setTransaction(config);
 		try {
 			const result = await transaction(tx);
@@ -88,9 +156,9 @@ var AwsDataApiSession = class AwsDataApiSession extends __pg_core_async_session_
 };
 var AwsDataApiTransaction = class AwsDataApiTransaction extends __pg_core_async_session_ts.PgAsyncTransaction {
 	static [__entity_ts.entityKind] = "AwsDataApiTransaction";
-	transaction = async (transaction) => {
+	async transaction(transaction) {
 		const savepointName = `sp${this.nestedIndex + 1}`;
-		const tx = new AwsDataApiTransaction(this.dialect, this.session, this._.relations, this.nestedIndex + 1, true);
+		const tx = new AwsDataApiTransaction(this.dialect, this.session, this.relations, this.schema, this.nestedIndex + 1);
 		await this.session.execute(__sql_sql_ts.sql.raw(`savepoint ${savepointName}`));
 		try {
 			const result = await transaction(tx);
@@ -100,10 +168,11 @@ var AwsDataApiTransaction = class AwsDataApiTransaction extends __pg_core_async_
 			await this.session.execute(__sql_sql_ts.sql.raw(`rollback to savepoint ${savepointName}`));
 			throw e;
 		}
-	};
+	}
 };
 
 //#endregion
+exports.AwsDataApiPreparedQuery = AwsDataApiPreparedQuery;
 exports.AwsDataApiSession = AwsDataApiSession;
 exports.AwsDataApiTransaction = AwsDataApiTransaction;
 //# sourceMappingURL=session.cjs.map

package/aws-data-api/pg/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["PgAsyncSession","entityKind","NoopCache","NoopLogger","ExecuteStatementCommand","toValueParam","getValueFromDataApi","PgAsyncPreparedQuery","BeginTransactionCommand","CommitTransactionCommand","RollbackTransactionCommand","PgAsyncTransaction","sql"],"sources":["../../../src/aws-data-api/pg/session.ts"],"sourcesContent":["import type { ExecuteStatementCommandOutput, RDSDataClient } from '@aws-sdk/client-rds-data';\nimport {\n\tBeginTransactionCommand,\n\tCommitTransactionCommand,\n\tExecuteStatementCommand,\n\tRollbackTransactionCommand,\n} from '@aws-sdk/client-rds-data';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { NoopCache } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport { type Logger, NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { type QueryWithTypings, sql } from '~/sql/sql.ts';\nimport { getValueFromDataApi, toValueParam } from '../common/index.ts';\n\nexport type AwsDataApiClient = RDSDataClient;\n\nexport interface AwsDataApiSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tdatabase: string;\n\tresourceArn: string;\n\tsecretArn: string;\n}\n\ninterface AwsDataApiQueryBase {\n\tresourceArn: string;\n\tsecretArn: string;\n\tdatabase: string;\n}\n\nexport class AwsDataApiSession<\n\tTRelations extends AnyRelations,\n> extends PgAsyncSession<AwsDataApiPgQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'AwsDataApiSession';\n\n\t/** @internal */\n\treadonly rawQuery: AwsDataApiQueryBase;\n\tprivate cache: Cache;\n\tprivate logger: Logger;\n\n\tconstructor(\n\t\t/** @internal */\n\t\treadonly client: AwsDataApiClient,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate options: AwsDataApiSessionOptions,\n\t\t/** @internal */\n\t\treadonly transactionId: string | undefined,\n\t) {\n\t\tsuper(dialect);\n\t\tthis.rawQuery = {\n\t\t\tsecretArn: options.secretArn,\n\t\t\tresourceArn: options.resourceArn,\n\t\t\tdatabase: options.database,\n\t\t};\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\t_name: string | boolean,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PgAsyncPreparedQuery<T> {\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\tconst command = new ExecuteStatementCommand({\n\t\t\t\tsql: query.sql,\n\t\t\t\tparameters: params\n\t\t\t\t\t? params.map((param, index) => ({\n\t\t\t\t\t\tname: `${index + 1}`,\n\t\t\t\t\t\t...toValueParam(param, query.typings?.[index]),\n\t\t\t\t\t}))\n\t\t\t\t\t: [],\n\t\t\t\tsecretArn: this.options.secretArn,\n\t\t\t\tresourceArn: this.options.resourceArn,\n\t\t\t\tdatabase: this.options.database,\n\t\t\t\ttransactionId: this.transactionId,\n\t\t\t\tincludeResultMetadata: mode === 'objects' || mode === 'raw',\n\t\t\t});\n\n\t\t\tconst result = await this.client.send(command);\n\t\t\tconst rows = result.records?.map((row) => {\n\t\t\t\treturn row.map((field) => getValueFromDataApi(field));\n\t\t\t}) ?? [];\n\n\t\t\tif (mode === 'arrays') return rows;\n\n\t\t\tconst { columnMetadata } = result;\n\t\t\tif (!columnMetadata) {\n\t\t\t\treturn Object.assign(result, { rows });\n\t\t\t}\n\n\t\t\tconst mappedRows = rows.map((sourceRow) => {\n\t\t\t\tconst row: Record<string, unknown> = {};\n\t\t\t\tfor (const [index, value] of sourceRow.entries()) {\n\t\t\t\t\tconst metadata = columnMetadata[index];\n\t\t\t\t\tif (!metadata) {\n\t\t\t\t\t\tthrow new Error(\n\t\t\t\t\t\t\t`Unexpected state: no column metadata found for index ${index}. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`,\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t\tif (!metadata.name) {\n\t\t\t\t\t\tthrow new Error(\n\t\t\t\t\t\t\t`Unexpected state: no column name for index ${index} found in the column metadata. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`,\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t\trow[metadata.name] = value;\n\t\t\t\t}\n\t\t\t\treturn row;\n\t\t\t});\n\n\t\t\tif (mode === 'objects') return mappedRows;\n\t\t\treturn Object.assign(result, { rows: mappedRows });\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: AwsDataApiTransaction<TRelations>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig | undefined,\n\t): Promise<T> {\n\t\tconst { transactionId } = await this.client.send(new BeginTransactionCommand(this.rawQuery));\n\t\tconst session = new AwsDataApiSession(\n\t\t\tthis.client,\n\t\t\tthis.dialect,\n\t\t\tthis.relations,\n\t\t\tthis.options,\n\t\t\ttransactionId,\n\t\t);\n\t\tconst tx = new AwsDataApiTransaction<TRelations>(\n\t\t\tthis.dialect,\n\t\t\tsession,\n\t\t\tthis.relations,\n\t\t\tundefined,\n\t\t\ttrue,\n\t\t);\n\t\tif (config) {\n\t\t\tawait tx.setTransaction(config);\n\t\t}\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait this.client.send(new CommitTransactionCommand({ ...this.rawQuery, transactionId }));\n\t\t\treturn result;\n\t\t} catch (e) {\n\t\t\tawait this.client.send(new RollbackTransactionCommand({ ...this.rawQuery, transactionId }));\n\t\t\tthrow e;\n\t\t}\n\t}\n}\n\nexport class AwsDataApiTransaction<\n\tTRelations extends AnyRelations,\n> extends PgAsyncTransaction<AwsDataApiPgQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'AwsDataApiTransaction';\n\n\toverride transaction = async <T>(\n\t\ttransaction: (tx: AwsDataApiTransaction<TRelations>) => Promise<T>,\n\t): Promise<T> => {\n\t\tconst savepointName = `sp${this.nestedIndex + 1}`;\n\t\tconst tx = new AwsDataApiTransaction<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\ttrue,\n\t\t);\n\t\tawait this.session.execute(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait this.session.execute(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (e) {\n\t\t\tawait this.session.execute(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow e;\n\t\t}\n\t};\n}\n\nexport type AwsDataApiPgQueryResult<T> = ExecuteStatementCommandOutput & { rows: T[] };\n\nexport interface AwsDataApiPgQueryResultHKT extends PgQueryResultHKT {\n\ttype: AwsDataApiPgQueryResult<this['row']>;\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.cjs","names":["PgAsyncPreparedQuery","entityKind","ExecuteStatementCommand","toValueParam","getValueFromDataApi","PgAsyncSession","NoopCache","BeginTransactionCommand","CommitTransactionCommand","RollbackTransactionCommand","PgAsyncTransaction","sql"],"sources":["../../../src/aws-data-api/pg/session.ts"],"sourcesContent":["import type { ColumnMetadata, ExecuteStatementCommandOutput, Field, RDSDataClient } from '@aws-sdk/client-rds-data';\nimport {\n\tBeginTransactionCommand,\n\tCommitTransactionCommand,\n\tExecuteStatementCommand,\n\tRollbackTransactionCommand,\n} from '@aws-sdk/client-rds-data';\nimport type * as V1 from '~/_relations.ts';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { 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 { 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 QueryWithTypings, type SQL, sql } from '~/sql/sql.ts';\nimport { mapResultRow } from '~/utils.ts';\nimport { getValueFromDataApi, toValueParam } from '../common/index.ts';\n\nexport type AwsDataApiClient = RDSDataClient;\n\nexport class AwsDataApiPreparedQuery<\n\tT extends PreparedQueryConfig & { values: AwsDataApiPgQueryResult<unknown[]> },\n\tTIsRqbV2 extends boolean = false,\n> extends PgAsyncPreparedQuery<T> {\n\tstatic override readonly [entityKind]: string = 'AwsDataApiPreparedQuery';\n\n\tdeclare protected query: QueryWithTypings;\n\n\tconstructor(\n\t\tprivate client: AwsDataApiClient,\n\t\tquery: QueryWithTypings,\n\t\tprivate options: AwsDataApiSessionOptions,\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\t/** @internal */\n\t\treadonly transactionId: 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 { fields, joinsNotNullableMap, customResultMapper } = this;\n\n\t\tconst result = await this.values(placeholderValues);\n\t\tif (!fields && !customResultMapper) {\n\t\t\tconst { columnMetadata, rows } = result;\n\t\t\tif (!columnMetadata) {\n\t\t\t\treturn result;\n\t\t\t}\n\t\t\tconst mappedRows = rows.map((sourceRow) => {\n\t\t\t\tconst row: Record<string, unknown> = {};\n\t\t\t\tfor (const [index, value] of sourceRow.entries()) {\n\t\t\t\t\tconst metadata = columnMetadata[index];\n\t\t\t\t\tif (!metadata) {\n\t\t\t\t\t\tthrow new Error(\n\t\t\t\t\t\t\t`Unexpected state: no column metadata found for index ${index}. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`,\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t\tif (!metadata.name) {\n\t\t\t\t\t\tthrow new Error(\n\t\t\t\t\t\t\t`Unexpected state: no column name for index ${index} found in the column metadata. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`,\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t\trow[metadata.name] = value;\n\t\t\t\t}\n\t\t\t\treturn row;\n\t\t\t});\n\t\t\treturn Object.assign(result, { rows: mappedRows });\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(fields!, row, joinsNotNullableMap));\n\t}\n\n\tprivate async executeRqbV2(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tconst { customResultMapper } = this;\n\n\t\tconst result = await this.values(placeholderValues);\n\t\tconst { columnMetadata, rows } = result;\n\t\tif (!columnMetadata) {\n\t\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(\n\t\t\t\trows as [],\n\t\t\t);\n\t\t}\n\t\tconst mappedRows = rows.map((sourceRow) => {\n\t\t\tconst row: Record<string, unknown> = {};\n\t\t\tfor (const [index, value] of sourceRow.entries()) {\n\t\t\t\tconst metadata = columnMetadata[index];\n\t\t\t\tif (!metadata) {\n\t\t\t\t\tthrow new Error(\n\t\t\t\t\t\t`Unexpected state: no column metadata found for index ${index}. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`,\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t\tif (!metadata.name) {\n\t\t\t\t\tthrow new Error(\n\t\t\t\t\t\t`Unexpected state: no column name for index ${index} found in the column metadata. Please report this issue on GitHub: https://github.com/drizzle-team/drizzle-orm/issues/new/choose`,\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t\trow[metadata.name] = value;\n\t\t\t}\n\t\t\treturn row;\n\t\t});\n\n\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(\n\t\t\tmappedRows,\n\t\t);\n\t}\n\n\tasync all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']> {\n\t\tconst result = await this.execute(placeholderValues);\n\t\tif (!this.fields && !this.customResultMapper) {\n\t\t\treturn (result as AwsDataApiPgQueryResult<unknown>).rows;\n\t\t}\n\t\treturn result;\n\t}\n\n\tasync values(placeholderValues: Record<string, unknown> = {}): Promise<T['values']> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\n\t\tconst command = new ExecuteStatementCommand({\n\t\t\tsql: this.query.sql,\n\t\t\tparameters: [],\n\t\t\tsecretArn: this.options.secretArn,\n\t\t\tresourceArn: this.options.resourceArn,\n\t\t\tdatabase: this.options.database,\n\t\t\ttransactionId: this.transactionId,\n\t\t\tincludeResultMetadata: this.isRqbV2Query || (!this.fields && !this.customResultMapper),\n\t\t});\n\n\t\tcommand.input.parameters = params.map((param, index) => ({\n\t\t\tname: `${index + 1}`,\n\t\t\t...toValueParam(param, this.query.typings?.[index]),\n\t\t}));\n\n\t\tthis.options.logger?.logQuery(command.input.sql!, command.input.parameters);\n\n\t\tconst result = await this.queryWithCache(this.query.sql, params, async () => {\n\t\t\treturn await this.client.send(command);\n\t\t});\n\t\tconst rows = result.records?.map((row) => {\n\t\t\treturn row.map((field) => getValueFromDataApi(field));\n\t\t}) ?? [];\n\n\t\treturn {\n\t\t\t...result,\n\t\t\trows,\n\t\t};\n\t}\n\n\t/** @internal */\n\tmapResultRows(records: Field[][], columnMetadata: ColumnMetadata[]) {\n\t\treturn records.map((record) => {\n\t\t\tconst row: Record<string, unknown> = {};\n\t\t\tfor (const [index, field] of record.entries()) {\n\t\t\t\tconst { name } = columnMetadata[index]!;\n\t\t\t\trow[name ?? index] = getValueFromDataApi(field); // not what to default if name is undefined\n\t\t\t}\n\t\t\treturn row;\n\t\t});\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport interface AwsDataApiSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tdatabase: string;\n\tresourceArn: string;\n\tsecretArn: string;\n}\n\ninterface AwsDataApiQueryBase {\n\tresourceArn: string;\n\tsecretArn: string;\n\tdatabase: string;\n}\n\nexport class AwsDataApiSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<AwsDataApiPgQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'AwsDataApiSession';\n\n\t/** @internal */\n\treadonly rawQuery: AwsDataApiQueryBase;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\t/** @internal */\n\t\treadonly client: AwsDataApiClient,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tprivate options: AwsDataApiSessionOptions,\n\t\t/** @internal */\n\t\treadonly transactionId: string | undefined,\n\t) {\n\t\tsuper(dialect);\n\t\tthis.rawQuery = {\n\t\t\tsecretArn: options.secretArn,\n\t\t\tresourceArn: options.resourceArn,\n\t\t\tdatabase: options.database,\n\t\t};\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<\n\t\tT extends PreparedQueryConfig & {\n\t\t\tvalues: AwsDataApiPgQueryResult<unknown[]>;\n\t\t} = PreparedQueryConfig & {\n\t\t\tvalues: AwsDataApiPgQueryResult<unknown[]>;\n\t\t},\n\t>(\n\t\tquery: QueryWithTypings,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tqueryMetadata?: { type: 'select' | 'update' | 'delete' | 'insert'; tables: string[] },\n\t\tcacheConfig?: WithCacheConfig,\n\t\ttransactionId?: string,\n\t): AwsDataApiPreparedQuery<T> {\n\t\treturn new AwsDataApiPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.options,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t\tfields,\n\t\t\ttransactionId ?? this.transactionId,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper: (rows: Record<string, unknown>[]) => T['execute'],\n\t\ttransactionId?: string,\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new AwsDataApiPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.options,\n\t\t\tthis.cache,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfields,\n\t\t\ttransactionId ?? this.transactionId,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\toverride execute<T>(query: SQL): Promise<T> {\n\t\treturn this.prepareQuery<PreparedQueryConfig & { execute: T; values: AwsDataApiPgQueryResult<unknown[]> }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tthis.transactionId,\n\t\t).execute();\n\t}\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: AwsDataApiTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig | undefined,\n\t): Promise<T> {\n\t\tconst { transactionId } = await this.client.send(new BeginTransactionCommand(this.rawQuery));\n\t\tconst session = new AwsDataApiSession(\n\t\t\tthis.client,\n\t\t\tthis.dialect,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t\tthis.options,\n\t\t\ttransactionId,\n\t\t);\n\t\tconst tx = new AwsDataApiTransaction<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\tundefined,\n\t\t\ttrue,\n\t\t);\n\t\tif (config) {\n\t\t\tawait tx.setTransaction(config);\n\t\t}\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait this.client.send(new CommitTransactionCommand({ ...this.rawQuery, transactionId }));\n\t\t\treturn result;\n\t\t} catch (e) {\n\t\t\tawait this.client.send(new RollbackTransactionCommand({ ...this.rawQuery, transactionId }));\n\t\t\tthrow e;\n\t\t}\n\t}\n}\n\nexport class AwsDataApiTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<AwsDataApiPgQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'AwsDataApiTransaction';\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: AwsDataApiTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tconst savepointName = `sp${this.nestedIndex + 1}`;\n\t\tconst tx = new AwsDataApiTransaction<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 this.session.execute(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait this.session.execute(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (e) {\n\t\t\tawait this.session.execute(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow e;\n\t\t}\n\t}\n}\n\nexport type AwsDataApiPgQueryResult<T> = ExecuteStatementCommandOutput & { rows: T[] };\n\nexport interface AwsDataApiPgQueryResultHKT extends PgQueryResultHKT {\n\ttype: AwsDataApiPgQueryResult<any>;\n}\n"],"mappings":"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"}

package/aws-data-api/pg/session.d.cts

@@ -1,16 +1,40 @@
 import { entityKind } from "../../entity.cjs";
-import { QueryWithTypings } from "../../sql/sql.cjs";
+import { QueryWithTypings, SQL } from "../../sql/sql.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 { ExecuteStatementCommandOutput, RDSDataClient } from "@aws-sdk/client-rds-data";
+import { Logger } from "../../logger.cjs";
 
 //#region src/aws-data-api/pg/session.d.ts
 type AwsDataApiClient = RDSDataClient;
+declare class AwsDataApiPreparedQuery<T extends PreparedQueryConfig & {
+  values: AwsDataApiPgQueryResult<unknown[]>;
+}, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
+  private client;
+  private options;
+  private fields;
+  private _isResponseInArrayMode;
+  private customResultMapper?;
+  private isRqbV2Query?;
+  static readonly [entityKind]: string;
+  protected query: QueryWithTypings;
+  constructor(client: AwsDataApiClient, query: QueryWithTypings, options: AwsDataApiSessionOptions, cache: Cache, queryMetadata: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, /** @internal */
+
+  transactionId: 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>): Promise<T['values']>;
+}
 interface AwsDataApiSessionOptions {
   logger?: Logger;
   cache?: Cache;
@@ -18,33 +42,39 @@ interface AwsDataApiSessionOptions {
   resourceArn: string;
   secretArn: string;
 }
-declare class AwsDataApiSession<TRelations extends AnyRelations> extends PgAsyncSession<AwsDataApiPgQueryResultHKT, TRelations> {
+declare class AwsDataApiSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<AwsDataApiPgQueryResultHKT, TFullSchema, TRelations, TSchema> {
   private relations;
+  private schema;
   private options;
   static readonly [entityKind]: string;
   private cache;
-  private logger;
   constructor(/** @internal */
 
-  client: AwsDataApiClient, dialect: PgDialect, relations: TRelations, options: AwsDataApiSessionOptions, /** @internal */
+  client: AwsDataApiClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options: AwsDataApiSessionOptions, /** @internal */
 
   transactionId: string | undefined);
-  prepareQuery<T extends PreparedQueryConfig>(query: QueryWithTypings, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
+  prepareQuery<T extends PreparedQueryConfig & {
+    values: AwsDataApiPgQueryResult<unknown[]>;
+  } = PreparedQueryConfig & {
+    values: AwsDataApiPgQueryResult<unknown[]>;
+  }>(query: QueryWithTypings, 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: AwsDataApiTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig | undefined): Promise<T>;
+  }, cacheConfig?: WithCacheConfig, transactionId?: string): AwsDataApiPreparedQuery<T>;
+  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: QueryWithTypings, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper: (rows: Record<string, unknown>[]) => T['execute'], transactionId?: string): PgAsyncPreparedQuery<T>;
+  execute<T>(query: SQL): Promise<T>;
+  transaction<T>(transaction: (tx: AwsDataApiTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig | undefined): Promise<T>;
 }
-declare class AwsDataApiTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<AwsDataApiPgQueryResultHKT, TRelations> {
+declare class AwsDataApiTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<AwsDataApiPgQueryResultHKT, TFullSchema, TRelations, TSchema> {
   static readonly [entityKind]: string;
-  transaction: <T>(transaction: (tx: AwsDataApiTransaction<TRelations>) => Promise<T>) => Promise<T>;
+  transaction<T>(transaction: (tx: AwsDataApiTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
 }
 type AwsDataApiPgQueryResult<T> = ExecuteStatementCommandOutput & {
   rows: T[];
 };
 interface AwsDataApiPgQueryResultHKT extends PgQueryResultHKT {
-  type: AwsDataApiPgQueryResult<this['row']>;
+  type: AwsDataApiPgQueryResult<any>;
 }
 //#endregion
-export { AwsDataApiClient, AwsDataApiPgQueryResult, AwsDataApiPgQueryResultHKT, AwsDataApiSession, AwsDataApiSessionOptions, AwsDataApiTransaction };
+export { AwsDataApiClient, AwsDataApiPgQueryResult, AwsDataApiPgQueryResultHKT, AwsDataApiPreparedQuery, AwsDataApiSession, AwsDataApiSessionOptions, AwsDataApiTransaction };
 //# sourceMappingURL=session.d.cts.map

package/aws-data-api/pg/session.d.ts

@@ -1,16 +1,40 @@
 import { entityKind } from "../../entity.js";
-import { QueryWithTypings } from "../../sql/sql.js";
+import { QueryWithTypings, SQL } 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 { AnyRelations } from "../../relations.js";
 import { ExecuteStatementCommandOutput, RDSDataClient } from "@aws-sdk/client-rds-data";
 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/aws-data-api/pg/session.d.ts
 type AwsDataApiClient = RDSDataClient;
+declare class AwsDataApiPreparedQuery<T extends PreparedQueryConfig & {
+  values: AwsDataApiPgQueryResult<unknown[]>;
+}, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
+  private client;
+  private options;
+  private fields;
+  private _isResponseInArrayMode;
+  private customResultMapper?;
+  private isRqbV2Query?;
+  static readonly [entityKind]: string;
+  protected query: QueryWithTypings;
+  constructor(client: AwsDataApiClient, query: QueryWithTypings, options: AwsDataApiSessionOptions, cache: Cache, queryMetadata: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, /** @internal */
+
+  transactionId: 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>): Promise<T['values']>;
+}
 interface AwsDataApiSessionOptions {
   logger?: Logger;
   cache?: Cache;
@@ -18,33 +42,39 @@ interface AwsDataApiSessionOptions {
   resourceArn: string;
   secretArn: string;
 }
-declare class AwsDataApiSession<TRelations extends AnyRelations> extends PgAsyncSession<AwsDataApiPgQueryResultHKT, TRelations> {
+declare class AwsDataApiSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<AwsDataApiPgQueryResultHKT, TFullSchema, TRelations, TSchema> {
   private relations;
+  private schema;
   private options;
   static readonly [entityKind]: string;
   private cache;
-  private logger;
   constructor(/** @internal */
 
-  client: AwsDataApiClient, dialect: PgDialect, relations: TRelations, options: AwsDataApiSessionOptions, /** @internal */
+  client: AwsDataApiClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options: AwsDataApiSessionOptions, /** @internal */
 
   transactionId: string | undefined);
-  prepareQuery<T extends PreparedQueryConfig>(query: QueryWithTypings, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
+  prepareQuery<T extends PreparedQueryConfig & {
+    values: AwsDataApiPgQueryResult<unknown[]>;
+  } = PreparedQueryConfig & {
+    values: AwsDataApiPgQueryResult<unknown[]>;
+  }>(query: QueryWithTypings, 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: AwsDataApiTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig | undefined): Promise<T>;
+  }, cacheConfig?: WithCacheConfig, transactionId?: string): AwsDataApiPreparedQuery<T>;
+  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: QueryWithTypings, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper: (rows: Record<string, unknown>[]) => T['execute'], transactionId?: string): PgAsyncPreparedQuery<T>;
+  execute<T>(query: SQL): Promise<T>;
+  transaction<T>(transaction: (tx: AwsDataApiTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig | undefined): Promise<T>;
 }
-declare class AwsDataApiTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<AwsDataApiPgQueryResultHKT, TRelations> {
+declare class AwsDataApiTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<AwsDataApiPgQueryResultHKT, TFullSchema, TRelations, TSchema> {
   static readonly [entityKind]: string;
-  transaction: <T>(transaction: (tx: AwsDataApiTransaction<TRelations>) => Promise<T>) => Promise<T>;
+  transaction<T>(transaction: (tx: AwsDataApiTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
 }
 type AwsDataApiPgQueryResult<T> = ExecuteStatementCommandOutput & {
   rows: T[];
 };
 interface AwsDataApiPgQueryResultHKT extends PgQueryResultHKT {
-  type: AwsDataApiPgQueryResult<this['row']>;
+  type: AwsDataApiPgQueryResult<any>;
 }
 //#endregion
-export { AwsDataApiClient, AwsDataApiPgQueryResult, AwsDataApiPgQueryResultHKT, AwsDataApiSession, AwsDataApiSessionOptions, AwsDataApiTransaction };
+export { AwsDataApiClient, AwsDataApiPgQueryResult, AwsDataApiPgQueryResultHKT, AwsDataApiPreparedQuery, AwsDataApiSession, AwsDataApiSessionOptions, AwsDataApiTransaction };
 //# sourceMappingURL=session.d.ts.map