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

package/pg-core/async/refresh-materialized-view.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"refresh-materialized-view.cjs","names":["PgRefreshMaterializedView","entityKind","tracer","QueryPromise"],"sources":["../../../src/pg-core/async/refresh-materialized-view.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport type { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { tracer } from '~/tracing.ts';\nimport { applyMixins } from '~/utils.ts';\nimport { PgRefreshMaterializedView } from '../query-builders/refresh-materialized-view.ts';\nimport type { PgAsyncPreparedQuery, PgAsyncSession } from './session.ts';\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PgAsyncRefreshMaterializedView<TQueryResult extends PgQueryResultHKT>\n\textends QueryPromise<PgQueryResultKind<TQueryResult, never>>\n{}\n\nexport class PgAsyncRefreshMaterializedView<TQueryResult extends PgQueryResultHKT>\n\textends PgRefreshMaterializedView<TQueryResult>\n\timplements RunnableQuery<PgQueryResultKind<TQueryResult, never>, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgAsyncRefreshMaterializedView';\n\n\tdeclare protected session: PgAsyncSession;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgAsyncPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t}\n\t> {\n\t\treturn tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\tconst query = this.dialect.sqlToQuery(this.getSQL());\n\t\t\treturn this.session.prepareQuery(\n\t\t\t\tquery,\n\t\t\t\t'raw',\n\t\t\t\tname ?? generateName,\n\t\t\t);\n\t\t});\n\t}\n\n\tprepare(name?: string): PgAsyncPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t}\n\t> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\treturn this._prepare().execute(placeholderValues);\n\t\t});\n\t};\n}\n\napplyMixins(PgAsyncRefreshMaterializedView, [QueryPromise]);\n"],"mappings":";;;;;;;;;AAcA,IAAa,iCAAb,cACSA,mFAET;CACC,QAA0BC,0BAAsB;;CAKhD,SAAS,MAAe,eAAe,OAIrC;AACD,SAAOC,oBAAO,gBAAgB,8BAA8B;GAC3D,MAAM,QAAQ,KAAK,QAAQ,WAAW,KAAK,QAAQ,CAAC;AACpD,UAAO,KAAK,QAAQ,aACnB,OACA,OACA,QAAQ,aACR;IACA;;CAGH,QAAQ,MAIN;AACD,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAsB;AACxE,SAAOA,oBAAO,gBAAgB,2BAA2B;AACxD,UAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;IAChD;;;4BAIQ,gCAAgC,CAACC,gCAAa,CAAC"}
+{"version":3,"file":"refresh-materialized-view.cjs","names":["PgRefreshMaterializedView","entityKind","tracer","QueryPromise"],"sources":["../../../src/pg-core/async/refresh-materialized-view.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport type { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { tracer } from '~/tracing.ts';\nimport { applyMixins, type NeonAuthToken } from '~/utils.ts';\nimport { PgRefreshMaterializedView } from '../query-builders/refresh-materialized-view.ts';\nimport type { PgAsyncPreparedQuery, PgAsyncSession } from './session.ts';\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PgAsyncRefreshMaterializedView<TQueryResult extends PgQueryResultHKT>\n\textends QueryPromise<PgQueryResultKind<TQueryResult, never>>\n{}\n\nexport class PgAsyncRefreshMaterializedView<TQueryResult extends PgQueryResultHKT>\n\textends PgRefreshMaterializedView<TQueryResult>\n\timplements RunnableQuery<PgQueryResultKind<TQueryResult, never>, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgAsyncRefreshMaterializedView';\n\n\tdeclare protected session: PgAsyncSession;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgAsyncPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t}\n\t> {\n\t\treturn tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\tconst query = this.dialect.sqlToQuery(this.getSQL());\n\t\t\treturn this.session.prepareQuery(\n\t\t\t\tquery,\n\t\t\t\tundefined,\n\t\t\t\tname ?? (generateName ? preparedStatementName(query.sql, query.params) : name),\n\t\t\t\ttrue,\n\t\t\t).setToken(\n\t\t\t\tthis.authToken,\n\t\t\t);\n\t\t});\n\t}\n\n\tprepare(name?: string): PgAsyncPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t}\n\t> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\t/** @internal */\n\tprivate authToken?: NeonAuthToken;\n\t/** @internal */\n\tsetToken(token: NeonAuthToken) {\n\t\tthis.authToken = token;\n\t\treturn this;\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\treturn this._prepare().execute(placeholderValues);\n\t\t});\n\t};\n}\n\napplyMixins(PgAsyncRefreshMaterializedView, [QueryPromise]);\n"],"mappings":";;;;;;;;;;AAeA,IAAa,iCAAb,cACSA,mFAET;CACC,QAA0BC,0BAAsB;;CAKhD,SAAS,MAAe,eAAe,OAIrC;AACD,SAAOC,oBAAO,gBAAgB,8BAA8B;GAC3D,MAAM,QAAQ,KAAK,QAAQ,WAAW,KAAK,QAAQ,CAAC;AACpD,UAAO,KAAK,QAAQ,aACnB,OACA,QACA,SAAS,oEAAqC,MAAM,KAAK,MAAM,OAAO,GAAG,OACzE,KACA,CAAC,SACD,KAAK,UACL;IACA;;CAGH,QAAQ,MAIN;AACD,SAAO,KAAK,SAAS,MAAM,KAAK;;;CAIjC,AAAQ;;CAER,SAAS,OAAsB;AAC9B,OAAK,YAAY;AACjB,SAAO;;CAGR,WAAmD,sBAAsB;AACxE,SAAOA,oBAAO,gBAAgB,2BAA2B;AACxD,UAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;IAChD;;;4BAIQ,gCAAgC,CAACC,gCAAa,CAAC"}

package/pg-core/async/refresh-materialized-view.js

@@ -3,6 +3,7 @@ import { entityKind } from "../../entity.js";
 import { tracer } from "../../tracing.js";
 import { applyMixins } from "../../utils.js";
 import { QueryPromise } from "../../query-promise.js";
