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

package/pg-core/effect/insert.js.map

@@ -1 +1 @@
-{"version":3,"file":"insert.js","names":[],"sources":["../../../src/pg-core/effect/insert.ts"],"sourcesContent":["import * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { PgTable } from '~/pg-core/table.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport type { ColumnsSelection } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\nimport type { PgInsertHKTBase } from '../query-builders/insert.ts';\nimport { PgInsertBase } from '../query-builders/insert.ts';\nimport { extractUsedTable } from '../utils.ts';\nimport type { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\nexport interface PgEffectInsertHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgInsertHKTBase {\n\t_type: PgEffectInsertBase<\n\t\tAssume<this['table'], PgTable>,\n\t\tAssume<this['queryResult'], PgQueryResultHKT>,\n\t\tthis['selectedFields'],\n\t\tthis['returning'],\n\t\tthis['dynamic'],\n\t\tthis['excludedMethods'],\n\t\tTEffectHKT\n\t>;\n}\n\nexport type AnyPgEffectInsert = PgEffectInsertBase<any, any, any, any, any, any>;\n\nexport type PgInsertPrepare<\n\tT extends AnyPgEffectInsert,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgEffectPreparedQuery<\n\tPreparedQueryConfig & {\n\t\texecute: T['_']['result'];\n\t},\n\tTEffectHKT\n>;\n\nexport type PgInsert<\n\tTTable extends PgTable = PgTable,\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTSelectedFields extends ColumnsSelection | undefined = ColumnsSelection | undefined,\n\tTReturning extends Record<string, unknown> | undefined = Record<string, unknown> | undefined,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgInsertBase<PgEffectInsertHKT<TEffectHKT>, TTable, TQueryResult, TSelectedFields, TReturning, true, never>;\n\nexport interface PgEffectInsertBase<\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTTable extends PgTable,\n\tTQueryResult extends PgQueryResultHKT,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTSelectedFields = undefined,\n\tTReturning = undefined,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTDynamic extends boolean = false,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTExcludedMethods extends string = never,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends\n\tEffect.Effect<\n\t\tTReturning extends undefined ? PgQueryResultKind<TQueryResult, never> : TReturning[],\n\t\tTEffectHKT['error'],\n\t\tTEffectHKT['context']\n\t>\n{\n}\n\nexport class PgEffectInsertBase<\n\tTTable extends PgTable,\n\tTQueryResult extends PgQueryResultHKT,\n\tTSelectedFields = undefined,\n\tTReturning = undefined,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTDynamic extends boolean = false,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTExcludedMethods extends string = never,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgInsertBase<\n\tPgEffectInsertHKT<TEffectHKT>,\n\tTTable,\n\tTQueryResult,\n\tTSelectedFields,\n\tTReturning,\n\tTDynamic,\n\tTExcludedMethods\n> implements RunnableQuery<TReturning extends undefined ? PgQueryResultKind<TQueryResult, never> : TReturning[], 'pg'> {\n\tstatic override readonly [entityKind]: string = 'PgEffectInsert';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any, any, any>;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgInsertPrepare<this, TEffectHKT> {\n\t\tconst query = this.dialect.sqlToQuery(this.getSQL());\n\t\treturn this.session.prepareQuery<\n\t\t\tPreparedQueryConfig & {\n\t\t\t\texecute: TReturning extends undefined ? PgQueryResultKind<TQueryResult, never> : TReturning[];\n\t\t\t}\n\t\t>(\n\t\t\tquery,\n\t\t\tthis.config.returning,\n\t\t\tname ?? (generateName ? preparedStatementName(query.sql, query.params) : name),\n\t\t\ttrue,\n\t\t\tundefined,\n\t\t\t{\n\t\t\t\ttype: 'insert',\n\t\t\t\ttables: extractUsedTable(this.config.table),\n\t\t\t},\n\t\t\tthis.cacheConfig,\n\t\t);\n\t}\n\n\tprepare(name?: string): PgInsertPrepare<this, TEffectHKT> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn this._prepare().execute(placeholderValues).pipe(\n\t\t\tEffect.withSpan('drizzle.operation'),\n\t\t);\n\t};\n}\n\napplyEffectWrapper(PgEffectInsertBase);\n"],"mappings":";;;;;;;;AAmEA,IAAa,qBAAb,cAUU,aAQ6G;CACtH,QAA0B,cAAsB;;CAKhD,SAAS,MAAe,eAAe,OAA0C;EAChF,MAAM,QAAQ,KAAK,QAAQ,WAAW,KAAK,QAAQ,CAAC;AACpD,SAAO,KAAK,QAAQ,aAKnB,OACA,KAAK,OAAO,WACZ,SAAS,eAAe,sBAAsB,MAAM,KAAK,MAAM,OAAO,GAAG,OACzE,MACA,QACA;GACC,MAAM;GACN,QAAQ,iBAAiB,KAAK,OAAO,MAAM;GAC3C,EACD,KAAK,YACL;;CAGF,QAAQ,MAAkD;AACzD,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAsB;AACxE,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB,CAAC,KACjD,OAAO,SAAS,oBAAoB,CACpC;;;AAIH,mBAAmB,mBAAmB"}
+{"version":3,"file":"insert.js","names":[],"sources":["../../../src/pg-core/effect/insert.ts"],"sourcesContent":["import * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { PgTable } from '~/pg-core/table.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport type { ColumnsSelection } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\nimport type { PgInsertHKTBase } from '../query-builders/insert.ts';\nimport { PgInsertBase } from '../query-builders/insert.ts';\nimport { extractUsedTable } from '../utils.ts';\nimport type { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\nexport interface PgEffectInsertHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgInsertHKTBase {\n\t_type: PgEffectInsertBase<\n\t\tAssume<this['table'], PgTable>,\n\t\tAssume<this['queryResult'], PgQueryResultHKT>,\n\t\tthis['selectedFields'],\n\t\tthis['returning'],\n\t\tthis['dynamic'],\n\t\tthis['excludedMethods'],\n\t\tTEffectHKT\n\t>;\n}\n\nexport type AnyPgEffectInsert = PgEffectInsertBase<any, any, any, any, any, any>;\n\nexport type PgInsertPrepare<\n\tT extends AnyPgEffectInsert,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgEffectPreparedQuery<\n\tPreparedQueryConfig & {\n\t\texecute: T['_']['result'];\n\t},\n\tTEffectHKT\n>;\n\nexport type PgInsert<\n\tTTable extends PgTable = PgTable,\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTSelectedFields extends ColumnsSelection | undefined = ColumnsSelection | undefined,\n\tTReturning extends Record<string, unknown> | undefined = Record<string, unknown> | undefined,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgInsertBase<PgEffectInsertHKT<TEffectHKT>, TTable, TQueryResult, TSelectedFields, TReturning, true, never>;\n\nexport interface PgEffectInsertBase<\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTTable extends PgTable,\n\tTQueryResult extends PgQueryResultHKT,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTSelectedFields = undefined,\n\tTReturning = undefined,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTDynamic extends boolean = false,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTExcludedMethods extends string = never,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends\n\tEffect.Effect<\n\t\tTReturning extends undefined ? PgQueryResultKind<TQueryResult, never> : TReturning[],\n\t\tTEffectHKT['error'],\n\t\tTEffectHKT['context']\n\t>\n{\n}\n\nexport class PgEffectInsertBase<\n\tTTable extends PgTable,\n\tTQueryResult extends PgQueryResultHKT,\n\tTSelectedFields = undefined,\n\tTReturning = undefined,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTDynamic extends boolean = false,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTExcludedMethods extends string = never,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgInsertBase<\n\tPgEffectInsertHKT<TEffectHKT>,\n\tTTable,\n\tTQueryResult,\n\tTSelectedFields,\n\tTReturning,\n\tTDynamic,\n\tTExcludedMethods\n> implements RunnableQuery<TReturning extends undefined ? PgQueryResultKind<TQueryResult, never> : TReturning[], 'pg'> {\n\tstatic override readonly [entityKind]: string = 'PgEffectInsert';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any>;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgInsertPrepare<this, TEffectHKT> {\n\t\tconst { session, config, dialect, cacheConfig } = this;\n\t\tconst { returning: fields } = config;\n\n\t\tconst query = dialect.sqlToQuery(this.getSQL());\n\t\tconst mapper = fields\n\t\t\t? this.dialect.mapperGenerators.rows(fields, undefined)\n\t\t\t: undefined;\n\n\t\tconst preparedQuery = session.prepareQuery<PreparedQueryConfig & { execute: any }>(\n\t\t\tquery,\n\t\t\tfields ? 'arrays' : 'raw',\n\t\t\tname ?? generateName,\n\t\t\tmapper,\n\t\t\t{ type: 'insert', tables: [...extractUsedTable(this.config.table)] },\n\t\t\tcacheConfig,\n\t\t);\n\n\t\treturn preparedQuery;\n\t}\n\n\tprepare(name?: string): PgInsertPrepare<this, TEffectHKT> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn this._prepare().execute(placeholderValues).pipe(\n\t\t\tEffect.withSpan('drizzle.operation'),\n\t\t);\n\t};\n}\n\napplyEffectWrapper(PgEffectInsertBase);\n"],"mappings":";;;;;;;AAkEA,IAAa,qBAAb,cAUU,aAQ6G;CACtH,QAA0B,cAAsB;;CAKhD,SAAS,MAAe,eAAe,OAA0C;EAChF,MAAM,EAAE,SAAS,QAAQ,SAAS,gBAAgB;EAClD,MAAM,EAAE,WAAW,WAAW;EAE9B,MAAM,QAAQ,QAAQ,WAAW,KAAK,QAAQ,CAAC;EAC/C,MAAM,SAAS,SACZ,KAAK,QAAQ,iBAAiB,KAAK,QAAQ,OAAU,GACrD;AAWH,SATsB,QAAQ,aAC7B,OACA,SAAS,WAAW,OACpB,QAAQ,cACR,QACA;GAAE,MAAM;GAAU,QAAQ,CAAC,GAAG,iBAAiB,KAAK,OAAO,MAAM,CAAC;GAAE,EACpE,YACA;;CAKF,QAAQ,MAAkD;AACzD,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAsB;AACxE,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB,CAAC,KACjD,OAAO,SAAS,oBAAoB,CACpC;;;AAIH,mBAAmB,mBAAmB"}

package/pg-core/effect/query.cjs