+import { preparedStatementName } from "../../query-name-generator.js";
 
 //#region src/pg-core/async/refresh-materialized-view.ts
 var PgAsyncRefreshMaterializedView = class extends PgRefreshMaterializedView {
@@ -11,12 +12,19 @@ var PgAsyncRefreshMaterializedView = class extends PgRefreshMaterializedView {
 	_prepare(name, generateName = false) {
 		return tracer.startActiveSpan("drizzle.prepareQuery", () => {
 			const query = this.dialect.sqlToQuery(this.getSQL());
-			return this.session.prepareQuery(query, "raw", name ?? generateName);
+			return this.session.prepareQuery(query, void 0, name ?? (generateName ? preparedStatementName(query.sql, query.params) : name), true).setToken(this.authToken);
 		});
 	}
 	prepare(name) {
 		return this._prepare(name, true);
 	}
+	/** @internal */
+	authToken;
+	/** @internal */
+	setToken(token) {
+		this.authToken = token;
+		return this;
+	}
 	execute = (placeholderValues) => {
 		return tracer.startActiveSpan("drizzle.operation", () => {
 			return this._prepare().execute(placeholderValues);

package/pg-core/async/refresh-materialized-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"refresh-materialized-view.js","names":[],"sources":["../../../src/pg-core/async/refresh-materialized-view.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport type { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { tracer } from '~/tracing.ts';\nimport { applyMixins } from '~/utils.ts';\nimport { PgRefreshMaterializedView } from '../query-builders/refresh-materialized-view.ts';\nimport type { PgAsyncPreparedQuery, PgAsyncSession } from './session.ts';\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PgAsyncRefreshMaterializedView<TQueryResult extends PgQueryResultHKT>\n\textends QueryPromise<PgQueryResultKind<TQueryResult, never>>\n{}\n\nexport class PgAsyncRefreshMaterializedView<TQueryResult extends PgQueryResultHKT>\n\textends PgRefreshMaterializedView<TQueryResult>\n\timplements RunnableQuery<PgQueryResultKind<TQueryResult, never>, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgAsyncRefreshMaterializedView';\n\n\tdeclare protected session: PgAsyncSession;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgAsyncPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t}\n\t> {\n\t\treturn tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\tconst query = this.dialect.sqlToQuery(this.getSQL());\n\t\t\treturn this.session.prepareQuery(\n\t\t\t\tquery,\n\t\t\t\t'raw',\n\t\t\t\tname ?? generateName,\n\t\t\t);\n\t\t});\n\t}\n\n\tprepare(name?: string): PgAsyncPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t}\n\t> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\treturn this._prepare().execute(placeholderValues);\n\t\t});\n\t};\n}\n\napplyMixins(PgAsyncRefreshMaterializedView, [QueryPromise]);\n"],"mappings":";;;;;;;AAcA,IAAa,iCAAb,cACS,0BAET;CACC,QAA0B,cAAsB;;CAKhD,SAAS,MAAe,eAAe,OAIrC;AACD,SAAO,OAAO,gBAAgB,8BAA8B;GAC3D,MAAM,QAAQ,KAAK,QAAQ,WAAW,KAAK,QAAQ,CAAC;AACpD,UAAO,KAAK,QAAQ,aACnB,OACA,OACA,QAAQ,aACR;IACA;;CAGH,QAAQ,MAIN;AACD,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAsB;AACxE,SAAO,OAAO,gBAAgB,2BAA2B;AACxD,UAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;IAChD;;;AAIJ,YAAY,gCAAgC,CAAC,aAAa,CAAC"}
+{"version":3,"file":"refresh-materialized-view.js","names":[],"sources":["../../../src/pg-core/async/refresh-materialized-view.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport type { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { tracer } from '~/tracing.ts';\nimport { applyMixins, type NeonAuthToken } from '~/utils.ts';\nimport { PgRefreshMaterializedView } from '../query-builders/refresh-materialized-view.ts';\nimport type { PgAsyncPreparedQuery, PgAsyncSession } from './session.ts';\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PgAsyncRefreshMaterializedView<TQueryResult extends PgQueryResultHKT>\n\textends QueryPromise<PgQueryResultKind<TQueryResult, never>>\n{}\n\nexport class PgAsyncRefreshMaterializedView<TQueryResult extends PgQueryResultHKT>\n\textends PgRefreshMaterializedView<TQueryResult>\n\timplements RunnableQuery<PgQueryResultKind<TQueryResult, never>, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgAsyncRefreshMaterializedView';\n\n\tdeclare protected session: PgAsyncSession;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgAsyncPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t}\n\t> {\n\t\treturn tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\tconst query = this.dialect.sqlToQuery(this.getSQL());\n\t\t\treturn this.session.prepareQuery(\n\t\t\t\tquery,\n\t\t\t\tundefined,\n\t\t\t\tname ?? (generateName ? preparedStatementName(query.sql, query.params) : name),\n\t\t\t\ttrue,\n\t\t\t).setToken(\n\t\t\t\tthis.authToken,\n\t\t\t);\n\t\t});\n\t}\n\n\tprepare(name?: string): PgAsyncPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t}\n\t> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\t/** @internal */\n\tprivate authToken?: NeonAuthToken;\n\t/** @internal */\n\tsetToken(token: NeonAuthToken) {\n\t\tthis.authToken = token;\n\t\treturn this;\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\treturn this._prepare().execute(placeholderValues);\n\t\t});\n\t};\n}\n\napplyMixins(PgAsyncRefreshMaterializedView, [QueryPromise]);\n"],"mappings":";;;;;;;;AAeA,IAAa,iCAAb,cACS,0BAET;CACC,QAA0B,cAAsB;;CAKhD,SAAS,MAAe,eAAe,OAIrC;AACD,SAAO,OAAO,gBAAgB,8BAA8B;GAC3D,MAAM,QAAQ,KAAK,QAAQ,WAAW,KAAK,QAAQ,CAAC;AACpD,UAAO,KAAK,QAAQ,aACnB,OACA,QACA,SAAS,eAAe,sBAAsB,MAAM,KAAK,MAAM,OAAO,GAAG,OACzE,KACA,CAAC,SACD,KAAK,UACL;IACA;;CAGH,QAAQ,MAIN;AACD,SAAO,KAAK,SAAS,MAAM,KAAK;;;CAIjC,AAAQ;;CAER,SAAS,OAAsB;AAC9B,OAAK,YAAY;AACjB,SAAO;;CAGR,WAAmD,sBAAsB;AACxE,SAAO,OAAO,gBAAgB,2BAA2B;AACxD,UAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;IAChD;;;AAIJ,YAAY,gCAAgC,CAAC,aAAa,CAAC"}

package/pg-core/async/select.cjs

@@ -5,22 +5,24 @@ let __entity_ts = require("../../entity.cjs");
 let __tracing_ts = require("../../tracing.cjs");
 let __utils_ts = require("../../utils.cjs");
 let __query_promise_ts = require("../../query-promise.cjs");
+let __query_name_generator_ts = require("../../query-name-generator.cjs");
 
 //#region src/pg-core/async/select.ts
 var PgAsyncSelectBase = class extends require_pg_core_query_builders_select.PgSelectBase {
 	static [__entity_ts.entityKind] = "PgAsyncSelectQueryBuilder";
 	/** @internal */
 	_prepare(name, generateName = false) {
-		const { session, config, dialect, joinsNotNullableMap, cacheConfig, usedTables } = this;
+		const { session, config, dialect, joinsNotNullableMap, authToken, cacheConfig, usedTables } = this;
 		const { fields } = config;
 		return __tracing_ts.tracer.startActiveSpan("drizzle.prepareQuery", () => {
 			const query = dialect.sqlToQuery(this.getSQL());
-			const fieldsList = (0, __utils_ts.orderSelectedFields)(fields, void 0, this.dialect.codecs);
-			const mapper = this.dialect.mapperGenerators.rows(fieldsList, joinsNotNullableMap);
-			return session.prepareQuery(query, "arrays", name ?? generateName, mapper, {
+			const fieldsList = (0, __utils_ts.orderSelectedFields)(fields);
+			const preparedQuery = session.prepareQuery(query, fieldsList, name ?? (generateName ? (0, __query_name_generator_ts.preparedStatementName)(query.sql, query.params) : name), true, void 0, {
 				type: "select",
 				tables: [...usedTables]
 			}, cacheConfig);
+			preparedQuery.joinsNotNullableMap = joinsNotNullableMap;
+			return preparedQuery.setToken(authToken);
 		});
 	}
 	/**
@@ -33,6 +35,13 @@ var PgAsyncSelectBase = class extends require_pg_core_query_builders_select.PgSe
 	prepare(name) {
 		return this._prepare(name, true);
 	}
+	/** @internal */
+	authToken;
+	/** @internal */
+	setToken(token) {
+		this.authToken = token;
+		return this;
+	}
 	execute(placeholderValues) {
 		return __tracing_ts.tracer.startActiveSpan("drizzle.operation", () => {
 			return this._prepare().execute(placeholderValues);

package/pg-core/async/select.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"select.cjs","names":["PgSelectBase","entityKind","tracer","QueryPromise"],"sources":["../../../src/pg-core/async/select.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport type {\n\tBuildSubquerySelection,\n\tJoinNullability,\n\tSelectMode,\n\tSelectResult,\n} from '~/query-builders/select.types.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport type { ColumnsSelection } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { applyMixins, type Assume, orderSelectedFields } from '~/utils.ts';\nimport type { PgColumn } from '../columns/index.ts';\nimport { PgSelectBase, type PgSelectBuilder } from '../query-builders/select.ts';\nimport type { PgSelectHKTBase, SelectedFields } from '../query-builders/select.types.ts';\nimport type { PreparedQueryConfig } from '../session.ts';\nimport type { PgAsyncPreparedQuery, PgAsyncSession } from './session.ts';\n\nexport type PgAsyncSelectPrepare<T extends AnyPgAsyncSelect> = PgAsyncPreparedQuery<\n\tPreparedQueryConfig & {\n\t\texecute: T['_']['result'];\n\t}\n>;\n\nexport type PgAsyncSelectBuilder<\n\tTSelection extends SelectedFields | undefined,\n> = PgSelectBuilder<TSelection, PgAsyncSelectHKT>;\n\nexport type PgAsyncSelect<\n\tTTableName extends string | undefined = string | undefined,\n\tTSelection extends ColumnsSelection = Record<string, any>,\n\tTSelectMode extends SelectMode = SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = Record<string, JoinNullability>,\n> = PgAsyncSelectBase<\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\ttrue,\n\tnever\n>;\n\nexport interface PgAsyncSelectHKT extends PgSelectHKTBase {\n\t_type: PgAsyncSelectBase<\n\t\tthis['tableName'],\n\t\tAssume<this['selection'], ColumnsSelection>,\n\t\tthis['selectMode'],\n\t\tAssume<this['nullabilityMap'], Record<string, JoinNullability>>,\n\t\tthis['dynamic'],\n\t\tthis['excludedMethods'],\n\t\tAssume<this['result'], any[]>,\n\t\tAssume<this['selectedFields'], ColumnsSelection>\n\t>;\n}\n\nexport interface PgAsyncSelectBase<\n\tTTableName extends string | undefined,\n\tTSelection extends ColumnsSelection | undefined,\n\tTSelectMode extends SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'>\n\t\t: {},\n\t// oxlint-disable-next-line no-unused-vars\n\tTDynamic extends boolean = false,\n\t// oxlint-disable-next-line no-unused-vars\n\tTExcludedMethods extends string = never,\n\t// oxlint-disable-next-line no-unused-vars\n\tTResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[],\n\t// oxlint-disable-next-line no-unused-vars\n\tTSelectedFields extends ColumnsSelection = BuildSubquerySelection<\n\t\tAssume<TSelection, ColumnsSelection>,\n\t\tTNullabilityMap\n\t>,\n> extends QueryPromise<TResult> {\n}\n\nexport class PgAsyncSelectBase<\n\tTTableName extends string | undefined,\n\tTSelection extends ColumnsSelection | undefined,\n\tTSelectMode extends SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'>\n\t\t: {},\n\tTDynamic extends boolean = false,\n\tTExcludedMethods extends string = never,\n\tTResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[],\n\tTSelectedFields extends ColumnsSelection = BuildSubquerySelection<\n\t\tAssume<TSelection, ColumnsSelection>,\n\t\tTNullabilityMap\n\t>,\n> extends PgSelectBase<\n\tPgAsyncSelectHKT,\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\tTDynamic,\n\tTExcludedMethods,\n\tTResult,\n\tTSelectedFields\n> {\n\tstatic override readonly [entityKind]: string = 'PgAsyncSelectQueryBuilder';\n\n\tdeclare protected session: PgAsyncSession;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgAsyncSelectPrepare<this> {\n\t\tconst { session, config, dialect, joinsNotNullableMap, cacheConfig, usedTables } = this;\n\t\tconst { fields } = config;\n\n\t\treturn tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\tconst query = dialect.sqlToQuery(this.getSQL());\n\t\t\tconst fieldsList = orderSelectedFields<PgColumn>(\n\t\t\t\tfields,\n\t\t\t\tundefined,\n\t\t\t\tthis.dialect.codecs,\n\t\t\t);\n\n\t\t\tconst mapper = this.dialect.mapperGenerators.rows(fieldsList, joinsNotNullableMap);\n\n\t\t\tconst preparedQuery = session.prepareQuery<PreparedQueryConfig & { execute: any }>(\n\t\t\t\tquery,\n\t\t\t\t'arrays',\n\t\t\t\tname ?? generateName,\n\t\t\t\tmapper,\n\t\t\t\t{ type: 'select', tables: [...usedTables] },\n\t\t\t\tcacheConfig,\n\t\t\t);\n\n\t\t\treturn preparedQuery;\n\t\t});\n\t}\n\n\t/**\n\t * Create a prepared statement for this query. This allows\n\t * the database to remember this query for the given session\n\t * and call it by name, rather than specifying the full query.\n\t *\n\t * {@link https://www.postgresql.org/docs/current/sql-prepare.html | Postgres prepare documentation}\n\t */\n\tprepare(\n\t\tname?: string,\n\t): PgAsyncSelectPrepare<this> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute(placeholderValues?: Record<string, unknown>) {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\treturn this._prepare().execute(placeholderValues);\n\t\t});\n\t}\n}\n\napplyMixins(PgAsyncSelectBase, [QueryPromise]);\n\nexport type AnyPgAsyncSelect = PgAsyncSelectBase<any, any, any, any, any, any, any, any>;\n"],"mappings":";;;;;;;;;AA0EA,IAAa,oBAAb,cAaUA,mDAUR;CACD,QAA0BC,0BAAsB;;CAKhD,SAAS,MAAe,eAAe,OAAmC;EACzE,MAAM,EAAE,SAAS,QAAQ,SAAS,qBAAqB,aAAa,eAAe;EACnF,MAAM,EAAE,WAAW;AAEnB,SAAOC,oBAAO,gBAAgB,8BAA8B;GAC3D,MAAM,QAAQ,QAAQ,WAAW,KAAK,QAAQ,CAAC;GAC/C,MAAM,iDACL,QACA,QACA,KAAK,QAAQ,OACb;GAED,MAAM,SAAS,KAAK,QAAQ,iBAAiB,KAAK,YAAY,oBAAoB;AAWlF,UATsB,QAAQ,aAC7B,OACA,UACA,QAAQ,cACR,QACA;IAAE,MAAM;IAAU,QAAQ,CAAC,GAAG,WAAW;IAAE,EAC3C,YACA;IAGA;;;;;;;;;CAUH,QACC,MAC6B;AAC7B,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,QAAQ,mBAA6C;AACpD,SAAOA,oBAAO,gBAAgB,2BAA2B;AACxD,UAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;IAChD;;;4BAIQ,mBAAmB,CAACC,gCAAa,CAAC"}
+{"version":3,"file":"select.cjs","names":["PgSelectBase","entityKind","tracer","QueryPromise"],"sources":["../../../src/pg-core/async/select.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport type {\n\tBuildSubquerySelection,\n\tJoinNullability,\n\tSelectMode,\n\tSelectResult,\n} from '~/query-builders/select.types.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport type { ColumnsSelection } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { applyMixins, type Assume, type NeonAuthToken, orderSelectedFields } from '~/utils.ts';\nimport type { PgColumn } from '../columns/index.ts';\nimport { PgSelectBase, type PgSelectBuilder } from '../query-builders/select.ts';\nimport type { PgSelectHKTBase, SelectedFields } from '../query-builders/select.types.ts';\nimport type { PreparedQueryConfig } from '../session.ts';\nimport type { PgAsyncPreparedQuery, PgAsyncSession } from './session.ts';\n\nexport type PgAsyncSelectPrepare<T extends AnyPgAsyncSelect> = PgAsyncPreparedQuery<\n\tPreparedQueryConfig & {\n\t\texecute: T['_']['result'];\n\t}\n>;\n\nexport type PgAsyncSelectBuilder<\n\tTSelection extends SelectedFields | undefined,\n> = PgSelectBuilder<TSelection, PgAsyncSelectHKT>;\n\nexport type PgAsyncSelect<\n\tTTableName extends string | undefined = string | undefined,\n\tTSelection extends ColumnsSelection = Record<string, any>,\n\tTSelectMode extends SelectMode = SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = Record<string, JoinNullability>,\n> = PgAsyncSelectBase<\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\ttrue,\n\tnever\n>;\n\nexport interface PgAsyncSelectHKT extends PgSelectHKTBase {\n\t_type: PgAsyncSelectBase<\n\t\tthis['tableName'],\n\t\tAssume<this['selection'], ColumnsSelection>,\n\t\tthis['selectMode'],\n\t\tAssume<this['nullabilityMap'], Record<string, JoinNullability>>,\n\t\tthis['dynamic'],\n\t\tthis['excludedMethods'],\n\t\tAssume<this['result'], any[]>,\n\t\tAssume<this['selectedFields'], ColumnsSelection>\n\t>;\n}\n\nexport interface PgAsyncSelectBase<\n\tTTableName extends string | undefined,\n\tTSelection extends ColumnsSelection | undefined,\n\tTSelectMode extends SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'>\n\t\t: {},\n\t// oxlint-disable-next-line no-unused-vars\n\tTDynamic extends boolean = false,\n\t// oxlint-disable-next-line no-unused-vars\n\tTExcludedMethods extends string = never,\n\t// oxlint-disable-next-line no-unused-vars\n\tTResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[],\n\t// oxlint-disable-next-line no-unused-vars\n\tTSelectedFields extends ColumnsSelection = BuildSubquerySelection<\n\t\tAssume<TSelection, ColumnsSelection>,\n\t\tTNullabilityMap\n\t>,\n> extends QueryPromise<TResult> {\n}\n\nexport class PgAsyncSelectBase<\n\tTTableName extends string | undefined,\n\tTSelection extends ColumnsSelection | undefined,\n\tTSelectMode extends SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'>\n\t\t: {},\n\tTDynamic extends boolean = false,\n\tTExcludedMethods extends string = never,\n\tTResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[],\n\tTSelectedFields extends ColumnsSelection = BuildSubquerySelection<\n\t\tAssume<TSelection, ColumnsSelection>,\n\t\tTNullabilityMap\n\t>,\n> extends PgSelectBase<\n\tPgAsyncSelectHKT,\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\tTDynamic,\n\tTExcludedMethods,\n\tTResult,\n\tTSelectedFields\n> {\n\tstatic override readonly [entityKind]: string = 'PgAsyncSelectQueryBuilder';\n\n\tdeclare protected session: PgAsyncSession;\n\n\t/** @internal */\n\t_prepare(\n\t\tname?: string,\n\t\tgenerateName = false,\n\t): PgAsyncSelectPrepare<this> {\n\t\tconst { session, config, dialect, joinsNotNullableMap, authToken, cacheConfig, usedTables } = this;\n\t\tconst { fields } = config;\n\n\t\treturn tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\tconst query = dialect.sqlToQuery(this.getSQL());\n\t\t\tconst fieldsList = orderSelectedFields<PgColumn>(fields);\n\t\t\tconst preparedQuery = session.prepareQuery<\n\t\t\t\tPreparedQueryConfig & { execute: any }\n\t\t\t>(\n\t\t\t\tquery,\n\t\t\t\tfieldsList,\n\t\t\t\tname ?? (generateName ? preparedStatementName(query.sql, query.params) : name),\n\t\t\t\ttrue,\n\t\t\t\tundefined,\n\t\t\t\t{\n\t\t\t\t\ttype: 'select',\n\t\t\t\t\ttables: [...usedTables],\n\t\t\t\t},\n\t\t\t\tcacheConfig,\n\t\t\t);\n\t\t\tpreparedQuery.joinsNotNullableMap = joinsNotNullableMap;\n\n\t\t\treturn preparedQuery.setToken(authToken);\n\t\t});\n\t}\n\n\t/**\n\t * Create a prepared statement for this query. This allows\n\t * the database to remember this query for the given session\n\t * and call it by name, rather than specifying the full query.\n\t *\n\t * {@link https://www.postgresql.org/docs/current/sql-prepare.html | Postgres prepare documentation}\n\t */\n\tprepare(\n\t\tname?: string,\n\t): PgAsyncSelectPrepare<this> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\t/** @internal */\n\tprivate authToken?: NeonAuthToken;\n\t/** @internal */\n\tsetToken(token?: NeonAuthToken) {\n\t\tthis.authToken = token;\n\t\treturn this;\n\t}\n\n\texecute(placeholderValues?: Record<string, unknown>) {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\treturn this._prepare().execute(placeholderValues);\n\t\t});\n\t}\n}\n\napplyMixins(PgAsyncSelectBase, [QueryPromise]);\n\nexport type AnyPgAsyncSelect = PgAsyncSelectBase<any, any, any, any, any, any, any, any>;\n"],"mappings":";;;;;;;;;;AA2EA,IAAa,oBAAb,cAaUA,mDAUR;CACD,QAA0BC,0BAAsB;;CAKhD,SACC,MACA,eAAe,OACc;EAC7B,MAAM,EAAE,SAAS,QAAQ,SAAS,qBAAqB,WAAW,aAAa,eAAe;EAC9F,MAAM,EAAE,WAAW;AAEnB,SAAOC,oBAAO,gBAAgB,8BAA8B;GAC3D,MAAM,QAAQ,QAAQ,WAAW,KAAK,QAAQ,CAAC;GAC/C,MAAM,iDAA2C,OAAO;GACxD,MAAM,gBAAgB,QAAQ,aAG7B,OACA,YACA,SAAS,oEAAqC,MAAM,KAAK,MAAM,OAAO,GAAG,OACzE,MACA,QACA;IACC,MAAM;IACN,QAAQ,CAAC,GAAG,WAAW;IACvB,EACD,YACA;AACD,iBAAc,sBAAsB;AAEpC,UAAO,cAAc,SAAS,UAAU;IACvC;;;;;;;;;CAUH,QACC,MAC6B;AAC7B,SAAO,KAAK,SAAS,MAAM,KAAK;;;CAIjC,AAAQ;;CAER,SAAS,OAAuB;AAC/B,OAAK,YAAY;AACjB,SAAO;;CAGR,QAAQ,mBAA6C;AACpD,SAAOA,oBAAO,gBAAgB,2BAA2B;AACxD,UAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;IAChD;;;4BAIQ,mBAAmB,CAACC,gCAAa,CAAC"}

package/pg-core/async/select.js

@@ -3,22 +3,24 @@ import { entityKind } from "../../entity.js";
 import { tracer } from "../../tracing.js";
 import { applyMixins, orderSelectedFields } from "../../utils.js";
 import { QueryPromise } from "../../query-promise.js";
+import { preparedStatementName } from "../../query-name-generator.js";
 
 //#region src/pg-core/async/select.ts
 var PgAsyncSelectBase = class extends PgSelectBase {
 	static [entityKind] = "PgAsyncSelectQueryBuilder";
 	/** @internal */
 	_prepare(name, generateName = false) {
-		const { session, config, dialect, joinsNotNullableMap, cacheConfig, usedTables } = this;
+		const { session, config, dialect, joinsNotNullableMap, authToken, cacheConfig, usedTables } = this;
 		const { fields } = config;
 		return tracer.startActiveSpan("drizzle.prepareQuery", () => {
 			const query = dialect.sqlToQuery(this.getSQL());
-			const fieldsList = orderSelectedFields(fields, void 0, this.dialect.codecs);
-			const mapper = this.dialect.mapperGenerators.rows(fieldsList, joinsNotNullableMap);
-			return session.prepareQuery(query, "arrays", name ?? generateName, mapper, {
+			const fieldsList = orderSelectedFields(fields);
+			const preparedQuery = session.prepareQuery(query, fieldsList, name ?? (generateName ? preparedStatementName(query.sql, query.params) : name), true, void 0, {
 				type: "select",
 				tables: [...usedTables]
 			}, cacheConfig);
+			preparedQuery.joinsNotNullableMap = joinsNotNullableMap;
+			return preparedQuery.setToken(authToken);
 		});
 	}
 	/**
@@ -31,6 +33,13 @@ var PgAsyncSelectBase = class extends PgSelectBase {
 	prepare(name) {
 		return this._prepare(name, true);
 	}
+	/** @internal */
+	authToken;
+	/** @internal */
+	setToken(token) {
+		this.authToken = token;
+		return this;
+	}
 	execute(placeholderValues) {
 		return tracer.startActiveSpan("drizzle.operation", () => {
 			return this._prepare().execute(placeholderValues);

package/pg-core/async/select.js.map

@@ -1 +1 @@
-{"version":3,"file":"select.js","names":[],"sources":["../../../src/pg-core/async/select.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport type {\n\tBuildSubquerySelection,\n\tJoinNullability,\n\tSelectMode,\n\tSelectResult,\n} from '~/query-builders/select.types.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport type { ColumnsSelection } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { applyMixins, type Assume, orderSelectedFields } from '~/utils.ts';\nimport type { PgColumn } from '../columns/index.ts';\nimport { PgSelectBase, type PgSelectBuilder } from '../query-builders/select.ts';\nimport type { PgSelectHKTBase, SelectedFields } from '../query-builders/select.types.ts';\nimport type { PreparedQueryConfig } from '../session.ts';\nimport type { PgAsyncPreparedQuery, PgAsyncSession } from './session.ts';\n\nexport type PgAsyncSelectPrepare<T extends AnyPgAsyncSelect> = PgAsyncPreparedQuery<\n\tPreparedQueryConfig & {\n\t\texecute: T['_']['result'];\n\t}\n>;\n\nexport type PgAsyncSelectBuilder<\n\tTSelection extends SelectedFields | undefined,\n> = PgSelectBuilder<TSelection, PgAsyncSelectHKT>;\n\nexport type PgAsyncSelect<\n\tTTableName extends string | undefined = string | undefined,\n\tTSelection extends ColumnsSelection = Record<string, any>,\n\tTSelectMode extends SelectMode = SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = Record<string, JoinNullability>,\n> = PgAsyncSelectBase<\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\ttrue,\n\tnever\n>;\n\nexport interface PgAsyncSelectHKT extends PgSelectHKTBase {\n\t_type: PgAsyncSelectBase<\n\t\tthis['tableName'],\n\t\tAssume<this['selection'], ColumnsSelection>,\n\t\tthis['selectMode'],\n\t\tAssume<this['nullabilityMap'], Record<string, JoinNullability>>,\n\t\tthis['dynamic'],\n\t\tthis['excludedMethods'],\n\t\tAssume<this['result'], any[]>,\n\t\tAssume<this['selectedFields'], ColumnsSelection>\n\t>;\n}\n\nexport interface PgAsyncSelectBase<\n\tTTableName extends string | undefined,\n\tTSelection extends ColumnsSelection | undefined,\n\tTSelectMode extends SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'>\n\t\t: {},\n\t// oxlint-disable-next-line no-unused-vars\n\tTDynamic extends boolean = false,\n\t// oxlint-disable-next-line no-unused-vars\n\tTExcludedMethods extends string = never,\n\t// oxlint-disable-next-line no-unused-vars\n\tTResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[],\n\t// oxlint-disable-next-line no-unused-vars\n\tTSelectedFields extends ColumnsSelection = BuildSubquerySelection<\n\t\tAssume<TSelection, ColumnsSelection>,\n\t\tTNullabilityMap\n\t>,\n> extends QueryPromise<TResult> {\n}\n\nexport class PgAsyncSelectBase<\n\tTTableName extends string | undefined,\n\tTSelection extends ColumnsSelection | undefined,\n\tTSelectMode extends SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'>\n\t\t: {},\n\tTDynamic extends boolean = false,\n\tTExcludedMethods extends string = never,\n\tTResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[],\n\tTSelectedFields extends ColumnsSelection = BuildSubquerySelection<\n\t\tAssume<TSelection, ColumnsSelection>,\n\t\tTNullabilityMap\n\t>,\n> extends PgSelectBase<\n\tPgAsyncSelectHKT,\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\tTDynamic,\n\tTExcludedMethods,\n\tTResult,\n\tTSelectedFields\n> {\n\tstatic override readonly [entityKind]: string = 'PgAsyncSelectQueryBuilder';\n\n\tdeclare protected session: PgAsyncSession;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgAsyncSelectPrepare<this> {\n\t\tconst { session, config, dialect, joinsNotNullableMap, cacheConfig, usedTables } = this;\n\t\tconst { fields } = config;\n\n\t\treturn tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\tconst query = dialect.sqlToQuery(this.getSQL());\n\t\t\tconst fieldsList = orderSelectedFields<PgColumn>(\n\t\t\t\tfields,\n\t\t\t\tundefined,\n\t\t\t\tthis.dialect.codecs,\n\t\t\t);\n\n\t\t\tconst mapper = this.dialect.mapperGenerators.rows(fieldsList, joinsNotNullableMap);\n\n\t\t\tconst preparedQuery = session.prepareQuery<PreparedQueryConfig & { execute: any }>(\n\t\t\t\tquery,\n\t\t\t\t'arrays',\n\t\t\t\tname ?? generateName,\n\t\t\t\tmapper,\n\t\t\t\t{ type: 'select', tables: [...usedTables] },\n\t\t\t\tcacheConfig,\n\t\t\t);\n\n\t\t\treturn preparedQuery;\n\t\t});\n\t}\n\n\t/**\n\t * Create a prepared statement for this query. This allows\n\t * the database to remember this query for the given session\n\t * and call it by name, rather than specifying the full query.\n\t *\n\t * {@link https://www.postgresql.org/docs/current/sql-prepare.html | Postgres prepare documentation}\n\t */\n\tprepare(\n\t\tname?: string,\n\t): PgAsyncSelectPrepare<this> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute(placeholderValues?: Record<string, unknown>) {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\treturn this._prepare().execute(placeholderValues);\n\t\t});\n\t}\n}\n\napplyMixins(PgAsyncSelectBase, [QueryPromise]);\n\nexport type AnyPgAsyncSelect = PgAsyncSelectBase<any, any, any, any, any, any, any, any>;\n"],"mappings":";;;;;;;AA0EA,IAAa,oBAAb,cAaU,aAUR;CACD,QAA0B,cAAsB;;CAKhD,SAAS,MAAe,eAAe,OAAmC;EACzE,MAAM,EAAE,SAAS,QAAQ,SAAS,qBAAqB,aAAa,eAAe;EACnF,MAAM,EAAE,WAAW;AAEnB,SAAO,OAAO,gBAAgB,8BAA8B;GAC3D,MAAM,QAAQ,QAAQ,WAAW,KAAK,QAAQ,CAAC;GAC/C,MAAM,aAAa,oBAClB,QACA,QACA,KAAK,QAAQ,OACb;GAED,MAAM,SAAS,KAAK,QAAQ,iBAAiB,KAAK,YAAY,oBAAoB;AAWlF,UATsB,QAAQ,aAC7B,OACA,UACA,QAAQ,cACR,QACA;IAAE,MAAM;IAAU,QAAQ,CAAC,GAAG,WAAW;IAAE,EAC3C,YACA;IAGA;;;;;;;;;CAUH,QACC,MAC6B;AAC7B,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,QAAQ,mBAA6C;AACpD,SAAO,OAAO,gBAAgB,2BAA2B;AACxD,UAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;IAChD;;;AAIJ,YAAY,mBAAmB,CAAC,aAAa,CAAC"}
+{"version":3,"file":"select.js","names":[],"sources":["../../../src/pg-core/async/select.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport type {\n\tBuildSubquerySelection,\n\tJoinNullability,\n\tSelectMode,\n\tSelectResult,\n} from '~/query-builders/select.types.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport type { ColumnsSelection } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { applyMixins, type Assume, type NeonAuthToken, orderSelectedFields } from '~/utils.ts';\nimport type { PgColumn } from '../columns/index.ts';\nimport { PgSelectBase, type PgSelectBuilder } from '../query-builders/select.ts';\nimport type { PgSelectHKTBase, SelectedFields } from '../query-builders/select.types.ts';\nimport type { PreparedQueryConfig } from '../session.ts';\nimport type { PgAsyncPreparedQuery, PgAsyncSession } from './session.ts';\n\nexport type PgAsyncSelectPrepare<T extends AnyPgAsyncSelect> = PgAsyncPreparedQuery<\n\tPreparedQueryConfig & {\n\t\texecute: T['_']['result'];\n\t}\n>;\n\nexport type PgAsyncSelectBuilder<\n\tTSelection extends SelectedFields | undefined,\n> = PgSelectBuilder<TSelection, PgAsyncSelectHKT>;\n\nexport type PgAsyncSelect<\n\tTTableName extends string | undefined = string | undefined,\n\tTSelection extends ColumnsSelection = Record<string, any>,\n\tTSelectMode extends SelectMode = SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = Record<string, JoinNullability>,\n> = PgAsyncSelectBase<\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\ttrue,\n\tnever\n>;\n\nexport interface PgAsyncSelectHKT extends PgSelectHKTBase {\n\t_type: PgAsyncSelectBase<\n\t\tthis['tableName'],\n\t\tAssume<this['selection'], ColumnsSelection>,\n\t\tthis['selectMode'],\n\t\tAssume<this['nullabilityMap'], Record<string, JoinNullability>>,\n\t\tthis['dynamic'],\n\t\tthis['excludedMethods'],\n\t\tAssume<this['result'], any[]>,\n\t\tAssume<this['selectedFields'], ColumnsSelection>\n\t>;\n}\n\nexport interface PgAsyncSelectBase<\n\tTTableName extends string | undefined,\n\tTSelection extends ColumnsSelection | undefined,\n\tTSelectMode extends SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'>\n\t\t: {},\n\t// oxlint-disable-next-line no-unused-vars\n\tTDynamic extends boolean = false,\n\t// oxlint-disable-next-line no-unused-vars\n\tTExcludedMethods extends string = never,\n\t// oxlint-disable-next-line no-unused-vars\n\tTResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[],\n\t// oxlint-disable-next-line no-unused-vars\n\tTSelectedFields extends ColumnsSelection = BuildSubquerySelection<\n\t\tAssume<TSelection, ColumnsSelection>,\n\t\tTNullabilityMap\n\t>,\n> extends QueryPromise<TResult> {\n}\n\nexport class PgAsyncSelectBase<\n\tTTableName extends string | undefined,\n\tTSelection extends ColumnsSelection | undefined,\n\tTSelectMode extends SelectMode,\n\tTNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'>\n\t\t: {},\n\tTDynamic extends boolean = false,\n\tTExcludedMethods extends string = never,\n\tTResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[],\n\tTSelectedFields extends ColumnsSelection = BuildSubquerySelection<\n\t\tAssume<TSelection, ColumnsSelection>,\n\t\tTNullabilityMap\n\t>,\n> extends PgSelectBase<\n\tPgAsyncSelectHKT,\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\tTDynamic,\n\tTExcludedMethods,\n\tTResult,\n\tTSelectedFields\n> {\n\tstatic override readonly [entityKind]: string = 'PgAsyncSelectQueryBuilder';\n\n\tdeclare protected session: PgAsyncSession;\n\n\t/** @internal */\n\t_prepare(\n\t\tname?: string,\n\t\tgenerateName = false,\n\t): PgAsyncSelectPrepare<this> {\n\t\tconst { session, config, dialect, joinsNotNullableMap, authToken, cacheConfig, usedTables } = this;\n\t\tconst { fields } = config;\n\n\t\treturn tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\tconst query = dialect.sqlToQuery(this.getSQL());\n\t\t\tconst fieldsList = orderSelectedFields<PgColumn>(fields);\n\t\t\tconst preparedQuery = session.prepareQuery<\n\t\t\t\tPreparedQueryConfig & { execute: any }\n\t\t\t>(\n\t\t\t\tquery,\n\t\t\t\tfieldsList,\n\t\t\t\tname ?? (generateName ? preparedStatementName(query.sql, query.params) : name),\n\t\t\t\ttrue,\n\t\t\t\tundefined,\n\t\t\t\t{\n\t\t\t\t\ttype: 'select',\n\t\t\t\t\ttables: [...usedTables],\n\t\t\t\t},\n\t\t\t\tcacheConfig,\n\t\t\t);\n\t\t\tpreparedQuery.joinsNotNullableMap = joinsNotNullableMap;\n\n\t\t\treturn preparedQuery.setToken(authToken);\n\t\t});\n\t}\n\n\t/**\n\t * Create a prepared statement for this query. This allows\n\t * the database to remember this query for the given session\n\t * and call it by name, rather than specifying the full query.\n\t *\n\t * {@link https://www.postgresql.org/docs/current/sql-prepare.html | Postgres prepare documentation}\n\t */\n\tprepare(\n\t\tname?: string,\n\t): PgAsyncSelectPrepare<this> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\t/** @internal */\n\tprivate authToken?: NeonAuthToken;\n\t/** @internal */\n\tsetToken(token?: NeonAuthToken) {\n\t\tthis.authToken = token;\n\t\treturn this;\n\t}\n\n\texecute(placeholderValues?: Record<string, unknown>) {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\treturn this._prepare().execute(placeholderValues);\n\t\t});\n\t}\n}\n\napplyMixins(PgAsyncSelectBase, [QueryPromise]);\n\nexport type AnyPgAsyncSelect = PgAsyncSelectBase<any, any, any, any, any, any, any, any>;\n"],"mappings":";;;;;;;;AA2EA,IAAa,oBAAb,cAaU,aAUR;CACD,QAA0B,cAAsB;;CAKhD,SACC,MACA,eAAe,OACc;EAC7B,MAAM,EAAE,SAAS,QAAQ,SAAS,qBAAqB,WAAW,aAAa,eAAe;EAC9F,MAAM,EAAE,WAAW;AAEnB,SAAO,OAAO,gBAAgB,8BAA8B;GAC3D,MAAM,QAAQ,QAAQ,WAAW,KAAK,QAAQ,CAAC;GAC/C,MAAM,aAAa,oBAA8B,OAAO;GACxD,MAAM,gBAAgB,QAAQ,aAG7B,OACA,YACA,SAAS,eAAe,sBAAsB,MAAM,KAAK,MAAM,OAAO,GAAG,OACzE,MACA,QACA;IACC,MAAM;IACN,QAAQ,CAAC,GAAG,WAAW;IACvB,EACD,YACA;AACD,iBAAc,sBAAsB;AAEpC,UAAO,cAAc,SAAS,UAAU;IACvC;;;;;;;;;CAUH,QACC,MAC6B;AAC7B,SAAO,KAAK,SAAS,MAAM,KAAK;;;CAIjC,AAAQ;;CAER,SAAS,OAAuB;AAC/B,OAAK,YAAY;AACjB,SAAO;;CAGR,QAAQ,mBAA6C;AACpD,SAAO,OAAO,gBAAgB,2BAA2B;AACxD,UAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;IAChD;;;AAIJ,YAAY,mBAAmB,CAAC,aAAa,CAAC"}

package/pg-core/async/session.cjs

@@ -6,50 +6,31 @@ 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 __errors_ts = require("../../errors.cjs");
-let __cache_core_cache_ts = require("../../cache/core/cache.cjs");
 let __migrator_utils_ts = require("../../migrator.utils.cjs");
 let __up_migrations_pg_ts = require("../../up-migrations/pg.cjs");
+let __errors_ts = require("../../errors.cjs");
+let __cache_core_cache_ts = require("../../cache/core/cache.cjs");
 
 //#region src/pg-core/async/session.ts
 var PgAsyncPreparedQuery = class extends require_pg_core_session.PgBasePreparedQuery {
 	static [__entity_ts.entityKind] = "PgAsyncPreparedQuery";
-	/** @internal */
-	mapper;
-	constructor(executor, query, mapper, mode, logger, cache, queryMetadata, cacheConfig) {
+	constructor(query, cache, queryMetadata, cacheConfig) {
 		super(query);
-		this.executor = executor;
-		this.mode = mode;
-		this.logger = logger;
 		this.cache = cache;
 		this.queryMetadata = queryMetadata;
 		this.cacheConfig = cacheConfig;
-		this.mapper = mapper;
 		if (cache && cache.strategy() === "all" && cacheConfig === void 0) this.cacheConfig = {
 			enabled: true,
 			autoInvalidate: true
 		};
 		if (!this.cacheConfig?.enabled) this.cacheConfig = void 0;
 	}
-	execute(placeholderValues = {}) {
-		return __tracing_ts.tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-			const { query: { sql }, mapper } = this;
-			span?.setAttributes({
-				"drizzle.query.text": sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			this.logger.logQuery(sql, params);
-			const query = __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", async (span) => {
-				span?.setAttributes({
-					"drizzle.query.text": sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return await this.queryWithCache(sql, params, () => this.executor(params));
-			});
-			if (!mapper) return query;
-			return query.then((rows) => __tracing_ts.tracer.startActiveSpan("drizzle.mapResponse", () => mapper(rows)));
-		});
+	/** @internal */
+	authToken;
+	/** @internal */
+	setToken(token) {
+		this.authToken = token;
+		return this;
 	}
 	/** @internal */
 	async queryWithCache(queryString, params, query) {
@@ -78,32 +59,27 @@ var PgAsyncPreparedQuery = class extends require_pg_core_session.PgBasePreparedQ
 };
 var PgAsyncSession = class extends require_pg_core_session.PgSession {
 	static [__entity_ts.entityKind] = "PgAsyncSession";
-	execute(query) {
-		return __tracing_ts.tracer.startActiveSpan("drizzle.operation", () => {
-			return __tracing_ts.tracer.startActiveSpan("drizzle.prepareQuery", () => {
-				return this.prepareQuery(this.dialect.sqlToQuery(query), "raw", false);
-			}).execute();
-		});
+	constructor(dialect) {
+		super(dialect);
 	}
-	arrays(query) {
+	/** @internal */
+	execute(query, token) {
 		return __tracing_ts.tracer.startActiveSpan("drizzle.operation", () => {
 			return __tracing_ts.tracer.startActiveSpan("drizzle.prepareQuery", () => {
-				return this.prepareQuery(this.dialect.sqlToQuery(query), "arrays", false);
-			}).execute();
+				return this.prepareQuery(this.dialect.sqlToQuery(query), void 0, void 0, false);
+			}).setToken(token).execute();
 		});
 	}
-	objects(query) {
-		return __tracing_ts.tracer.startActiveSpan("drizzle.operation", () => {
-			return __tracing_ts.tracer.startActiveSpan("drizzle.prepareQuery", () => {
-				return this.prepareQuery(this.dialect.sqlToQuery(query), "objects", false);
-			}).execute();
-		});
+	all(query) {
+		return this.prepareQuery(this.dialect.sqlToQuery(query), void 0, void 0, false).all();
 	}
 };
 var PgAsyncTransaction = class extends require_pg_core_async_db.PgAsyncDatabase {
 	static [__entity_ts.entityKind] = "PgAsyncTransaction";
-	constructor(dialect, session, relations, nestedIndex = 0, parseRqbJson) {
-		super(dialect, session, relations, parseRqbJson);
+	constructor(dialect, session, relations, schema, nestedIndex = 0, parseRqbJson) {
+		super(dialect, session, relations, schema, parseRqbJson);
+		this.relations = relations;
+		this.schema = schema;
 		this.nestedIndex = nestedIndex;
 	}
 	rollback() {
@@ -138,7 +114,7 @@ async function migrate(migrations, db, config) {
 		`;
 		await db.execute(migrationTableCreate);
 	}
-	const dbMigrations = await db.session.objects(__sql_sql_ts.sql`select id, hash, created_at, name from ${__sql_sql_ts.sql.identifier(migrationsSchema)}.${__sql_sql_ts.sql.identifier(migrationsTable)}`);
+	const dbMigrations = await db.session.all(__sql_sql_ts.sql`select id, hash, created_at, name from ${__sql_sql_ts.sql.identifier(migrationsSchema)}.${__sql_sql_ts.sql.identifier(migrationsTable)}`);
 	if (typeof config === "object" && config.init) {
 		if (dbMigrations.length) return { exitCode: "databaseMigrations" };
 		if (migrations.length > 1) return { exitCode: "localMigrations" };

package/pg-core/async/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["PgBasePreparedQuery","entityKind","tracer","NoopCache","DrizzleQueryError","PgSession","PgAsyncDatabase","TransactionRollbackError","sql"],"sources":["../../../src/pg-core/async/session.ts"],"sourcesContent":["import { type Cache, NoopCache, strategyFor } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport { is } from '~/entity.ts';\nimport { TransactionRollbackError } from '~/errors.ts';\nimport { DrizzleQueryError } from '~/errors.ts';\nimport type { Logger } from '~/logger.ts';\nimport type { MigrationConfig, MigrationMeta, MigratorInitFailResponse } from '~/migrator.ts';\nimport { getMigrationsToRun } from '~/migrator.utils.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport { fillPlaceholders, type Query, type SQL, sql } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { upgradeIfNeeded } from '~/up-migrations/pg.ts';\nimport { assertUnreachable } from '~/utils.ts';\nimport type { PgDialect } from '../dialect.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '../session.ts';\nimport { PgBasePreparedQuery, PgSession } from '../session.ts';\nimport { PgAsyncDatabase } from './db.ts';\n\nexport class PgAsyncPreparedQuery<T extends PreparedQueryConfig> extends PgBasePreparedQuery {\n\tstatic override readonly [entityKind]: string = 'PgAsyncPreparedQuery';\n\n\t/** @internal */\n\treadonly mapper: ((rows: any[]) => any) | undefined;\n\n\tconstructor(\n\t\tprotected executor: (params?: unknown[]) => Promise<any>,\n\t\tquery: Query,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\treadonly mode: 'arrays' | 'objects' | 'raw',\n\t\tprotected logger: Logger,\n\t\t// cache instance\n\t\tprotected cache: Cache | undefined,\n\t\t// per query related metadata\n\t\tprotected queryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\t// config that was passed through $withCache\n\t\tprotected cacheConfig: WithCacheConfig | undefined,\n\t) {\n\t\tsuper(query);\n\t\tthis.mapper = mapper;\n\t\tif (cache && cache.strategy() === 'all' && cacheConfig === undefined) {\n\t\t\tthis.cacheConfig = { enabled: true, autoInvalidate: true };\n\t\t}\n\t\tif (!this.cacheConfig?.enabled) {\n\t\t\tthis.cacheConfig = undefined;\n\t\t}\n\t}\n\n\toverride execute(placeholderValues: Record<string, unknown> = {}): Promise<T['execute']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tconst { query: { sql }, mapper } = this;\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tthis.logger.logQuery(sql, params);\n\n\t\t\tconst query = tracer.startActiveSpan('drizzle.driver.execute', async (span) => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\n\t\t\t\t// return await so tracer captures time accurately\n\t\t\t\treturn await this.queryWithCache(sql, params, () => this.executor(params));\n\t\t\t});\n\n\t\t\tif (!mapper) return query;\n\n\t\t\treturn query.then((rows) => tracer.startActiveSpan('drizzle.mapResponse', () => mapper(rows as unknown[])));\n\t\t});\n\t}\n\n\t/** @internal */\n\tprotected async queryWithCache<T>(\n\t\tqueryString: string,\n\t\tparams: any[],\n\t\tquery: () => Promise<T>,\n\t): Promise<T> {\n\t\tconst cacheStrat = this.cache !== undefined && !is(this.cache, NoopCache)\n\t\t\t? await strategyFor(queryString, params, this.queryMetadata, this.cacheConfig)\n\t\t\t: { type: 'skip' as const };\n\n\t\tif (cacheStrat.type === 'skip') {\n\t\t\treturn query().catch((e) => {\n\t\t\t\tthrow new DrizzleQueryError(queryString, params, e as Error);\n\t\t\t});\n\t\t}\n\n\t\tconst cache = this.cache!;\n\n\t\t// For mutate queries, we should query the database, wait for a response, and then perform invalidation\n\t\tif (cacheStrat.type === 'invalidate') {\n\t\t\treturn Promise.all([\n\t\t\t\tquery(),\n\t\t\t\tcache.onMutate({ tables: cacheStrat.tables }),\n\t\t\t]).then((res) => res[0]).catch((e) => {\n\t\t\t\tthrow new DrizzleQueryError(queryString, params, e as Error);\n\t\t\t});\n\t\t}\n\n\t\tif (cacheStrat.type === 'try') {\n\t\t\tconst { tables, key, isTag, autoInvalidate, config } = cacheStrat;\n\t\t\tconst fromCache = await cache.get(\n\t\t\t\tkey,\n\t\t\t\ttables,\n\t\t\t\tisTag,\n\t\t\t\tautoInvalidate,\n\t\t\t);\n\n\t\t\tif (fromCache === undefined) {\n\t\t\t\tconst result = await query().catch((e) => {\n\t\t\t\t\tthrow new DrizzleQueryError(queryString, params, e as Error);\n\t\t\t\t});\n\t\t\t\t// put actual key\n\t\t\t\tawait cache.put(\n\t\t\t\t\tkey,\n\t\t\t\t\tresult,\n\t\t\t\t\t// make sure we send tables that were used in a query only if user wants to invalidate it on each write\n\t\t\t\t\tautoInvalidate ? tables : [],\n\t\t\t\t\tisTag,\n\t\t\t\t\tconfig,\n\t\t\t\t);\n\t\t\t\t// put flag if we should invalidate or not\n\t\t\t\treturn result;\n\t\t\t}\n\n\t\t\treturn fromCache as unknown as T;\n\t\t}\n\n\t\tassertUnreachable(cacheStrat);\n\t}\n}\n\nexport abstract class PgAsyncSession<\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgSession {\n\tstatic override readonly [entityKind]: string = 'PgAsyncSession';\n\n\tabstract override prepareQuery<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,\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\n\toverride execute<T>(query: SQL): Promise<T[]> {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\tconst prepared = tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\t\treturn this.prepareQuery<PreparedQueryConfig & { execute: T[] }>(\n\t\t\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\t\t\t'raw',\n\t\t\t\t\tfalse,\n\t\t\t\t);\n\t\t\t});\n\n\t\t\treturn prepared.execute();\n\t\t});\n\t}\n\n\toverride arrays<T>(query: SQL): Promise<T[]> {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\tconst prepared = tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\t\treturn this.prepareQuery<PreparedQueryConfig & { execute: T[] }>(\n\t\t\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\t\t\t'arrays',\n\t\t\t\t\tfalse,\n\t\t\t\t);\n\t\t\t});\n\n\t\t\treturn prepared.execute();\n\t\t});\n\t}\n\n\toverride objects<T>(query: SQL): Promise<T[]> {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\tconst prepared = tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\t\treturn this.prepareQuery<PreparedQueryConfig & { execute: T[] }>(\n\t\t\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\t\t\t'objects',\n\t\t\t\t\tfalse,\n\t\t\t\t);\n\t\t\t});\n\n\t\t\treturn prepared.execute();\n\t\t});\n\t}\n\n\tabstract transaction<T>(\n\t\ttransaction: (tx: PgAsyncTransaction<TQueryResult, TRelations>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig,\n\t): Promise<T>;\n}\n\nexport abstract class PgAsyncTransaction<\n\tTQueryResult extends PgQueryResultHKT,\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgAsyncDatabase<TQueryResult, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PgAsyncTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\tsession: PgAsyncSession<any, any>,\n\t\trelations: TRelations,\n\t\tprotected readonly nestedIndex = 0,\n\t\tparseRqbJson: boolean | undefined,\n\t) {\n\t\tsuper(dialect, session, relations, parseRqbJson);\n\t}\n\n\trollback(): never {\n\t\tthrow new TransactionRollbackError();\n\t}\n\n\t/** @internal */\n\tgetTransactionConfigSQL(config: PgTransactionConfig): SQL {\n\t\tconst chunks: string[] = [];\n\t\tif (config.isolationLevel) {\n\t\t\tchunks.push(`isolation level ${config.isolationLevel}`);\n\t\t}\n\t\tif (config.accessMode) {\n\t\t\tchunks.push(config.accessMode);\n\t\t}\n\t\tif (typeof config.deferrable === 'boolean') {\n\t\t\tchunks.push(config.deferrable ? 'deferrable' : 'not deferrable');\n\t\t}\n\t\treturn sql.raw(chunks.join(' '));\n\t}\n\n\tsetTransaction(config: PgTransactionConfig): Promise<unknown> {\n\t\treturn this.session.execute<void>(sql`set transaction ${this.getTransactionConfigSQL(config)}`);\n\t}\n\n\tabstract override transaction: <T>(\n\t\ttransaction: (tx: PgAsyncTransaction<TQueryResult, TRelations>) => Promise<T>,\n\t) => Promise<T>;\n}\n\nexport async function migrate(\n\tmigrations: MigrationMeta[],\n\tdb: PgAsyncDatabase<PgQueryResultHKT, any>,\n\tconfig: string | MigrationConfig,\n): Promise<void | MigratorInitFailResponse> {\n\tconst migrationsTable = typeof config === 'string'\n\t\t? '__drizzle_migrations'\n\t\t: config.migrationsTable ?? '__drizzle_migrations';\n\tconst migrationsSchema = typeof config === 'string' ? 'drizzle' : config.migrationsSchema ?? 'drizzle';\n\n\tawait db.execute(sql`CREATE SCHEMA IF NOT EXISTS ${sql.identifier(migrationsSchema)}`);\n\n\t// Detect DB version and upgrade table schema if needed\n\tconst { newDb } = await upgradeIfNeeded(migrationsSchema, migrationsTable, db, migrations);\n\n\t// Create table with latest schema (version 1) if this is a new database\n\tif (newDb) {\n\t\tconst migrationTableCreate = sql`\n\t\t\tCREATE TABLE IF NOT EXISTS ${sql.identifier(migrationsSchema)}.${sql.identifier(migrationsTable)} (\n\t\t\t\tid SERIAL PRIMARY KEY,\n\t\t\t\thash text NOT NULL,\n\t\t\t\tcreated_at bigint,\n\t\t\t\tname text,\n\t\t\t\tapplied_at timestamp with time zone DEFAULT now()\n\t\t\t)\n\t\t`;\n\t\tawait db.execute(migrationTableCreate);\n\t}\n\n\tconst dbMigrations = await db.session.objects<{ id: number; hash: string; created_at: string; name: string }>(\n\t\tsql`select id, hash, created_at, name from ${sql.identifier(migrationsSchema)}.${sql.identifier(migrationsTable)}`,\n\t);\n\n\tif (typeof config === 'object' && config.init) {\n\t\tif (dbMigrations.length) {\n\t\t\treturn { exitCode: 'databaseMigrations' as const };\n\t\t}\n\n\t\tif (migrations.length > 1) {\n\t\t\treturn { exitCode: 'localMigrations' as const };\n\t\t}\n\n\t\tconst [migration] = migrations;\n\n\t\tif (!migration) return;\n\n\t\tawait db.execute(\n\t\t\tsql`insert into ${sql.identifier(migrationsSchema)}.${\n\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t} (\"hash\", \"created_at\", \"name\") values(${migration.hash}, ${migration.folderMillis}, ${migration.name ?? null})`,\n\t\t);\n\n\t\treturn;\n\t}\n\n\tconst migrationsToRun = getMigrationsToRun({ localMigrations: migrations, dbMigrations });\n\tawait db.transaction(async (tx) => {\n\t\tfor (const migration of migrationsToRun) {\n\t\t\tfor (const stmt of migration.sql) {\n\t\t\t\tawait tx.execute(sql.raw(stmt));\n\t\t\t}\n\t\t\tawait tx.execute(\n\t\t\t\tsql`insert into ${sql.identifier(migrationsSchema)}.${\n\t\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t\t} (\"hash\", \"created_at\", \"name\") values(${migration.hash}, ${migration.folderMillis}, ${\n\t\t\t\t\tmigration.name ?? null\n\t\t\t\t})`,\n\t\t\t);\n\t\t}\n\t});\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.cjs","names":["PgBasePreparedQuery","entityKind","NoopCache","DrizzleQueryError","PgSession","tracer","PgAsyncDatabase","TransactionRollbackError","sql"],"sources":["../../../src/pg-core/async/session.ts"],"sourcesContent":["import type * as V1 from '~/_relations.ts';\nimport { type Cache, NoopCache, strategyFor } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport { is } from '~/entity.ts';\nimport { TransactionRollbackError } from '~/errors.ts';\nimport { DrizzleQueryError } from '~/errors.ts';\nimport type { MigrationConfig, MigrationMeta, MigratorInitFailResponse } from '~/migrator.ts';\nimport { getMigrationsToRun } from '~/migrator.utils.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport { type Query, type SQL, sql } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { upgradeIfNeeded } from '~/up-migrations/pg.ts';\nimport type { NeonAuthToken } from '~/utils.ts';\nimport { assertUnreachable } from '~/utils.ts';\nimport type { PgDialect } from '../dialect.ts';\nimport type { SelectedFieldsOrdered } from '../query-builders/select.types.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '../session.ts';\nimport { PgBasePreparedQuery, PgSession } from '../session.ts';\nimport { PgAsyncDatabase } from './db.ts';\n\nexport abstract class PgAsyncPreparedQuery<T extends PreparedQueryConfig> extends PgBasePreparedQuery {\n\tstatic override readonly [entityKind]: string = 'PgAsyncPreparedQuery';\n\n\tconstructor(\n\t\tquery: Query,\n\t\t// cache instance\n\t\tprivate cache: Cache | undefined,\n\t\t// per query related metadata\n\t\tprivate queryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\t// config that was passed through $withCache\n\t\tprivate cacheConfig?: WithCacheConfig,\n\t) {\n\t\tsuper(query);\n\t\tif (cache && cache.strategy() === 'all' && cacheConfig === undefined) {\n\t\t\tthis.cacheConfig = { enabled: true, autoInvalidate: true };\n\t\t}\n\t\tif (!this.cacheConfig?.enabled) {\n\t\t\tthis.cacheConfig = undefined;\n\t\t}\n\t}\n\n\t/** @internal */\n\tprotected authToken?: NeonAuthToken;\n\t/** @internal */\n\tsetToken(token?: NeonAuthToken) {\n\t\tthis.authToken = token;\n\t\treturn this;\n\t}\n\n\tabstract override execute(placeholderValues?: Record<string, unknown>): Promise<T['execute']>;\n\n\t/** @internal */\n\tabstract override all(placeholderValues?: Record<string, unknown>): Promise<T['all']>;\n\n\t/** @internal */\n\tprotected async queryWithCache<T>(\n\t\tqueryString: string,\n\t\tparams: any[],\n\t\tquery: () => Promise<T>,\n\t): Promise<T> {\n\t\tconst cacheStrat = this.cache !== undefined && !is(this.cache, NoopCache)\n\t\t\t? await strategyFor(queryString, params, this.queryMetadata, this.cacheConfig)\n\t\t\t: { type: 'skip' as const };\n\n\t\tif (cacheStrat.type === 'skip') {\n\t\t\treturn query().catch((e) => {\n\t\t\t\tthrow new DrizzleQueryError(queryString, params, e as Error);\n\t\t\t});\n\t\t}\n\n\t\tconst cache = this.cache!;\n\n\t\t// For mutate queries, we should query the database, wait for a response, and then perform invalidation\n\t\tif (cacheStrat.type === 'invalidate') {\n\t\t\treturn Promise.all([\n\t\t\t\tquery(),\n\t\t\t\tcache.onMutate({ tables: cacheStrat.tables }),\n\t\t\t]).then((res) => res[0]).catch((e) => {\n\t\t\t\tthrow new DrizzleQueryError(queryString, params, e as Error);\n\t\t\t});\n\t\t}\n\n\t\tif (cacheStrat.type === 'try') {\n\t\t\tconst { tables, key, isTag, autoInvalidate, config } = cacheStrat;\n\t\t\tconst fromCache = await cache.get(\n\t\t\t\tkey,\n\t\t\t\ttables,\n\t\t\t\tisTag,\n\t\t\t\tautoInvalidate,\n\t\t\t);\n\n\t\t\tif (fromCache === undefined) {\n\t\t\t\tconst result = await query().catch((e) => {\n\t\t\t\t\tthrow new DrizzleQueryError(queryString, params, e as Error);\n\t\t\t\t});\n\t\t\t\t// put actual key\n\t\t\t\tawait cache.put(\n\t\t\t\t\tkey,\n\t\t\t\t\tresult,\n\t\t\t\t\t// make sure we send tables that were used in a query only if user wants to invalidate it on each write\n\t\t\t\t\tautoInvalidate ? tables : [],\n\t\t\t\t\tisTag,\n\t\t\t\t\tconfig,\n\t\t\t\t);\n\t\t\t\t// put flag if we should invalidate or not\n\t\t\t\treturn result;\n\t\t\t}\n\n\t\t\treturn fromCache as unknown as T;\n\t\t}\n\n\t\tassertUnreachable(cacheStrat);\n\t}\n}\n\nexport abstract class PgAsyncSession<\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTFullSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTSchema extends V1.TablesRelationalConfig = V1.ExtractTablesWithRelations<TFullSchema>,\n> extends PgSession {\n\tstatic override readonly [entityKind]: string = 'PgAsyncSession';\n\n\tconstructor(dialect: PgDialect) {\n\t\tsuper(dialect);\n\t}\n\n\tabstract override prepareQuery<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[][], mapColumnValue?: (value: unknown) => 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\n\tabstract override prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper: (\n\t\t\trows: Record<string, unknown>[],\n\t\t\tmapColumnValue?: (value: unknown) => unknown,\n\t\t) => T['execute'],\n\t): PgAsyncPreparedQuery<T>;\n\n\toverride execute<T>(query: SQL): Promise<T>;\n\t/** @internal */\n\toverride execute<T>(query: SQL, token?: NeonAuthToken): Promise<T>;\n\t/** @internal */\n\toverride execute<T>(query: SQL, token?: NeonAuthToken): Promise<T> {\n\t\treturn tracer.startActiveSpan('drizzle.operation', () => {\n\t\t\tconst prepared = tracer.startActiveSpan('drizzle.prepareQuery', () => {\n\t\t\t\treturn this.prepareQuery<PreparedQueryConfig & { execute: T }>(\n\t\t\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\t\t\tundefined,\n\t\t\t\t\tundefined,\n\t\t\t\t\tfalse,\n\t\t\t\t);\n\t\t\t});\n\n\t\t\treturn prepared.setToken(token).execute();\n\t\t});\n\t}\n\n\toverride all<T = unknown>(query: SQL): Promise<T[]> {\n\t\treturn this.prepareQuery<PreparedQueryConfig & { all: T[] }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t).all();\n\t}\n\n\tabstract transaction<T>(\n\t\ttransaction: (tx: PgAsyncTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig,\n\t): Promise<T>;\n}\n\nexport abstract class PgAsyncTransaction<\n\tTQueryResult extends PgQueryResultHKT,\n\tTFullSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTSchema extends V1.TablesRelationalConfig = V1.ExtractTablesWithRelations<TFullSchema>,\n> extends PgAsyncDatabase<TQueryResult, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PgAsyncTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\tsession: PgAsyncSession<any, any, any, any>,\n\t\tprotected relations: TRelations,\n\t\tprotected schema: {\n\t\t\tfullSchema: Record<string, unknown>;\n\t\t\tschema: TSchema;\n\t\t\ttableNamesMap: Record<string, string>;\n\t\t} | undefined,\n\t\tprotected readonly nestedIndex = 0,\n\t\tparseRqbJson?: boolean,\n\t) {\n\t\tsuper(dialect, session, relations, schema, parseRqbJson);\n\t}\n\n\trollback(): never {\n\t\tthrow new TransactionRollbackError();\n\t}\n\n\t/** @internal */\n\tgetTransactionConfigSQL(config: PgTransactionConfig): SQL {\n\t\tconst chunks: string[] = [];\n\t\tif (config.isolationLevel) {\n\t\t\tchunks.push(`isolation level ${config.isolationLevel}`);\n\t\t}\n\t\tif (config.accessMode) {\n\t\t\tchunks.push(config.accessMode);\n\t\t}\n\t\tif (typeof config.deferrable === 'boolean') {\n\t\t\tchunks.push(config.deferrable ? 'deferrable' : 'not deferrable');\n\t\t}\n\t\treturn sql.raw(chunks.join(' '));\n\t}\n\n\tsetTransaction(config: PgTransactionConfig): Promise<void> {\n\t\treturn this.session.execute(sql`set transaction ${this.getTransactionConfigSQL(config)}`);\n\t}\n\n\tabstract override transaction<T>(\n\t\ttransaction: (tx: PgAsyncTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T>;\n}\n\nexport async function migrate(\n\tmigrations: MigrationMeta[],\n\tdb: PgAsyncDatabase<PgQueryResultHKT, any, any, any>,\n\tconfig: string | MigrationConfig,\n): Promise<void | MigratorInitFailResponse> {\n\tconst migrationsTable = typeof config === 'string'\n\t\t? '__drizzle_migrations'\n\t\t: config.migrationsTable ?? '__drizzle_migrations';\n\tconst migrationsSchema = typeof config === 'string' ? 'drizzle' : config.migrationsSchema ?? 'drizzle';\n\n\tawait db.execute(sql`CREATE SCHEMA IF NOT EXISTS ${sql.identifier(migrationsSchema)}`);\n\n\t// Detect DB version and upgrade table schema if needed\n\tconst { newDb } = await upgradeIfNeeded(migrationsSchema, migrationsTable, db, migrations);\n\n\t// Create table with latest schema (version 1) if this is a new database\n\tif (newDb) {\n\t\tconst migrationTableCreate = sql`\n\t\t\tCREATE TABLE IF NOT EXISTS ${sql.identifier(migrationsSchema)}.${sql.identifier(migrationsTable)} (\n\t\t\t\tid SERIAL PRIMARY KEY,\n\t\t\t\thash text NOT NULL,\n\t\t\t\tcreated_at bigint,\n\t\t\t\tname text,\n\t\t\t\tapplied_at timestamp with time zone DEFAULT now()\n\t\t\t)\n\t\t`;\n\t\tawait db.execute(migrationTableCreate);\n\t}\n\n\tconst dbMigrations = await db.session.all<{ id: number; hash: string; created_at: string; name: string }>(\n\t\tsql`select id, hash, created_at, name from ${sql.identifier(migrationsSchema)}.${sql.identifier(migrationsTable)}`,\n\t);\n\n\tif (typeof config === 'object' && config.init) {\n\t\tif (dbMigrations.length) {\n\t\t\treturn { exitCode: 'databaseMigrations' as const };\n\t\t}\n\n\t\tif (migrations.length > 1) {\n\t\t\treturn { exitCode: 'localMigrations' as const };\n\t\t}\n\n\t\tconst [migration] = migrations;\n\n\t\tif (!migration) return;\n\n\t\tawait db.execute(\n\t\t\tsql`insert into ${sql.identifier(migrationsSchema)}.${\n\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t} (\"hash\", \"created_at\", \"name\") values(${migration.hash}, ${migration.folderMillis}, ${migration.name ?? null})`,\n\t\t);\n\n\t\treturn;\n\t}\n\n\tconst migrationsToRun = getMigrationsToRun({ localMigrations: migrations, dbMigrations });\n\tawait db.transaction(async (tx) => {\n\t\tfor (const migration of migrationsToRun) {\n\t\t\tfor (const stmt of migration.sql) {\n\t\t\t\tawait tx.execute(sql.raw(stmt));\n\t\t\t}\n\t\t\tawait tx.execute(\n\t\t\t\tsql`insert into ${sql.identifier(migrationsSchema)}.${\n\t\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t\t} (\"hash\", \"created_at\", \"name\") values(${migration.hash}, ${migration.folderMillis}, ${\n\t\t\t\t\tmigration.name ?? null\n\t\t\t\t})`,\n\t\t\t);\n\t\t}\n\t});\n}\n"],"mappings":"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"}

package/pg-core/async/session.d.cts

@@ -1,52 +1,58 @@
+import { SelectedFieldsOrdered } from "../query-builders/select.types.cjs";
 import { PgDialect } from "../dialect.cjs";
 import { PgBasePreparedQuery, PgQueryResultHKT, PgSession, PgTransactionConfig, PreparedQueryConfig } from "../session.cjs";
 import { PgAsyncDatabase } from "./db.cjs";
 import { entityKind } from "../../entity.cjs";
 import { Query, SQL } from "../../sql/sql.cjs";
+import * as V1 from "../../_relations.cjs";
 import { MigrationConfig, MigrationMeta, MigratorInitFailResponse } from "../../migrator.cjs";
 import { Cache } from "../../cache/core/cache.cjs";
 import { WithCacheConfig } from "../../cache/core/types.cjs";
 import { AnyRelations, EmptyRelations } from "../../relations.cjs";
-import { Logger } from "../../logger.cjs";
 
 //#region src/pg-core/async/session.d.ts
-declare class PgAsyncPreparedQuery<T extends PreparedQueryConfig> extends PgBasePreparedQuery {
-  protected executor: (params?: unknown[]) => Promise<any>;
-  readonly mode: 'arrays' | 'objects' | 'raw';
-  protected logger: Logger;
-  protected cache: Cache | undefined;
-  protected queryMetadata: {
-    type: 'select' | 'update' | 'delete' | 'insert';
-    tables: string[];
-  } | undefined;
-  protected cacheConfig: WithCacheConfig | undefined;
+declare abstract class PgAsyncPreparedQuery<T extends PreparedQueryConfig> extends PgBasePreparedQuery {
+  private cache;
+  private queryMetadata;
+  private cacheConfig?;
   static readonly [entityKind]: string;
-  constructor(executor: (params?: unknown[]) => Promise<any>, query: Query, mapper: ((rows: any[]) => any) | undefined, mode: 'arrays' | 'objects' | 'raw', logger: Logger, cache: Cache | undefined, queryMetadata: {
+  constructor(query: Query, cache: Cache | undefined, queryMetadata: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
-  } | undefined, cacheConfig: WithCacheConfig | undefined);
-  execute(placeholderValues?: Record<string, unknown>): Promise<T['execute']>;
+  } | undefined, cacheConfig?: WithCacheConfig | undefined);
+  abstract execute(placeholderValues?: Record<string, unknown>): Promise<T['execute']>;
 }
-declare abstract class PgAsyncSession<TQueryResult extends PgQueryResultHKT = PgQueryResultHKT, TRelations extends AnyRelations = EmptyRelations> extends PgSession {
+declare abstract class PgAsyncSession<TQueryResult extends PgQueryResultHKT = PgQueryResultHKT, TFullSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations, TSchema extends V1.TablesRelationalConfig = V1.ExtractTablesWithRelations<TFullSchema>> extends PgSession {
   static readonly [entityKind]: string;
-  abstract prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', name: string | boolean, mapper?: (rows: any[]) => any, queryMetadata?: {
+  constructor(dialect: PgDialect);
+  abstract prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][], mapColumnValue?: (value: unknown) => unknown) => T['execute'], queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  execute<T>(query: SQL): Promise<T[]>;
-  arrays<T>(query: SQL): Promise<T[]>;
-  objects<T>(query: SQL): Promise<T[]>;
-  abstract transaction<T>(transaction: (tx: PgAsyncTransaction<TQueryResult, TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
+  abstract prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper: (rows: Record<string, unknown>[], mapColumnValue?: (value: unknown) => unknown) => T['execute']): PgAsyncPreparedQuery<T>;
+  execute<T>(query: SQL): Promise<T>;
+  all<T = unknown>(query: SQL): Promise<T[]>;
+  abstract transaction<T>(transaction: (tx: PgAsyncTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
-declare abstract class PgAsyncTransaction<TQueryResult extends PgQueryResultHKT, TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<TQueryResult, TRelations> {
+declare abstract class PgAsyncTransaction<TQueryResult extends PgQueryResultHKT, TFullSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations, TSchema extends V1.TablesRelationalConfig = V1.ExtractTablesWithRelations<TFullSchema>> extends PgAsyncDatabase<TQueryResult, TFullSchema, TRelations, TSchema> {
+  protected relations: TRelations;
+  protected schema: {
+    fullSchema: Record<string, unknown>;
+    schema: TSchema;
+    tableNamesMap: Record<string, string>;
+  } | undefined;
   protected readonly nestedIndex: number;
   static readonly [entityKind]: string;
-  constructor(dialect: PgDialect, session: PgAsyncSession<any, any>, relations: TRelations, nestedIndex: number | undefined, parseRqbJson: boolean | undefined);
+  constructor(dialect: PgDialect, session: PgAsyncSession<any, any, any, any>, relations: TRelations, schema: {
+    fullSchema: Record<string, unknown>;
+    schema: TSchema;
+    tableNamesMap: Record<string, string>;
+  } | undefined, nestedIndex?: number, parseRqbJson?: boolean);
   rollback(): never;
-  setTransaction(config: PgTransactionConfig): Promise<unknown>;
-  abstract transaction: <T>(transaction: (tx: PgAsyncTransaction<TQueryResult, TRelations>) => Promise<T>) => Promise<T>;
+  setTransaction(config: PgTransactionConfig): Promise<void>;
+  abstract transaction<T>(transaction: (tx: PgAsyncTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
 }
-declare function migrate(migrations: MigrationMeta[], db: PgAsyncDatabase<PgQueryResultHKT, any>, config: string | MigrationConfig): Promise<void | MigratorInitFailResponse>;
+declare function migrate(migrations: MigrationMeta[], db: PgAsyncDatabase<PgQueryResultHKT, any, any, any>, config: string | MigrationConfig): Promise<void | MigratorInitFailResponse>;
 //#endregion
 export { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction, migrate };
 //# sourceMappingURL=session.d.cts.map

package/pg-core/async/session.d.ts

@@ -1,52 +1,58 @@
+import { SelectedFieldsOrdered } from "../query-builders/select.types.js";
 import { PgDialect } from "../dialect.js";
 import { PgBasePreparedQuery, PgQueryResultHKT, PgSession, PgTransactionConfig, PreparedQueryConfig } from "../session.js";
 import { PgAsyncDatabase } from "./db.js";
 import { entityKind } from "../../entity.js";
 import { Query, SQL } from "../../sql/sql.js";
-import { Logger } from "../../logger.js";
+import * as V1 from "../../_relations.js";
 import { MigrationConfig, MigrationMeta, MigratorInitFailResponse } from "../../migrator.js";
-import { AnyRelations, EmptyRelations } from "../../relations.js";
 import { Cache } from "../../cache/core/cache.js";
+import { AnyRelations, EmptyRelations } from "../../relations.js";
 import { WithCacheConfig } from "../../cache/core/types.js";
 
 //#region src/pg-core/async/session.d.ts
-declare class PgAsyncPreparedQuery<T extends PreparedQueryConfig> extends PgBasePreparedQuery {
-  protected executor: (params?: unknown[]) => Promise<any>;
-  readonly mode: 'arrays' | 'objects' | 'raw';
-  protected logger: Logger;
-  protected cache: Cache | undefined;
-  protected queryMetadata: {
-    type: 'select' | 'update' | 'delete' | 'insert';
-    tables: string[];
-  } | undefined;
-  protected cacheConfig: WithCacheConfig | undefined;
+declare abstract class PgAsyncPreparedQuery<T extends PreparedQueryConfig> extends PgBasePreparedQuery {
+  private cache;
+  private queryMetadata;
+  private cacheConfig?;
   static readonly [entityKind]: string;
-  constructor(executor: (params?: unknown[]) => Promise<any>, query: Query, mapper: ((rows: any[]) => any) | undefined, mode: 'arrays' | 'objects' | 'raw', logger: Logger, cache: Cache | undefined, queryMetadata: {
+  constructor(query: Query, cache: Cache | undefined, queryMetadata: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
-  } | undefined, cacheConfig: WithCacheConfig | undefined);
-  execute(placeholderValues?: Record<string, unknown>): Promise<T['execute']>;
+  } | undefined, cacheConfig?: WithCacheConfig | undefined);
+  abstract execute(placeholderValues?: Record<string, unknown>): Promise<T['execute']>;
 }
-declare abstract class PgAsyncSession<TQueryResult extends PgQueryResultHKT = PgQueryResultHKT, TRelations extends AnyRelations = EmptyRelations> extends PgSession {
+declare abstract class PgAsyncSession<TQueryResult extends PgQueryResultHKT = PgQueryResultHKT, TFullSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations, TSchema extends V1.TablesRelationalConfig = V1.ExtractTablesWithRelations<TFullSchema>> extends PgSession {
   static readonly [entityKind]: string;
-  abstract prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', name: string | boolean, mapper?: (rows: any[]) => any, queryMetadata?: {
+  constructor(dialect: PgDialect);
+  abstract prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][], mapColumnValue?: (value: unknown) => unknown) => T['execute'], queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  execute<T>(query: SQL): Promise<T[]>;
-  arrays<T>(query: SQL): Promise<T[]>;
-  objects<T>(query: SQL): Promise<T[]>;
-  abstract transaction<T>(transaction: (tx: PgAsyncTransaction<TQueryResult, TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
+  abstract prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper: (rows: Record<string, unknown>[], mapColumnValue?: (value: unknown) => unknown) => T['execute']): PgAsyncPreparedQuery<T>;
+  execute<T>(query: SQL): Promise<T>;
+  all<T = unknown>(query: SQL): Promise<T[]>;
+  abstract transaction<T>(transaction: (tx: PgAsyncTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
-declare abstract class PgAsyncTransaction<TQueryResult extends PgQueryResultHKT, TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<TQueryResult, TRelations> {
+declare abstract class PgAsyncTransaction<TQueryResult extends PgQueryResultHKT, TFullSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations, TSchema extends V1.TablesRelationalConfig = V1.ExtractTablesWithRelations<TFullSchema>> extends PgAsyncDatabase<TQueryResult, TFullSchema, TRelations, TSchema> {
+  protected relations: TRelations;
+  protected schema: {
+    fullSchema: Record<string, unknown>;
+    schema: TSchema;
+    tableNamesMap: Record<string, string>;
+  } | undefined;
   protected readonly nestedIndex: number;
   static readonly [entityKind]: string;
-  constructor(dialect: PgDialect, session: PgAsyncSession<any, any>, relations: TRelations, nestedIndex: number | undefined, parseRqbJson: boolean | undefined);
+  constructor(dialect: PgDialect, session: PgAsyncSession<any, any, any, any>, relations: TRelations, schema: {
+    fullSchema: Record<string, unknown>;
+    schema: TSchema;
+    tableNamesMap: Record<string, string>;
+  } | undefined, nestedIndex?: number, parseRqbJson?: boolean);
   rollback(): never;
-  setTransaction(config: PgTransactionConfig): Promise<unknown>;
-  abstract transaction: <T>(transaction: (tx: PgAsyncTransaction<TQueryResult, TRelations>) => Promise<T>) => Promise<T>;
+  setTransaction(config: PgTransactionConfig): Promise<void>;
+  abstract transaction<T>(transaction: (tx: PgAsyncTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
 }
-declare function migrate(migrations: MigrationMeta[], db: PgAsyncDatabase<PgQueryResultHKT, any>, config: string | MigrationConfig): Promise<void | MigratorInitFailResponse>;
+declare function migrate(migrations: MigrationMeta[], db: PgAsyncDatabase<PgQueryResultHKT, any, any, any>, config: string | MigrationConfig): Promise<void | MigratorInitFailResponse>;
 //#endregion
 export { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction, migrate };
 //# sourceMappingURL=session.d.ts.map