@@ -2,8 +2,6 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../../_virtual/_rolldown/runtime.cjs');
 const require_pg_core_query_builders_query = require('../query-builders/query.cjs');
 let __entity_ts = require("../../entity.cjs");
-let __relations_ts = require("../../relations.cjs");
-let __query_name_generator_ts = require("../../query-name-generator.cjs");
 let __effect_core_query_effect_ts = require("../../effect-core/query-effect.cjs");
 
 //#region src/pg-core/effect/query.ts
@@ -12,11 +10,14 @@ var PgEffectRelationalQuery = class extends require_pg_core_query_builders_query
 	/** @internal */
 	_prepare(name, generateName = false) {
 		const { query, builtQuery } = this._toSQL();
-		return this.session.prepareRelationalQuery(builtQuery, void 0, name ?? (generateName ? (0, __query_name_generator_ts.preparedStatementName)(builtQuery.sql, builtQuery.params) : name), (rawRows, mapColumnValue) => {
-			const rows = rawRows.map((row) => (0, __relations_ts.mapRelationalRow)(row, query.selection, mapColumnValue, this.parseJson));
-			if (this.mode === "first") return rows[0];
-			return rows;
+		const mapper = this.dialect.mapperGenerators.relationalRows({
+			isFirst: this.mode === "first",
+			parseJson: this.parseJson,
+			parseJsonIfString: false,
+			rootJsonMappers: false,
+			selection: query.selection
 		});
+		return this.session.prepareQuery(builtQuery, "objects", name ?? generateName, mapper);
 	}
 	prepare(name) {
 		return this._prepare(name, true);

package/pg-core/effect/query.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"query.cjs","names":["PgRelationalQuery","entityKind"],"sources":["../../../src/pg-core/effect/query.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport { mapRelationalRow } from '~/relations.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { PgRelationalQuery, type PgRelationalQueryHKTBase } from '../query-builders/query.ts';\nimport type { PreparedQueryConfig } from '../session.ts';\nimport type { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\nexport type AnyPgEffectRelationalQuery = PgEffectRelationalQuery<any, any>;\n\nexport interface PgEffectRelationalQueryHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends PgRelationalQueryHKTBase\n{\n\t_type: PgEffectRelationalQuery<this['result'], TEffectHKT>;\n}\n\nexport interface PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']>\n{}\nexport class PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends PgRelationalQuery<PgEffectRelationalQueryHKT<TEffectHKT>, TResult>\n\timplements RunnableQuery<TResult, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgEffectRelationalQueryV2';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any, any, any>;\n\n\t/** @internal */\n\t_prepare(\n\t\tname?: string,\n\t\tgenerateName = false,\n\t): PgEffectPreparedQuery<PreparedQueryConfig & { execute: TResult }, TEffectHKT> {\n\t\tconst { query, builtQuery } = this._toSQL();\n\n\t\treturn this.session.prepareRelationalQuery<PreparedQueryConfig & { execute: TResult }>(\n\t\t\tbuiltQuery,\n\t\t\tundefined,\n\t\t\tname ?? (generateName ? preparedStatementName(builtQuery.sql, builtQuery.params) : name),\n\t\t\t(rawRows, mapColumnValue) => {\n\t\t\t\tconst rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue, this.parseJson));\n\t\t\t\tif (this.mode === 'first') {\n\t\t\t\t\treturn rows[0] as TResult;\n\t\t\t\t}\n\t\t\t\treturn rows as TResult;\n\t\t\t},\n\t\t);\n\t}\n\n\tprepare(name?: string): PgEffectPreparedQuery<PreparedQueryConfig & { execute: TResult }, TEffectHKT> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute(placeholderValues?: Record<string, unknown>) {\n\t\treturn this._prepare().execute(placeholderValues);\n\t}\n}\n\napplyEffectWrapper(PgEffectRelationalQuery);\n"],"mappings":";;;;;;;;;AAqBA,IAAa,0BAAb,cACSA,uDAET;CACC,QAA0BC,0BAAsB;;CAKhD,SACC,MACA,eAAe,OACiE;EAChF,MAAM,EAAE,OAAO,eAAe,KAAK,QAAQ;AAE3C,SAAO,KAAK,QAAQ,uBACnB,YACA,QACA,SAAS,oEAAqC,WAAW,KAAK,WAAW,OAAO,GAAG,QAClF,SAAS,mBAAmB;GAC5B,MAAM,OAAO,QAAQ,KAAK,6CAAyB,KAAK,MAAM,WAAW,gBAAgB,KAAK,UAAU,CAAC;AACzG,OAAI,KAAK,SAAS,QACjB,QAAO,KAAK;AAEb,UAAO;IAER;;CAGF,QAAQ,MAA8F;AACrG,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,QAAQ,mBAA6C;AACpD,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;sDAIhC,wBAAwB"}
+{"version":3,"file":"query.cjs","names":["PgRelationalQuery","entityKind"],"sources":["../../../src/pg-core/effect/query.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { PgRelationalQuery, type PgRelationalQueryHKTBase } from '../query-builders/query.ts';\nimport type { PreparedQueryConfig } from '../session.ts';\nimport type { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\nexport type AnyPgEffectRelationalQuery = PgEffectRelationalQuery<any, any>;\n\nexport interface PgEffectRelationalQueryHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends PgRelationalQueryHKTBase\n{\n\t_type: PgEffectRelationalQuery<this['result'], TEffectHKT>;\n}\n\nexport interface PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']>\n{}\nexport class PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends PgRelationalQuery<PgEffectRelationalQueryHKT<TEffectHKT>, TResult>\n\timplements RunnableQuery<TResult, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgEffectRelationalQueryV2';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any>;\n\n\t/** @internal */\n\t_prepare(\n\t\tname?: string,\n\t\tgenerateName = false,\n\t): PgEffectPreparedQuery<PreparedQueryConfig & { execute: TResult }, TEffectHKT> {\n\t\tconst { query, builtQuery } = this._toSQL();\n\n\t\tconst mapper = this.dialect.mapperGenerators.relationalRows({\n\t\t\tisFirst: this.mode === 'first',\n\t\t\tparseJson: this.parseJson,\n\t\t\tparseJsonIfString: false,\n\t\t\trootJsonMappers: false,\n\t\t\tselection: query.selection,\n\t\t});\n\n\t\treturn this.session.prepareQuery<PreparedQueryConfig & { execute: TResult }>(\n\t\t\tbuiltQuery,\n\t\t\t'objects',\n\t\t\tname ?? generateName,\n\t\t\tmapper,\n\t\t);\n\t}\n\n\tprepare(name?: string): PgEffectPreparedQuery<PreparedQueryConfig & { execute: TResult }, TEffectHKT> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute(placeholderValues?: Record<string, unknown>) {\n\t\treturn this._prepare().execute(placeholderValues);\n\t}\n}\n\napplyEffectWrapper(PgEffectRelationalQuery);\n"],"mappings":";;;;;;;AAmBA,IAAa,0BAAb,cACSA,uDAET;CACC,QAA0BC,0BAAsB;;CAKhD,SACC,MACA,eAAe,OACiE;EAChF,MAAM,EAAE,OAAO,eAAe,KAAK,QAAQ;EAE3C,MAAM,SAAS,KAAK,QAAQ,iBAAiB,eAAe;GAC3D,SAAS,KAAK,SAAS;GACvB,WAAW,KAAK;GAChB,mBAAmB;GACnB,iBAAiB;GACjB,WAAW,MAAM;GACjB,CAAC;AAEF,SAAO,KAAK,QAAQ,aACnB,YACA,WACA,QAAQ,cACR,OACA;;CAGF,QAAQ,MAA8F;AACrG,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,QAAQ,mBAA6C;AACpD,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;sDAIhC,wBAAwB"}

package/pg-core/effect/query.d.cts

@@ -15,7 +15,7 @@ interface PgEffectRelationalQueryHKT<TEffectHKT extends QueryEffectHKTBase = Que
 interface PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']> {}
 declare class PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgRelationalQuery<PgEffectRelationalQueryHKT<TEffectHKT>, TResult> implements RunnableQuery<TResult, 'pg'> {
   static readonly [entityKind]: string;
-  protected session: PgEffectSession<TEffectHKT, any, any, any, any>;
+  protected session: PgEffectSession<TEffectHKT, any, any>;
   prepare(name?: string): PgEffectPreparedQuery<PreparedQueryConfig & {
     execute: TResult;
   }, TEffectHKT>;

package/pg-core/effect/query.d.ts

@@ -15,7 +15,7 @@ interface PgEffectRelationalQueryHKT<TEffectHKT extends QueryEffectHKTBase = Que
 interface PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']> {}
 declare class PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgRelationalQuery<PgEffectRelationalQueryHKT<TEffectHKT>, TResult> implements RunnableQuery<TResult, 'pg'> {
   static readonly [entityKind]: string;
-  protected session: PgEffectSession<TEffectHKT, any, any, any, any>;
+  protected session: PgEffectSession<TEffectHKT, any, any>;
   prepare(name?: string): PgEffectPreparedQuery<PreparedQueryConfig & {
     execute: TResult;
   }, TEffectHKT>;

package/pg-core/effect/query.js

@@ -1,7 +1,5 @@
 import { PgRelationalQuery } from "../query-builders/query.js";
 import { entityKind } from "../../entity.js";
-import { mapRelationalRow } from "../../relations.js";
-import { preparedStatementName } from "../../query-name-generator.js";
 import { applyEffectWrapper } from "../../effect-core/query-effect.js";
 
 //#region src/pg-core/effect/query.ts
@@ -10,11 +8,14 @@ var PgEffectRelationalQuery = class extends PgRelationalQuery {
 	/** @internal */
 	_prepare(name, generateName = false) {
 		const { query, builtQuery } = this._toSQL();
-		return this.session.prepareRelationalQuery(builtQuery, void 0, name ?? (generateName ? preparedStatementName(builtQuery.sql, builtQuery.params) : name), (rawRows, mapColumnValue) => {
-			const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue, this.parseJson));
-			if (this.mode === "first") return rows[0];
-			return rows;
+		const mapper = this.dialect.mapperGenerators.relationalRows({
+			isFirst: this.mode === "first",
+			parseJson: this.parseJson,
+			parseJsonIfString: false,
+			rootJsonMappers: false,
+			selection: query.selection
 		});
+		return this.session.prepareQuery(builtQuery, "objects", name ?? generateName, mapper);
 	}
 	prepare(name) {
 		return this._prepare(name, true);

package/pg-core/effect/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","names":[],"sources":["../../../src/pg-core/effect/query.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport { mapRelationalRow } from '~/relations.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { PgRelationalQuery, type PgRelationalQueryHKTBase } from '../query-builders/query.ts';\nimport type { PreparedQueryConfig } from '../session.ts';\nimport type { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\nexport type AnyPgEffectRelationalQuery = PgEffectRelationalQuery<any, any>;\n\nexport interface PgEffectRelationalQueryHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends PgRelationalQueryHKTBase\n{\n\t_type: PgEffectRelationalQuery<this['result'], TEffectHKT>;\n}\n\nexport interface PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']>\n{}\nexport class PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends PgRelationalQuery<PgEffectRelationalQueryHKT<TEffectHKT>, TResult>\n\timplements RunnableQuery<TResult, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgEffectRelationalQueryV2';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any, any, any>;\n\n\t/** @internal */\n\t_prepare(\n\t\tname?: string,\n\t\tgenerateName = false,\n\t): PgEffectPreparedQuery<PreparedQueryConfig & { execute: TResult }, TEffectHKT> {\n\t\tconst { query, builtQuery } = this._toSQL();\n\n\t\treturn this.session.prepareRelationalQuery<PreparedQueryConfig & { execute: TResult }>(\n\t\t\tbuiltQuery,\n\t\t\tundefined,\n\t\t\tname ?? (generateName ? preparedStatementName(builtQuery.sql, builtQuery.params) : name),\n\t\t\t(rawRows, mapColumnValue) => {\n\t\t\t\tconst rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue, this.parseJson));\n\t\t\t\tif (this.mode === 'first') {\n\t\t\t\t\treturn rows[0] as TResult;\n\t\t\t\t}\n\t\t\t\treturn rows as TResult;\n\t\t\t},\n\t\t);\n\t}\n\n\tprepare(name?: string): PgEffectPreparedQuery<PreparedQueryConfig & { execute: TResult }, TEffectHKT> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute(placeholderValues?: Record<string, unknown>) {\n\t\treturn this._prepare().execute(placeholderValues);\n\t}\n}\n\napplyEffectWrapper(PgEffectRelationalQuery);\n"],"mappings":";;;;;;;AAqBA,IAAa,0BAAb,cACS,kBAET;CACC,QAA0B,cAAsB;;CAKhD,SACC,MACA,eAAe,OACiE;EAChF,MAAM,EAAE,OAAO,eAAe,KAAK,QAAQ;AAE3C,SAAO,KAAK,QAAQ,uBACnB,YACA,QACA,SAAS,eAAe,sBAAsB,WAAW,KAAK,WAAW,OAAO,GAAG,QAClF,SAAS,mBAAmB;GAC5B,MAAM,OAAO,QAAQ,KAAK,QAAQ,iBAAiB,KAAK,MAAM,WAAW,gBAAgB,KAAK,UAAU,CAAC;AACzG,OAAI,KAAK,SAAS,QACjB,QAAO,KAAK;AAEb,UAAO;IAER;;CAGF,QAAQ,MAA8F;AACrG,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,QAAQ,mBAA6C;AACpD,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;AAInD,mBAAmB,wBAAwB"}
+{"version":3,"file":"query.js","names":[],"sources":["../../../src/pg-core/effect/query.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { PgRelationalQuery, type PgRelationalQueryHKTBase } from '../query-builders/query.ts';\nimport type { PreparedQueryConfig } from '../session.ts';\nimport type { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\nexport type AnyPgEffectRelationalQuery = PgEffectRelationalQuery<any, any>;\n\nexport interface PgEffectRelationalQueryHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends PgRelationalQueryHKTBase\n{\n\t_type: PgEffectRelationalQuery<this['result'], TEffectHKT>;\n}\n\nexport interface PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']>\n{}\nexport class PgEffectRelationalQuery<TResult, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase>\n\textends PgRelationalQuery<PgEffectRelationalQueryHKT<TEffectHKT>, TResult>\n\timplements RunnableQuery<TResult, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgEffectRelationalQueryV2';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any>;\n\n\t/** @internal */\n\t_prepare(\n\t\tname?: string,\n\t\tgenerateName = false,\n\t): PgEffectPreparedQuery<PreparedQueryConfig & { execute: TResult }, TEffectHKT> {\n\t\tconst { query, builtQuery } = this._toSQL();\n\n\t\tconst mapper = this.dialect.mapperGenerators.relationalRows({\n\t\t\tisFirst: this.mode === 'first',\n\t\t\tparseJson: this.parseJson,\n\t\t\tparseJsonIfString: false,\n\t\t\trootJsonMappers: false,\n\t\t\tselection: query.selection,\n\t\t});\n\n\t\treturn this.session.prepareQuery<PreparedQueryConfig & { execute: TResult }>(\n\t\t\tbuiltQuery,\n\t\t\t'objects',\n\t\t\tname ?? generateName,\n\t\t\tmapper,\n\t\t);\n\t}\n\n\tprepare(name?: string): PgEffectPreparedQuery<PreparedQueryConfig & { execute: TResult }, TEffectHKT> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute(placeholderValues?: Record<string, unknown>) {\n\t\treturn this._prepare().execute(placeholderValues);\n\t}\n}\n\napplyEffectWrapper(PgEffectRelationalQuery);\n"],"mappings":";;;;;AAmBA,IAAa,0BAAb,cACS,kBAET;CACC,QAA0B,cAAsB;;CAKhD,SACC,MACA,eAAe,OACiE;EAChF,MAAM,EAAE,OAAO,eAAe,KAAK,QAAQ;EAE3C,MAAM,SAAS,KAAK,QAAQ,iBAAiB,eAAe;GAC3D,SAAS,KAAK,SAAS;GACvB,WAAW,KAAK;GAChB,mBAAmB;GACnB,iBAAiB;GACjB,WAAW,MAAM;GACjB,CAAC;AAEF,SAAO,KAAK,QAAQ,aACnB,YACA,WACA,QAAQ,cACR,OACA;;CAGF,QAAQ,MAA8F;AACrG,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,QAAQ,mBAA6C;AACpD,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;AAInD,mBAAmB,wBAAwB"}

package/pg-core/effect/refresh-materialized-view.cjs

@@ -2,7 +2,6 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../../_virtual/_rolldown/runtime.cjs');
 const require_pg_core_query_builders_refresh_materialized_view = require('../query-builders/refresh-materialized-view.cjs');
 let __entity_ts = require("../../entity.cjs");
-let __query_name_generator_ts = require("../../query-name-generator.cjs");
 let __effect_core_query_effect_ts = require("../../effect-core/query-effect.cjs");
 
 //#region src/pg-core/effect/refresh-materialized-view.ts
@@ -11,7 +10,7 @@ var PgEffectRefreshMaterializedView = class extends require_pg_core_query_builde
 	/** @internal */
 	_prepare(name, generateName = false) {
 		const query = this.dialect.sqlToQuery(this.getSQL());
-		return this.session.prepareQuery(query, void 0, name ?? (generateName ? (0, __query_name_generator_ts.preparedStatementName)(query.sql, query.params) : name), true);
+		return this.session.prepareQuery(query, "raw", name ?? generateName);
 	}
 	prepare(name) {
 		return this._prepare(name, true);

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

@@ -1 +1 @@
-{"version":3,"file":"refresh-materialized-view.cjs","names":["PgRefreshMaterializedView","entityKind"],"sources":["../../../src/pg-core/effect/refresh-materialized-view.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { PgRefreshMaterializedView } from '../query-builders/refresh-materialized-view.ts';\nimport type { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PgEffectRefreshMaterializedView<\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends Effect.Effect<PgQueryResultKind<TQueryResult, never>, TEffectHKT['error'], TEffectHKT['context']> {}\n\nexport class PgEffectRefreshMaterializedView<\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgRefreshMaterializedView<TQueryResult>\n\timplements RunnableQuery<PgQueryResultKind<TQueryResult, never>, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgEffectRefreshMaterializedView';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any, any, any>;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgEffectPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t},\n\t\tTEffectHKT\n\t> {\n\t\tconst query = this.dialect.sqlToQuery(this.getSQL());\n\t\treturn this.session.prepareQuery(\n\t\t\tquery,\n\t\t\tundefined,\n\t\t\tname ?? (generateName ? preparedStatementName(query.sql, query.params) : name),\n\t\t\ttrue,\n\t\t);\n\t}\n\n\tprepare(name?: string): PgEffectPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t},\n\t\tTEffectHKT\n\t> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn this._prepare().execute(placeholderValues);\n\t};\n}\n\napplyEffectWrapper(PgEffectRefreshMaterializedView);\n"],"mappings":";;;;;;;;AAeA,IAAa,kCAAb,cAGUA,mFAEV;CACC,QAA0BC,0BAAsB;;CAKhD,SAAS,MAAe,eAAe,OAKrC;EACD,MAAM,QAAQ,KAAK,QAAQ,WAAW,KAAK,QAAQ,CAAC;AACpD,SAAO,KAAK,QAAQ,aACnB,OACA,QACA,SAAS,oEAAqC,MAAM,KAAK,MAAM,OAAO,GAAG,OACzE,KACA;;CAGF,QAAQ,MAKN;AACD,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAsB;AACxE,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;sDAIhC,gCAAgC"}
+{"version":3,"file":"refresh-materialized-view.cjs","names":["PgRefreshMaterializedView","entityKind"],"sources":["../../../src/pg-core/effect/refresh-materialized-view.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { PgRefreshMaterializedView } from '../query-builders/refresh-materialized-view.ts';\nimport type { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PgEffectRefreshMaterializedView<\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends Effect.Effect<PgQueryResultKind<TQueryResult, never>, TEffectHKT['error'], TEffectHKT['context']> {}\n\nexport class PgEffectRefreshMaterializedView<\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgRefreshMaterializedView<TQueryResult>\n\timplements RunnableQuery<PgQueryResultKind<TQueryResult, never>, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgEffectRefreshMaterializedView';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any>;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgEffectPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t},\n\t\tTEffectHKT\n\t> {\n\t\tconst query = this.dialect.sqlToQuery(this.getSQL());\n\t\treturn this.session.prepareQuery(\n\t\t\tquery,\n\t\t\t'raw',\n\t\t\tname ?? generateName,\n\t\t);\n\t}\n\n\tprepare(name?: string): PgEffectPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t},\n\t\tTEffectHKT\n\t> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn this._prepare().execute(placeholderValues);\n\t};\n}\n\napplyEffectWrapper(PgEffectRefreshMaterializedView);\n"],"mappings":";;;;;;;AAcA,IAAa,kCAAb,cAGUA,mFAEV;CACC,QAA0BC,0BAAsB;;CAKhD,SAAS,MAAe,eAAe,OAKrC;EACD,MAAM,QAAQ,KAAK,QAAQ,WAAW,KAAK,QAAQ,CAAC;AACpD,SAAO,KAAK,QAAQ,aACnB,OACA,OACA,QAAQ,aACR;;CAGF,QAAQ,MAKN;AACD,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAsB;AACxE,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;sDAIhC,gCAAgC"}

package/pg-core/effect/refresh-materialized-view.d.cts

@@ -10,7 +10,7 @@ import { QueryEffectHKTBase } from "../../effect-core/query-effect.cjs";
 interface PgEffectRefreshMaterializedView<TQueryResult extends PgQueryResultHKT = PgQueryResultHKT, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends Effect.Effect<PgQueryResultKind<TQueryResult, never>, TEffectHKT['error'], TEffectHKT['context']> {}
 declare class PgEffectRefreshMaterializedView<TQueryResult extends PgQueryResultHKT = PgQueryResultHKT, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgRefreshMaterializedView<TQueryResult> implements RunnableQuery<PgQueryResultKind<TQueryResult, never>, 'pg'> {
   static readonly [entityKind]: string;
-  protected session: PgEffectSession<TEffectHKT, any, any, any, any>;
+  protected session: PgEffectSession<TEffectHKT, any, any>;
   prepare(name?: string): PgEffectPreparedQuery<PreparedQueryConfig & {
     execute: PgQueryResultKind<TQueryResult, never>;
   }, TEffectHKT>;

package/pg-core/effect/refresh-materialized-view.d.ts

@@ -10,7 +10,7 @@ import { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from "../ses
 interface PgEffectRefreshMaterializedView<TQueryResult extends PgQueryResultHKT = PgQueryResultHKT, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends Effect.Effect<PgQueryResultKind<TQueryResult, never>, TEffectHKT['error'], TEffectHKT['context']> {}
 declare class PgEffectRefreshMaterializedView<TQueryResult extends PgQueryResultHKT = PgQueryResultHKT, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgRefreshMaterializedView<TQueryResult> implements RunnableQuery<PgQueryResultKind<TQueryResult, never>, 'pg'> {
   static readonly [entityKind]: string;
-  protected session: PgEffectSession<TEffectHKT, any, any, any, any>;
+  protected session: PgEffectSession<TEffectHKT, any, any>;
   prepare(name?: string): PgEffectPreparedQuery<PreparedQueryConfig & {
     execute: PgQueryResultKind<TQueryResult, never>;
   }, TEffectHKT>;

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

@@ -1,6 +1,5 @@
 import { PgRefreshMaterializedView } from "../query-builders/refresh-materialized-view.js";
 import { entityKind } from "../../entity.js";
-import { preparedStatementName } from "../../query-name-generator.js";
 import { applyEffectWrapper } from "../../effect-core/query-effect.js";
 
 //#region src/pg-core/effect/refresh-materialized-view.ts
@@ -9,7 +8,7 @@ var PgEffectRefreshMaterializedView = class extends PgRefreshMaterializedView {
 	/** @internal */
 	_prepare(name, generateName = false) {
 		const query = this.dialect.sqlToQuery(this.getSQL());
-		return this.session.prepareQuery(query, void 0, name ?? (generateName ? preparedStatementName(query.sql, query.params) : name), true);
+		return this.session.prepareQuery(query, "raw", name ?? generateName);
 	}
 	prepare(name) {
 		return this._prepare(name, true);

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

@@ -1 +1 @@
-{"version":3,"file":"refresh-materialized-view.js","names":[],"sources":["../../../src/pg-core/effect/refresh-materialized-view.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { PgRefreshMaterializedView } from '../query-builders/refresh-materialized-view.ts';\nimport type { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PgEffectRefreshMaterializedView<\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends Effect.Effect<PgQueryResultKind<TQueryResult, never>, TEffectHKT['error'], TEffectHKT['context']> {}\n\nexport class PgEffectRefreshMaterializedView<\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgRefreshMaterializedView<TQueryResult>\n\timplements RunnableQuery<PgQueryResultKind<TQueryResult, never>, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgEffectRefreshMaterializedView';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any, any, any>;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgEffectPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t},\n\t\tTEffectHKT\n\t> {\n\t\tconst query = this.dialect.sqlToQuery(this.getSQL());\n\t\treturn this.session.prepareQuery(\n\t\t\tquery,\n\t\t\tundefined,\n\t\t\tname ?? (generateName ? preparedStatementName(query.sql, query.params) : name),\n\t\t\ttrue,\n\t\t);\n\t}\n\n\tprepare(name?: string): PgEffectPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t},\n\t\tTEffectHKT\n\t> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn this._prepare().execute(placeholderValues);\n\t};\n}\n\napplyEffectWrapper(PgEffectRefreshMaterializedView);\n"],"mappings":";;;;;;AAeA,IAAa,kCAAb,cAGU,0BAEV;CACC,QAA0B,cAAsB;;CAKhD,SAAS,MAAe,eAAe,OAKrC;EACD,MAAM,QAAQ,KAAK,QAAQ,WAAW,KAAK,QAAQ,CAAC;AACpD,SAAO,KAAK,QAAQ,aACnB,OACA,QACA,SAAS,eAAe,sBAAsB,MAAM,KAAK,MAAM,OAAO,GAAG,OACzE,KACA;;CAGF,QAAQ,MAKN;AACD,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAsB;AACxE,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;AAInD,mBAAmB,gCAAgC"}
+{"version":3,"file":"refresh-materialized-view.js","names":[],"sources":["../../../src/pg-core/effect/refresh-materialized-view.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { PgQueryResultHKT, PgQueryResultKind, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport { PgRefreshMaterializedView } from '../query-builders/refresh-materialized-view.ts';\nimport type { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PgEffectRefreshMaterializedView<\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends Effect.Effect<PgQueryResultKind<TQueryResult, never>, TEffectHKT['error'], TEffectHKT['context']> {}\n\nexport class PgEffectRefreshMaterializedView<\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgRefreshMaterializedView<TQueryResult>\n\timplements RunnableQuery<PgQueryResultKind<TQueryResult, never>, 'pg'>\n{\n\tstatic override readonly [entityKind]: string = 'PgEffectRefreshMaterializedView';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any>;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgEffectPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t},\n\t\tTEffectHKT\n\t> {\n\t\tconst query = this.dialect.sqlToQuery(this.getSQL());\n\t\treturn this.session.prepareQuery(\n\t\t\tquery,\n\t\t\t'raw',\n\t\t\tname ?? generateName,\n\t\t);\n\t}\n\n\tprepare(name?: string): PgEffectPreparedQuery<\n\t\tPreparedQueryConfig & {\n\t\t\texecute: PgQueryResultKind<TQueryResult, never>;\n\t\t},\n\t\tTEffectHKT\n\t> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn this._prepare().execute(placeholderValues);\n\t};\n}\n\napplyEffectWrapper(PgEffectRefreshMaterializedView);\n"],"mappings":";;;;;AAcA,IAAa,kCAAb,cAGU,0BAEV;CACC,QAA0B,cAAsB;;CAKhD,SAAS,MAAe,eAAe,OAKrC;EACD,MAAM,QAAQ,KAAK,QAAQ,WAAW,KAAK,QAAQ,CAAC;AACpD,SAAO,KAAK,QAAQ,aACnB,OACA,OACA,QAAQ,aACR;;CAGF,QAAQ,MAKN;AACD,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAsB;AACxE,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;AAInD,mBAAmB,gCAAgC"}

package/pg-core/effect/select.cjs

@@ -3,7 +3,6 @@ const require_runtime = require('../../_virtual/_rolldown/runtime.cjs');
 const require_pg_core_query_builders_select = require('../query-builders/select.cjs');
 let __entity_ts = require("../../entity.cjs");
 let __utils_ts = require("../../utils.cjs");
-let __query_name_generator_ts = require("../../query-name-generator.cjs");
 let __effect_core_query_effect_ts = require("../../effect-core/query-effect.cjs");
 
 //#region src/pg-core/effect/select.ts
@@ -14,13 +13,12 @@ var PgEffectSelectBase = class extends require_pg_core_query_builders_select.PgS
 		const { session, config, dialect, joinsNotNullableMap, cacheConfig, usedTables } = this;
 		const { fields } = config;
 		const query = dialect.sqlToQuery(this.getSQL());
-		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, {
+		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, {
 			type: "select",
 			tables: [...usedTables]
 		}, cacheConfig);
-		preparedQUery.joinsNotNullableMap = joinsNotNullableMap;
-		return preparedQUery;
 	}
 	/**
 	* Create a prepared statement for this query. This allows

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

@@ -1 +1 @@
-{"version":3,"file":"select.cjs","names":["PgSelectBase","entityKind"],"sources":["../../../src/pg-core/effect/select.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { 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 type { ColumnsSelection } from '~/sql/sql.ts';\nimport { 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 { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\nexport type PgEffectSelectPrepare<\n\tT extends AnyPgEffectSelect,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgEffectPreparedQuery<\n\tPreparedQueryConfig & {\n\t\texecute: T['_']['result'];\n\t},\n\tTEffectHKT\n>;\n\nexport type PgEffectSelectBuilder<\n\tTSelection extends SelectedFields | undefined,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgSelectBuilder<TSelection, PgEffectSelectHKT<TEffectHKT>>;\n\nexport type PgEffectSelect<\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> = PgEffectSelectBase<\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\ttrue,\n\tnever\n>;\n\nexport interface PgEffectSelectHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgSelectHKTBase {\n\t_type: PgEffectSelectBase<\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\tTEffectHKT\n\t>;\n}\n\nexport interface PgEffectSelectBase<\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\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\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']> {\n}\n\nexport class PgEffectSelectBase<\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\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgSelectBase<\n\tPgEffectSelectHKT<TEffectHKT>,\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\tTDynamic,\n\tTExcludedMethods,\n\tTResult,\n\tTSelectedFields\n> {\n\tstatic override readonly [entityKind]: string = 'PgEffectSelectQueryBuilder';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any, any, any>;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgEffectSelectPrepare<this, TEffectHKT> {\n\t\tconst { session, config, dialect, joinsNotNullableMap, cacheConfig, usedTables } = this;\n\t\tconst { fields } = config;\n\n\t\tconst query = dialect.sqlToQuery(this.getSQL());\n\t\tconst fieldsList = orderSelectedFields<PgColumn>(fields);\n\t\tconst preparedQUery = session.prepareQuery<\n\t\t\tPreparedQueryConfig & { execute: TResult }\n\t\t>(\n\t\t\tquery,\n\t\t\tfieldsList,\n\t\t\tname ?? (generateName ? preparedStatementName(query.sql, query.params) : name),\n\t\t\ttrue,\n\t\t\tundefined,\n\t\t\t{\n\t\t\t\ttype: 'select',\n\t\t\t\ttables: [...usedTables],\n\t\t\t},\n\t\t\tcacheConfig,\n\t\t);\n\t\tpreparedQUery.joinsNotNullableMap = joinsNotNullableMap;\n\n\t\treturn preparedQUery;\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(name?: string): PgEffectSelectPrepare<this, TEffectHKT> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues?: Record<string, unknown>) => {\n\t\treturn this._prepare().execute(placeholderValues);\n\t};\n}\n\napplyEffectWrapper(PgEffectSelectBase);\n\nexport type AnyPgEffectSelect = PgEffectSelectBase<any, any, any, any, any, any, any, any, any>;\n"],"mappings":";;;;;;;;;AAiFA,IAAa,qBAAb,cAcUA,mDAUR;CACD,QAA0BC,0BAAsB;;CAKhD,SAAS,MAAe,eAAe,OAAgD;EACtF,MAAM,EAAE,SAAS,QAAQ,SAAS,qBAAqB,aAAa,eAAe;EACnF,MAAM,EAAE,WAAW;EAEnB,MAAM,QAAQ,QAAQ,WAAW,KAAK,QAAQ,CAAC;EAC/C,MAAM,iDAA2C,OAAO;EACxD,MAAM,gBAAgB,QAAQ,aAG7B,OACA,YACA,SAAS,oEAAqC,MAAM,KAAK,MAAM,OAAO,GAAG,OACzE,MACA,QACA;GACC,MAAM;GACN,QAAQ,CAAC,GAAG,WAAW;GACvB,EACD,YACA;AACD,gBAAc,sBAAsB;AAEpC,SAAO;;;;;;;;;CAUR,QAAQ,MAAwD;AAC/D,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAgD;AAClG,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;sDAIhC,mBAAmB"}
+{"version":3,"file":"select.cjs","names":["PgSelectBase","entityKind"],"sources":["../../../src/pg-core/effect/select.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type {\n\tBuildSubquerySelection,\n\tJoinNullability,\n\tSelectMode,\n\tSelectResult,\n} from '~/query-builders/select.types.ts';\nimport type { ColumnsSelection } from '~/sql/sql.ts';\nimport { 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 { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\nexport type PgEffectSelectPrepare<\n\tT extends AnyPgEffectSelect,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgEffectPreparedQuery<\n\tPreparedQueryConfig & {\n\t\texecute: T['_']['result'];\n\t},\n\tTEffectHKT\n>;\n\nexport type PgEffectSelectBuilder<\n\tTSelection extends SelectedFields | undefined,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgSelectBuilder<TSelection, PgEffectSelectHKT<TEffectHKT>>;\n\nexport type PgEffectSelect<\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> = PgEffectSelectBase<\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\ttrue,\n\tnever\n>;\n\nexport interface PgEffectSelectHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgSelectHKTBase {\n\t_type: PgEffectSelectBase<\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\tTEffectHKT\n\t>;\n}\n\nexport interface PgEffectSelectBase<\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\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\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']> {\n}\n\nexport class PgEffectSelectBase<\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\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgSelectBase<\n\tPgEffectSelectHKT<TEffectHKT>,\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\tTDynamic,\n\tTExcludedMethods,\n\tTResult,\n\tTSelectedFields\n> {\n\tstatic override readonly [entityKind]: string = 'PgEffectSelectQueryBuilder';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any>;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgEffectSelectPrepare<this, TEffectHKT> {\n\t\tconst { session, config, dialect, joinsNotNullableMap, cacheConfig, usedTables } = this;\n\t\tconst { fields } = config;\n\n\t\tconst query = dialect.sqlToQuery(this.getSQL());\n\t\tconst fieldsList = orderSelectedFields<PgColumn>(\n\t\t\tfields,\n\t\t\tundefined,\n\t\t\tthis.dialect.codecs,\n\t\t);\n\n\t\tconst mapper = this.dialect.mapperGenerators.rows(fieldsList, joinsNotNullableMap);\n\n\t\tconst preparedQuery = session.prepareQuery<PreparedQueryConfig & { execute: any }>(\n\t\t\tquery,\n\t\t\t'arrays',\n\t\t\tname ?? generateName,\n\t\t\tmapper,\n\t\t\t{ type: 'select', tables: [...usedTables] },\n\t\t\tcacheConfig,\n\t\t);\n\n\t\treturn preparedQuery;\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(name?: string): PgEffectSelectPrepare<this, TEffectHKT> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues?: Record<string, unknown>) => {\n\t\treturn this._prepare().execute(placeholderValues);\n\t};\n}\n\napplyEffectWrapper(PgEffectSelectBase);\n\nexport type AnyPgEffectSelect = PgEffectSelectBase<any, any, any, any, any, any, any, any, any>;\n"],"mappings":";;;;;;;;AAgFA,IAAa,qBAAb,cAcUA,mDAUR;CACD,QAA0BC,0BAAsB;;CAKhD,SAAS,MAAe,eAAe,OAAgD;EACtF,MAAM,EAAE,SAAS,QAAQ,SAAS,qBAAqB,aAAa,eAAe;EACnF,MAAM,EAAE,WAAW;EAEnB,MAAM,QAAQ,QAAQ,WAAW,KAAK,QAAQ,CAAC;EAC/C,MAAM,iDACL,QACA,QACA,KAAK,QAAQ,OACb;EAED,MAAM,SAAS,KAAK,QAAQ,iBAAiB,KAAK,YAAY,oBAAoB;AAWlF,SATsB,QAAQ,aAC7B,OACA,UACA,QAAQ,cACR,QACA;GAAE,MAAM;GAAU,QAAQ,CAAC,GAAG,WAAW;GAAE,EAC3C,YACA;;;;;;;;;CAYF,QAAQ,MAAwD;AAC/D,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAgD;AAClG,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;sDAIhC,mBAAmB"}

package/pg-core/effect/select.d.cts

@@ -21,7 +21,7 @@ interface PgEffectSelectHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectH
 interface PgEffectSelectBase<TTableName extends string | undefined, TSelection extends ColumnsSelection | undefined, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = (TTableName extends string ? Record<TTableName, 'not-null'> : {}), TDynamic extends boolean = false, TExcludedMethods extends string = never, TResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[], TSelectedFields extends ColumnsSelection = BuildSubquerySelection<Assume<TSelection, ColumnsSelection>, TNullabilityMap>, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']> {}
 declare class PgEffectSelectBase<TTableName extends string | undefined, TSelection extends ColumnsSelection | undefined, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = (TTableName extends string ? Record<TTableName, 'not-null'> : {}), TDynamic extends boolean = false, TExcludedMethods extends string = never, TResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[], TSelectedFields extends ColumnsSelection = BuildSubquerySelection<Assume<TSelection, ColumnsSelection>, TNullabilityMap>, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgSelectBase<PgEffectSelectHKT<TEffectHKT>, TTableName, TSelection, TSelectMode, TNullabilityMap, TDynamic, TExcludedMethods, TResult, TSelectedFields> {
   static readonly [entityKind]: string;
-  protected session: PgEffectSession<TEffectHKT, any, any, any, any>;
+  protected session: PgEffectSession<TEffectHKT, any, any>;
   /**
    * Create a prepared statement for this query. This allows
    * the database to remember this query for the given session

package/pg-core/effect/select.d.ts

@@ -21,7 +21,7 @@ interface PgEffectSelectHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectH
 interface PgEffectSelectBase<TTableName extends string | undefined, TSelection extends ColumnsSelection | undefined, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = (TTableName extends string ? Record<TTableName, 'not-null'> : {}), TDynamic extends boolean = false, TExcludedMethods extends string = never, TResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[], TSelectedFields extends ColumnsSelection = BuildSubquerySelection<Assume<TSelection, ColumnsSelection>, TNullabilityMap>, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']> {}
 declare class PgEffectSelectBase<TTableName extends string | undefined, TSelection extends ColumnsSelection | undefined, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = (TTableName extends string ? Record<TTableName, 'not-null'> : {}), TDynamic extends boolean = false, TExcludedMethods extends string = never, TResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[], TSelectedFields extends ColumnsSelection = BuildSubquerySelection<Assume<TSelection, ColumnsSelection>, TNullabilityMap>, TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgSelectBase<PgEffectSelectHKT<TEffectHKT>, TTableName, TSelection, TSelectMode, TNullabilityMap, TDynamic, TExcludedMethods, TResult, TSelectedFields> {
   static readonly [entityKind]: string;
-  protected session: PgEffectSession<TEffectHKT, any, any, any, any>;
+  protected session: PgEffectSession<TEffectHKT, any, any>;
   /**
    * Create a prepared statement for this query. This allows
    * the database to remember this query for the given session

package/pg-core/effect/select.js

@@ -1,7 +1,6 @@
 import { PgSelectBase } from "../query-builders/select.js";
 import { entityKind } from "../../entity.js";
 import { orderSelectedFields } from "../../utils.js";
-import { preparedStatementName } from "../../query-name-generator.js";
 import { applyEffectWrapper } from "../../effect-core/query-effect.js";
 
 //#region src/pg-core/effect/select.ts
@@ -12,13 +11,12 @@ var PgEffectSelectBase = class extends PgSelectBase {
 		const { session, config, dialect, joinsNotNullableMap, cacheConfig, usedTables } = this;
 		const { fields } = config;
 		const query = dialect.sqlToQuery(this.getSQL());
-		const fieldsList = orderSelectedFields(fields);
-		const preparedQUery = session.prepareQuery(query, fieldsList, name ?? (generateName ? preparedStatementName(query.sql, query.params) : name), true, void 0, {
+		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, {
 			type: "select",
 			tables: [...usedTables]
 		}, cacheConfig);
-		preparedQUery.joinsNotNullableMap = joinsNotNullableMap;
-		return preparedQUery;
 	}
 	/**
 	* Create a prepared statement for this query. This allows

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

@@ -1 +1 @@
-{"version":3,"file":"select.js","names":[],"sources":["../../../src/pg-core/effect/select.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { 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 type { ColumnsSelection } from '~/sql/sql.ts';\nimport { 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 { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\nexport type PgEffectSelectPrepare<\n\tT extends AnyPgEffectSelect,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgEffectPreparedQuery<\n\tPreparedQueryConfig & {\n\t\texecute: T['_']['result'];\n\t},\n\tTEffectHKT\n>;\n\nexport type PgEffectSelectBuilder<\n\tTSelection extends SelectedFields | undefined,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgSelectBuilder<TSelection, PgEffectSelectHKT<TEffectHKT>>;\n\nexport type PgEffectSelect<\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> = PgEffectSelectBase<\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\ttrue,\n\tnever\n>;\n\nexport interface PgEffectSelectHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgSelectHKTBase {\n\t_type: PgEffectSelectBase<\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\tTEffectHKT\n\t>;\n}\n\nexport interface PgEffectSelectBase<\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\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\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']> {\n}\n\nexport class PgEffectSelectBase<\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\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgSelectBase<\n\tPgEffectSelectHKT<TEffectHKT>,\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\tTDynamic,\n\tTExcludedMethods,\n\tTResult,\n\tTSelectedFields\n> {\n\tstatic override readonly [entityKind]: string = 'PgEffectSelectQueryBuilder';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any, any, any>;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgEffectSelectPrepare<this, TEffectHKT> {\n\t\tconst { session, config, dialect, joinsNotNullableMap, cacheConfig, usedTables } = this;\n\t\tconst { fields } = config;\n\n\t\tconst query = dialect.sqlToQuery(this.getSQL());\n\t\tconst fieldsList = orderSelectedFields<PgColumn>(fields);\n\t\tconst preparedQUery = session.prepareQuery<\n\t\t\tPreparedQueryConfig & { execute: TResult }\n\t\t>(\n\t\t\tquery,\n\t\t\tfieldsList,\n\t\t\tname ?? (generateName ? preparedStatementName(query.sql, query.params) : name),\n\t\t\ttrue,\n\t\t\tundefined,\n\t\t\t{\n\t\t\t\ttype: 'select',\n\t\t\t\ttables: [...usedTables],\n\t\t\t},\n\t\t\tcacheConfig,\n\t\t);\n\t\tpreparedQUery.joinsNotNullableMap = joinsNotNullableMap;\n\n\t\treturn preparedQUery;\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(name?: string): PgEffectSelectPrepare<this, TEffectHKT> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues?: Record<string, unknown>) => {\n\t\treturn this._prepare().execute(placeholderValues);\n\t};\n}\n\napplyEffectWrapper(PgEffectSelectBase);\n\nexport type AnyPgEffectSelect = PgEffectSelectBase<any, any, any, any, any, any, any, any, any>;\n"],"mappings":";;;;;;;AAiFA,IAAa,qBAAb,cAcU,aAUR;CACD,QAA0B,cAAsB;;CAKhD,SAAS,MAAe,eAAe,OAAgD;EACtF,MAAM,EAAE,SAAS,QAAQ,SAAS,qBAAqB,aAAa,eAAe;EACnF,MAAM,EAAE,WAAW;EAEnB,MAAM,QAAQ,QAAQ,WAAW,KAAK,QAAQ,CAAC;EAC/C,MAAM,aAAa,oBAA8B,OAAO;EACxD,MAAM,gBAAgB,QAAQ,aAG7B,OACA,YACA,SAAS,eAAe,sBAAsB,MAAM,KAAK,MAAM,OAAO,GAAG,OACzE,MACA,QACA;GACC,MAAM;GACN,QAAQ,CAAC,GAAG,WAAW;GACvB,EACD,YACA;AACD,gBAAc,sBAAsB;AAEpC,SAAO;;;;;;;;;CAUR,QAAQ,MAAwD;AAC/D,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAgD;AAClG,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;AAInD,mBAAmB,mBAAmB"}
+{"version":3,"file":"select.js","names":[],"sources":["../../../src/pg-core/effect/select.ts"],"sourcesContent":["import type * as Effect from 'effect/Effect';\nimport { applyEffectWrapper, type QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type {\n\tBuildSubquerySelection,\n\tJoinNullability,\n\tSelectMode,\n\tSelectResult,\n} from '~/query-builders/select.types.ts';\nimport type { ColumnsSelection } from '~/sql/sql.ts';\nimport { 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 { PgEffectPreparedQuery, PgEffectSession } from './session.ts';\n\nexport type PgEffectSelectPrepare<\n\tT extends AnyPgEffectSelect,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgEffectPreparedQuery<\n\tPreparedQueryConfig & {\n\t\texecute: T['_']['result'];\n\t},\n\tTEffectHKT\n>;\n\nexport type PgEffectSelectBuilder<\n\tTSelection extends SelectedFields | undefined,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> = PgSelectBuilder<TSelection, PgEffectSelectHKT<TEffectHKT>>;\n\nexport type PgEffectSelect<\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> = PgEffectSelectBase<\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\ttrue,\n\tnever\n>;\n\nexport interface PgEffectSelectHKT<TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase> extends PgSelectHKTBase {\n\t_type: PgEffectSelectBase<\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\tTEffectHKT\n\t>;\n}\n\nexport interface PgEffectSelectBase<\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\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\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends Effect.Effect<TResult, TEffectHKT['error'], TEffectHKT['context']> {\n}\n\nexport class PgEffectSelectBase<\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\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgSelectBase<\n\tPgEffectSelectHKT<TEffectHKT>,\n\tTTableName,\n\tTSelection,\n\tTSelectMode,\n\tTNullabilityMap,\n\tTDynamic,\n\tTExcludedMethods,\n\tTResult,\n\tTSelectedFields\n> {\n\tstatic override readonly [entityKind]: string = 'PgEffectSelectQueryBuilder';\n\n\tdeclare protected session: PgEffectSession<TEffectHKT, any, any>;\n\n\t/** @internal */\n\t_prepare(name?: string, generateName = false): PgEffectSelectPrepare<this, TEffectHKT> {\n\t\tconst { session, config, dialect, joinsNotNullableMap, cacheConfig, usedTables } = this;\n\t\tconst { fields } = config;\n\n\t\tconst query = dialect.sqlToQuery(this.getSQL());\n\t\tconst fieldsList = orderSelectedFields<PgColumn>(\n\t\t\tfields,\n\t\t\tundefined,\n\t\t\tthis.dialect.codecs,\n\t\t);\n\n\t\tconst mapper = this.dialect.mapperGenerators.rows(fieldsList, joinsNotNullableMap);\n\n\t\tconst preparedQuery = session.prepareQuery<PreparedQueryConfig & { execute: any }>(\n\t\t\tquery,\n\t\t\t'arrays',\n\t\t\tname ?? generateName,\n\t\t\tmapper,\n\t\t\t{ type: 'select', tables: [...usedTables] },\n\t\t\tcacheConfig,\n\t\t);\n\n\t\treturn preparedQuery;\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(name?: string): PgEffectSelectPrepare<this, TEffectHKT> {\n\t\treturn this._prepare(name, true);\n\t}\n\n\texecute: ReturnType<this['prepare']>['execute'] = (placeholderValues?: Record<string, unknown>) => {\n\t\treturn this._prepare().execute(placeholderValues);\n\t};\n}\n\napplyEffectWrapper(PgEffectSelectBase);\n\nexport type AnyPgEffectSelect = PgEffectSelectBase<any, any, any, any, any, any, any, any, any>;\n"],"mappings":";;;;;;AAgFA,IAAa,qBAAb,cAcU,aAUR;CACD,QAA0B,cAAsB;;CAKhD,SAAS,MAAe,eAAe,OAAgD;EACtF,MAAM,EAAE,SAAS,QAAQ,SAAS,qBAAqB,aAAa,eAAe;EACnF,MAAM,EAAE,WAAW;EAEnB,MAAM,QAAQ,QAAQ,WAAW,KAAK,QAAQ,CAAC;EAC/C,MAAM,aAAa,oBAClB,QACA,QACA,KAAK,QAAQ,OACb;EAED,MAAM,SAAS,KAAK,QAAQ,iBAAiB,KAAK,YAAY,oBAAoB;AAWlF,SATsB,QAAQ,aAC7B,OACA,UACA,QAAQ,cACR,QACA;GAAE,MAAM;GAAU,QAAQ,CAAC,GAAG,WAAW;GAAE,EAC3C,YACA;;;;;;;;;CAYF,QAAQ,MAAwD;AAC/D,SAAO,KAAK,SAAS,MAAM,KAAK;;CAGjC,WAAmD,sBAAgD;AAClG,SAAO,KAAK,UAAU,CAAC,QAAQ,kBAAkB;;;AAInD,mBAAmB,mBAAmB"}

package/pg-core/effect/session.cjs

@@ -9,26 +9,43 @@ let __migrator_utils_ts = require("../../migrator.utils.cjs");
 let effect_Effect = require("effect/Effect");
 effect_Effect = require_runtime.__toESM(effect_Effect);
 let __cache_core_cache_effect_ts = require("../../cache/core/cache-effect.cjs");
-let __effect_core_errors_ts = require("../../effect-core/errors.cjs");
 let __cache_core_cache_ts = require("../../cache/core/cache.cjs");
 let effect_Cause = require("effect/Cause");
 effect_Cause = require_runtime.__toESM(effect_Cause);
+let __effect_core_errors_ts = require("../../effect-core/errors.cjs");
+let __effect_core_logger_ts = require("../../effect-core/logger.cjs");
 let __up_migrations_effect_pg_ts = require("../../up-migrations/effect-pg.cjs");
 
 //#region src/pg-core/effect/session.ts
 var PgEffectPreparedQuery = class extends require_pg_core_session.PgBasePreparedQuery {
 	static [__entity_ts.entityKind] = "PgEffectPreparedQuery";
-	constructor(query, cache, queryMetadata, cacheConfig) {
+	/** @internal */
+	mapper;
+	constructor(executor, query, mapper, mode, logger, 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 effect_Effect.gen(this, function* () {
+			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+			const { query: { sql }, mapper } = this;
+			yield* __effect_core_logger_ts.EffectLogger.logQuery(sql, params);
+			const query = this.queryWithCache(sql, params, effect_Effect.suspend(() => this.executor(params)));
+			if (!mapper) return yield* query;
+			return yield* query.pipe(effect_Effect.andThen((rows) => mapper(rows)));
+		}).pipe(effect_Effect.provideService(__effect_core_logger_ts.EffectLogger, this.logger));
+	}
 	queryWithCache(queryString, params, query) {
 		return effect_Effect.gen(this, function* () {
 			const { cacheConfig, queryMetadata } = this;
@@ -64,26 +81,20 @@ var PgEffectSession = class extends require_pg_core_session.PgSession {
 		super(dialect);
 	}
 	execute(query) {
-		const { sql, params } = this.dialect.sqlToQuery(query);
-		return this.prepareQuery({
-			sql,
-			params
-		}, void 0, void 0, false).execute();
+		return this.prepareQuery(this.dialect.sqlToQuery(query), "raw", false).execute();
+	}
+	arrays(query) {
+		return this.prepareQuery(this.dialect.sqlToQuery(query), "arrays", false).execute();
 	}
-	all(query) {
-		const { sql, params } = this.dialect.sqlToQuery(query);
-		return this.prepareQuery({
-			sql,
-			params
-		}, void 0, void 0, false).all();
+	objects(query) {
+		return this.prepareQuery(this.dialect.sqlToQuery(query), "objects", false).execute();
 	}
 };
 var PgEffectTransaction = class extends require_pg_core_effect_db.PgEffectDatabase {
 	static [__entity_ts.entityKind] = "PgEffectTransaction";
-	constructor(dialect, session, relations, schema, nestedIndex = 0, parseRqbJson) {
-		super(dialect, session, relations, schema, parseRqbJson);
+	constructor(dialect, session, relations, nestedIndex = 0, parseRqbJson) {
+		super(dialect, session, relations, parseRqbJson);
 		this.relations = relations;
-		this.schema = schema;
 		this.nestedIndex = nestedIndex;
 	}
 	rollback() {
@@ -118,7 +129,7 @@ const migrate = effect_Effect.fn("migrate")(function* (migrations, session, conf
 		`;
 		yield* session.execute(migrationTableCreate);
 	}
-	const dbMigrations = yield* 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)}`);
+	const dbMigrations = yield* 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)}`);
 	if (typeof config === "object" && config.init) {
 		if (dbMigrations.length) return yield* new __effect_core_errors_ts.MigratorInitError({ exitCode: "databaseMigrations" });
 		if (migrations.length > 1) return yield* new __effect_core_errors_ts.MigratorInitError({ exitCode: "localMigrations" });

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

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["PgBasePreparedQuery","entityKind","Effect","EffectCache","NoopCache","EffectDrizzleQueryError","Cause","PgSession","PgEffectDatabase","EffectTransactionRollbackError","sql","MigratorInitError"],"sources":["../../../src/pg-core/effect/session.ts"],"sourcesContent":["import type { SqlError } from '@effect/sql/SqlError';\nimport * as Cause from 'effect/Cause';\nimport * as Effect from 'effect/Effect';\nimport type * as V1 from '~/_relations.ts';\nimport { EffectCache } from '~/cache/core/cache-effect.ts';\nimport { NoopCache, strategyFor } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { MigratorInitError } from '~/effect-core/errors.ts';\nimport { EffectDrizzleQueryError, EffectTransactionRollbackError } from '~/effect-core/errors.ts';\nimport type { QueryEffectHKTBase, QueryEffectKind } from '~/effect-core/query-effect.ts';\nimport { entityKind, is } from '~/entity.ts';\nimport type { MigrationConfig, MigrationMeta } 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 { upgradeIfNeeded } from '~/up-migrations/effect-pg.ts';\nimport { assertUnreachable } from '~/utils.ts';\nimport type { PgDialect } from '../dialect.ts';\nimport type { SelectedFieldsOrdered } from '../query-builders/select.types.ts';\nimport {\n\tPgBasePreparedQuery,\n\ttype PgQueryResultHKT,\n\tPgSession,\n\ttype PgTransactionConfig,\n\ttype PreparedQueryConfig,\n} from '../session.ts';\nimport { PgEffectDatabase } from './db.ts';\n\nexport abstract class PgEffectPreparedQuery<\n\tT extends PreparedQueryConfig,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgBasePreparedQuery {\n\tstatic override readonly [entityKind]: string = 'PgEffectPreparedQuery';\n\n\tconstructor(\n\t\tquery: Query,\n\t\tprivate cache: EffectCache,\n\t\tprivate queryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\tprivate cacheConfig?: WithCacheConfig,\n\t) {\n\t\tsuper(query);\n\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\tprotected override queryWithCache<A, E, R>(\n\t\tqueryString: string,\n\t\tparams: any[],\n\t\tquery: Effect.Effect<A, E, R>,\n\t) {\n\t\treturn Effect.gen(this, function*() {\n\t\t\tconst { cacheConfig, queryMetadata } = this;\n\t\t\tconst cache = yield* EffectCache;\n\n\t\t\tconst cacheStrat: Awaited<ReturnType<typeof strategyFor>> = cache && !is(cache.cache, NoopCache)\n\t\t\t\t? yield* Effect.tryPromise(\n\t\t\t\t\t() => strategyFor(queryString, params, queryMetadata, cacheConfig),\n\t\t\t\t)\n\t\t\t\t: { type: 'skip' as const };\n\n\t\t\tif (cacheStrat.type === 'skip') {\n\t\t\t\treturn yield* query;\n\t\t\t}\n\n\t\t\t// For mutate queries, we should query the database, wait for a response, and then perform invalidation\n\t\t\tif (cacheStrat.type === 'invalidate') {\n\t\t\t\tconst result = yield* query;\n\t\t\t\tyield* cache!.onMutate({ tables: cacheStrat.tables });\n\n\t\t\t\treturn result;\n\t\t\t}\n\n\t\t\tif (cacheStrat.type === 'try') {\n\t\t\t\tconst { tables, key, isTag, autoInvalidate, config } = cacheStrat;\n\t\t\t\tconst fromCache: any[] | undefined = yield* cache!.get(\n\t\t\t\t\tkey,\n\t\t\t\t\ttables,\n\t\t\t\t\tisTag,\n\t\t\t\t\tautoInvalidate,\n\t\t\t\t);\n\n\t\t\t\tif (typeof fromCache !== 'undefined') return fromCache as unknown as A;\n\n\t\t\t\tconst result = yield* query;\n\n\t\t\t\tyield* cache!.put(\n\t\t\t\t\tkey,\n\t\t\t\t\tresult,\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\n\t\t\t\treturn result;\n\t\t\t}\n\n\t\t\tassertUnreachable(cacheStrat);\n\t\t}).pipe(\n\t\t\tEffect.provideService(EffectCache, this.cache),\n\t\t\tEffect.catchAll((e) => {\n\t\t\t\treturn new EffectDrizzleQueryError({ query: queryString, params, cause: Cause.fail(e) });\n\t\t\t}),\n\t\t);\n\t}\n\n\tabstract override execute(\n\t\tplaceholderValues?: Record<string, unknown>,\n\t): QueryEffectKind<TEffectHKT, T['execute']>;\n\n\t/** @internal */\n\tabstract override all(\n\t\tplaceholderValues?: Record<string, unknown>,\n\t): QueryEffectKind<TEffectHKT, T['all']>;\n}\n\nexport abstract class PgEffectSession<\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\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 = 'PgEffectSession';\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): PgEffectPreparedQuery<T, TEffectHKT>;\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): PgEffectPreparedQuery<T, TEffectHKT>;\n\n\toverride execute<T>(query: SQL) {\n\t\tconst { sql, params } = this.dialect.sqlToQuery(query);\n\t\treturn this.prepareQuery<PreparedQueryConfig & { execute: T }>({ sql, params }, undefined, undefined, false)\n\t\t\t.execute();\n\t}\n\n\toverride all<T>(query: SQL) {\n\t\tconst { sql, params } = this.dialect.sqlToQuery(query);\n\t\treturn this.prepareQuery<PreparedQueryConfig & { all: T[] }>({ sql, params }, undefined, undefined, false)\n\t\t\t.all();\n\t}\n\n\tabstract transaction<A, E, R>(\n\t\ttransaction: (\n\t\t\ttx: PgEffectTransaction<TEffectHKT, TQueryResult, TFullSchema, TRelations, TSchema>,\n\t\t) => Effect.Effect<A, E, R>,\n\t): Effect.Effect<A, E | SqlError, R>;\n}\n\nexport abstract class PgEffectTransaction<\n\tTEffectHKT extends QueryEffectHKTBase,\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 PgEffectDatabase<TEffectHKT, TQueryResult, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PgEffectTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\tsession: PgEffectSession<TEffectHKT, 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() {\n\t\treturn new EffectTransactionRollbackError();\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) {\n\t\treturn this.session.execute<void>(sql`set transaction ${this.getTransactionConfigSQL(config)}`);\n\t}\n}\n\nexport const migrate = Effect.fn('migrate')(function*<TEffectHKT extends QueryEffectHKTBase>(\n\tmigrations: MigrationMeta[],\n\tsession: PgEffectSession<TEffectHKT>,\n\tconfig: string | MigrationConfig,\n) {\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\tyield* session.execute(sql`CREATE SCHEMA IF NOT EXISTS ${sql.identifier(migrationsSchema)}`);\n\n\tconst { newDb } = yield* upgradeIfNeeded(migrationsSchema, migrationsTable, session, migrations);\n\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\n\t\tyield* session.execute(migrationTableCreate);\n\t}\n\n\tconst dbMigrations = yield* session.all<{ id: number; hash: string; created_at: string; name: string | null }>(\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 yield* new MigratorInitError({ exitCode: 'databaseMigrations' });\n\t\t}\n\n\t\tif (migrations.length > 1) {\n\t\t\treturn yield* new MigratorInitError({ exitCode: 'localMigrations' });\n\t\t}\n\n\t\tconst [migration] = migrations;\n\n\t\tif (!migration) return;\n\n\t\tyield* session.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})`,\n\t\t);\n\n\t\treturn;\n\t}\n\n\tconst migrationsToRun = getMigrationsToRun({ localMigrations: migrations, dbMigrations });\n\n\tyield* session.transaction((tx) =>\n\t\tEffect.gen(function*() {\n\t\t\tfor (const migration of migrationsToRun) {\n\t\t\t\tfor (const stmt of migration.sql) {\n\t\t\t\t\tyield* tx.execute(sql.raw(stmt));\n\t\t\t\t}\n\t\t\t\tyield* tx.execute(\n\t\t\t\t\tsql`insert into ${sql.identifier(migrationsSchema)}.${\n\t\t\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t\t\t} (\"hash\", \"created_at\", \"name\") values(${migration.hash}, ${migration.folderMillis}, ${migration.name})`,\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","Effect","EffectLogger","EffectCache","NoopCache","EffectDrizzleQueryError","Cause","PgSession","PgEffectDatabase","EffectTransactionRollbackError","sql","MigratorInitError"],"sources":["../../../src/pg-core/effect/session.ts"],"sourcesContent":["import type { SqlError } from '@effect/sql/SqlError';\nimport * as Cause from 'effect/Cause';\nimport * as Effect from 'effect/Effect';\nimport { EffectCache } from '~/cache/core/cache-effect.ts';\nimport { NoopCache, strategyFor } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { MigratorInitError } from '~/effect-core/errors.ts';\nimport { EffectDrizzleQueryError, EffectTransactionRollbackError } from '~/effect-core/errors.ts';\nimport { EffectLogger } from '~/effect-core/logger.ts';\nimport type { QueryEffectHKTBase, QueryEffectKind } from '~/effect-core/query-effect.ts';\nimport { entityKind, is } from '~/entity.ts';\nimport type { MigrationConfig, MigrationMeta } 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 { upgradeIfNeeded } from '~/up-migrations/effect-pg.ts';\nimport { assertUnreachable } from '~/utils.ts';\nimport type { PgDialect } from '../dialect.ts';\nimport {\n\tPgBasePreparedQuery,\n\ttype PgQueryResultHKT,\n\tPgSession,\n\ttype PgTransactionConfig,\n\ttype PreparedQueryConfig,\n} from '../session.ts';\nimport { PgEffectDatabase } from './db.ts';\n\nexport class PgEffectPreparedQuery<\n\tT extends PreparedQueryConfig,\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n> extends PgBasePreparedQuery {\n\tstatic override readonly [entityKind]: string = 'PgEffectPreparedQuery';\n\n\t/** @internal */\n\treadonly mapper: ((rows: any[]) => any) | undefined;\n\n\tconstructor(\n\t\tprotected executor: (params?: unknown[]) => Effect.Effect<unknown, unknown, unknown>,\n\t\tquery: Query,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\treadonly mode: 'arrays' | 'objects' | 'raw',\n\t\tprivate logger: EffectLogger,\n\t\t// cache instance\n\t\tprotected cache: EffectCache,\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> = {}): QueryEffectKind<TEffectHKT, T['execute']> {\n\t\treturn Effect.gen(this, function*() {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tconst { query: { sql }, mapper } = this;\n\n\t\t\tyield* EffectLogger.logQuery(sql, params);\n\n\t\t\tconst query = this.queryWithCache(sql, params, Effect.suspend(() => this.executor(params)));\n\n\t\t\tif (!mapper) return yield* query;\n\n\t\t\treturn yield* query.pipe(Effect.andThen((rows) => mapper(rows as unknown[])));\n\t\t}).pipe(Effect.provideService(EffectLogger, this.logger));\n\t}\n\n\tprotected override queryWithCache<A, E, R>(\n\t\tqueryString: string,\n\t\tparams: any[],\n\t\tquery: Effect.Effect<A, E, R>,\n\t) {\n\t\treturn Effect.gen(this, function*() {\n\t\t\tconst { cacheConfig, queryMetadata } = this;\n\t\t\tconst cache = yield* EffectCache;\n\n\t\t\tconst cacheStrat: Awaited<ReturnType<typeof strategyFor>> = cache && !is(cache.cache, NoopCache)\n\t\t\t\t? yield* Effect.tryPromise(\n\t\t\t\t\t() => strategyFor(queryString, params, queryMetadata, cacheConfig),\n\t\t\t\t)\n\t\t\t\t: { type: 'skip' as const };\n\n\t\t\tif (cacheStrat.type === 'skip') {\n\t\t\t\treturn yield* query;\n\t\t\t}\n\n\t\t\t// For mutate queries, we should query the database, wait for a response, and then perform invalidation\n\t\t\tif (cacheStrat.type === 'invalidate') {\n\t\t\t\tconst result = yield* query;\n\t\t\t\tyield* cache!.onMutate({ tables: cacheStrat.tables });\n\n\t\t\t\treturn result;\n\t\t\t}\n\n\t\t\tif (cacheStrat.type === 'try') {\n\t\t\t\tconst { tables, key, isTag, autoInvalidate, config } = cacheStrat;\n\t\t\t\tconst fromCache: any[] | undefined = yield* cache!.get(\n\t\t\t\t\tkey,\n\t\t\t\t\ttables,\n\t\t\t\t\tisTag,\n\t\t\t\t\tautoInvalidate,\n\t\t\t\t);\n\n\t\t\t\tif (typeof fromCache !== 'undefined') return fromCache as unknown as A;\n\n\t\t\t\tconst result = yield* query;\n\n\t\t\t\tyield* cache!.put(\n\t\t\t\t\tkey,\n\t\t\t\t\tresult,\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\n\t\t\t\treturn result;\n\t\t\t}\n\n\t\t\tassertUnreachable(cacheStrat);\n\t\t}).pipe(\n\t\t\tEffect.provideService(EffectCache, this.cache),\n\t\t\tEffect.catchAll((e) => {\n\t\t\t\treturn new EffectDrizzleQueryError({ query: queryString, params, cause: Cause.fail(e) });\n\t\t\t}),\n\t\t);\n\t}\n}\n\nexport abstract class PgEffectSession<\n\tTEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,\n\tTQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgSession {\n\tstatic override readonly [entityKind]: string = 'PgEffectSession';\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\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): PgEffectPreparedQuery<T, TEffectHKT>;\n\n\toverride execute<T>(query: SQL) {\n\t\tconst prepared = this.prepareQuery<PreparedQueryConfig & { execute: T[] }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\t'raw',\n\t\t\tfalse,\n\t\t);\n\n\t\treturn prepared.execute();\n\t}\n\n\toverride arrays<T>(query: SQL) {\n\t\tconst prepared = this.prepareQuery<PreparedQueryConfig & { execute: T[] }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\t'arrays',\n\t\t\tfalse,\n\t\t);\n\n\t\treturn prepared.execute();\n\t}\n\n\toverride objects<T>(query: SQL) {\n\t\tconst prepared = this.prepareQuery<PreparedQueryConfig & { execute: T[] }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\t'objects',\n\t\t\tfalse,\n\t\t);\n\n\t\treturn prepared.execute();\n\t}\n\n\tabstract transaction<A, E, R>(\n\t\ttransaction: (\n\t\t\ttx: PgEffectTransaction<TEffectHKT, TQueryResult, TRelations>,\n\t\t) => Effect.Effect<A, E, R>,\n\t): Effect.Effect<A, E | SqlError, R>;\n}\n\nexport abstract class PgEffectTransaction<\n\tTEffectHKT extends QueryEffectHKTBase,\n\tTQueryResult extends PgQueryResultHKT,\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgEffectDatabase<TEffectHKT, TQueryResult, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PgEffectTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\tsession: PgEffectSession<TEffectHKT, any, any>,\n\t\tprotected relations: TRelations,\n\t\tprotected readonly nestedIndex = 0,\n\t\tparseRqbJson?: boolean,\n\t) {\n\t\tsuper(dialect, session, relations, parseRqbJson);\n\t}\n\n\trollback() {\n\t\treturn new EffectTransactionRollbackError();\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) {\n\t\treturn this.session.execute<void>(sql`set transaction ${this.getTransactionConfigSQL(config)}`);\n\t}\n}\n\nexport const migrate = Effect.fn('migrate')(function*<TEffectHKT extends QueryEffectHKTBase>(\n\tmigrations: MigrationMeta[],\n\tsession: PgEffectSession<TEffectHKT>,\n\tconfig: string | MigrationConfig,\n) {\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\tyield* session.execute(sql`CREATE SCHEMA IF NOT EXISTS ${sql.identifier(migrationsSchema)}`);\n\n\tconst { newDb } = yield* upgradeIfNeeded(migrationsSchema, migrationsTable, session, migrations);\n\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\n\t\tyield* session.execute(migrationTableCreate);\n\t}\n\n\tconst dbMigrations = yield* session.objects<{ id: number; hash: string; created_at: string; name: string | null }>(\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 yield* new MigratorInitError({ exitCode: 'databaseMigrations' });\n\t\t}\n\n\t\tif (migrations.length > 1) {\n\t\t\treturn yield* new MigratorInitError({ exitCode: 'localMigrations' });\n\t\t}\n\n\t\tconst [migration] = migrations;\n\n\t\tif (!migration) return;\n\n\t\tyield* session.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})`,\n\t\t);\n\n\t\treturn;\n\t}\n\n\tconst migrationsToRun = getMigrationsToRun({ localMigrations: migrations, dbMigrations });\n\n\tyield* session.transaction((tx) =>\n\t\tEffect.gen(function*() {\n\t\t\tfor (const migration of migrationsToRun) {\n\t\t\t\tfor (const stmt of migration.sql) {\n\t\t\t\t\tyield* tx.execute(sql.raw(stmt));\n\t\t\t\t}\n\t\t\t\tyield* tx.execute(\n\t\t\t\t\tsql`insert into ${sql.identifier(migrationsSchema)}.${\n\t\t\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t\t\t} (\"hash\", \"created_at\", \"name\") values(${migration.hash}, ${migration.folderMillis}, ${migration.name})`,\n\t\t\t\t);\n\t\t\t}\n\t\t})\n\t);\n});\n"],"mappings":"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"}