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

package/pg-proxy/session.cjs

@@ -1,9 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 let __entity_ts = require("../entity.cjs");
-let __tracing_ts = require("../tracing.cjs");
-let __utils_ts = require("../utils.cjs");
-let __sql_sql_ts = require("../sql/sql.cjs");
 let __logger_ts = require("../logger.cjs");
 let __pg_core_async_session_ts = require("../pg-core/async/session.cjs");
 let __cache_core_cache_ts = require("../cache/core/cache.cjs");
@@ -13,99 +10,26 @@ var PgRemoteSession = class extends __pg_core_async_session_ts.PgAsyncSession {
 	static [__entity_ts.entityKind] = "PgRemoteSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, schema, options = {}) {
+	constructor(client, dialect, relations, options = {}) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
-		this.schema = schema;
+		this.options = options;
 		this.logger = options.logger ?? new __logger_ts.NoopLogger();
 		this.cache = options.cache ?? new __cache_core_cache_ts.NoopCache();
 	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new PreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new PreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, false, customResultMapper, true);
+	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
+		const executor = async (params) => {
+			if (mode === "arrays") return this.client(query.sql, params, "all", query.typings).then((r) => r.rows);
+			return this.client(query.sql, params, "execute", query.typings).then((r) => r.rows);
+		};
+		return new __pg_core_async_session_ts.PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
 	}
 	async transaction(_transaction, _config) {
 		throw new Error("Transactions are not supported by the Postgres Proxy driver");
 	}
 };
-var PgProxyTransaction = class extends __pg_core_async_session_ts.PgAsyncTransaction {
-	static [__entity_ts.entityKind] = "PgProxyTransaction";
-	async transaction(_transaction) {
-		throw new Error("Transactions are not supported by the Postgres Proxy driver");
-	}
-};
-var PreparedQuery = class extends __pg_core_async_session_ts.PgAsyncPreparedQuery {
-	static [__entity_ts.entityKind] = "PgProxyPreparedQuery";
-	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
-		super(query, cache, queryMetadata, cacheConfig);
-		this.client = client;
-		this.logger = logger;
-		this.fields = fields;
-		this._isResponseInArrayMode = _isResponseInArrayMode;
-		this.customResultMapper = customResultMapper;
-		this.isRqbV2Query = isRqbV2Query;
-	}
-	async execute(placeholderValues = {}) {
-		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
-		return __tracing_ts.tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-			const { fields, client, query, joinsNotNullableMap, customResultMapper, logger } = this;
-			span?.setAttributes({
-				"drizzle.query.text": query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			logger.logQuery(query.sql, params);
-			if (!fields && !customResultMapper) return __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				const { rows } = await this.queryWithCache(query.sql, params, async () => {
-					return await client(query.sql, params, "execute", query.typings);
-				});
-				return rows;
-			});
-			const rows = await __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				span?.setAttributes({
-					"drizzle.query.text": query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				const { rows } = await this.queryWithCache(query.sql, params, async () => {
-					return await client(query.sql, params, "all", query.typings);
-				});
-				return rows;
-			});
-			return __tracing_ts.tracer.startActiveSpan("drizzle.mapResponse", () => {
-				return customResultMapper ? customResultMapper(rows) : rows.map((row) => (0, __utils_ts.mapResultRow)(fields, row, joinsNotNullableMap));
-			});
-		});
-	}
-	async executeRqbV2(placeholderValues = {}) {
-		return __tracing_ts.tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-			const { client, query, customResultMapper, logger } = this;
-			span?.setAttributes({
-				"drizzle.query.text": query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			logger.logQuery(query.sql, params);
-			const rows = await __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				const { rows } = await client(query.sql, params, "execute", query.typings);
-				return rows;
-			});
-			return __tracing_ts.tracer.startActiveSpan("drizzle.mapResponse", () => {
-				return customResultMapper(rows);
-			});
-		});
-	}
-	async all() {}
-	/** @internal */
-	isResponseInArrayMode() {
-		return this._isResponseInArrayMode;
-	}
-};
 
 //#endregion
-exports.PgProxyTransaction = PgProxyTransaction;
 exports.PgRemoteSession = PgRemoteSession;
-exports.PreparedQuery = PreparedQuery;
 //# sourceMappingURL=session.cjs.map

package/pg-proxy/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["PgAsyncSession","entityKind","NoopLogger","NoopCache","PgAsyncTransaction","PgAsyncPreparedQuery","tracer"],"sources":["../../src/pg-proxy/session.ts"],"sourcesContent":["import type * as V1 from '~/_relations.ts';\nimport { type Cache, NoopCache } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { SelectedFieldsOrdered } from '~/pg-core/query-builders/select.types.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { fillPlaceholders, type QueryWithTypings } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\nimport type { RemoteCallback } from './driver.ts';\n\nexport interface PgRemoteSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class PgRemoteSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PgRemoteSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\toptions: PgRemoteSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PreparedQuery<T> {\n\t\treturn new PreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t\tfields,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper?: (rows: Record<string, unknown>[]) => T['execute'],\n\t): PreparedQuery<T, true> {\n\t\treturn new PreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfields,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\t_config?: PgTransactionConfig,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the Postgres Proxy driver');\n\t}\n}\n\nexport class PgProxyTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PgProxyTransaction';\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the Postgres Proxy driver');\n\t}\n}\n\nexport class PreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends PgAsyncPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'PgProxyPreparedQuery';\n\n\tdeclare protected query: QueryWithTypings;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tquery: QueryWithTypings,\n\t\tprivate logger: Logger,\n\t\tcache: Cache,\n\t\tqueryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\tcacheConfig: WithCacheConfig | undefined,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => T['execute'],\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t) {\n\t\tsuper(query, cache, queryMetadata, cacheConfig);\n\t}\n\n\tasync execute(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);\n\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tconst { fields, client, query, joinsNotNullableMap, customResultMapper, logger } = this;\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tlogger.logQuery(query.sql, params);\n\n\t\t\tif (!fields && !customResultMapper) {\n\t\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\t\tconst { rows } = await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\t\treturn await client(query.sql, params as any[], 'execute', query.typings);\n\t\t\t\t\t});\n\n\t\t\t\t\treturn rows;\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tconst rows = await tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\n\t\t\t\tconst { rows } = await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\treturn await client(query.sql, params as any[], 'all', query.typings);\n\t\t\t\t});\n\n\t\t\t\treturn rows;\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn customResultMapper\n\t\t\t\t\t? customResultMapper(rows)\n\t\t\t\t\t: rows.map((row) => mapResultRow<T['execute']>(fields!, row, joinsNotNullableMap));\n\t\t\t});\n\t\t});\n\t}\n\n\tprivate async executeRqbV2(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tconst { client, query, customResultMapper, logger } = this;\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tlogger.logQuery(query.sql, params);\n\n\t\t\tconst rows = await tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\tconst { rows } = await client(query.sql, params as any[], 'execute', query.typings);\n\n\t\t\t\treturn rows;\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(rows);\n\t\t\t});\n\t\t});\n\t}\n\n\tasync all() {\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport interface PgRemoteQueryResultHKT extends PgQueryResultHKT {\n\ttype: Assume<this['row'], {\n\t\t[column: string]: any;\n\t}>[];\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.cjs","names":["PgAsyncSession","entityKind","NoopLogger","NoopCache","PgAsyncPreparedQuery"],"sources":["../../src/pg-proxy/session.ts"],"sourcesContent":["import { type Cache, NoopCache } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, type PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { QueryWithTypings } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\nimport type { RemoteCallback } from './driver.ts';\n\nexport interface PgRemoteSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class PgRemoteSession<\n\tTRelations extends AnyRelations,\n> extends PgAsyncSession<PgRemoteQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PgRemoteSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate options: PgRemoteSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\t_name: string | boolean,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t) {\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\tif (mode === 'arrays') return this.client(query.sql, params as any[], 'all', query.typings).then((r) => r.rows);\n\n\t\t\treturn this.client(query.sql, params as any[], 'execute', query.typings).then((r) => r.rows);\n\t\t};\n\n\t\treturn new PgAsyncPreparedQuery<T>(\n\t\t\texecutor,\n\t\t\tquery,\n\t\t\tmapper,\n\t\t\tmode,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t);\n\t}\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: PgAsyncTransaction<PgRemoteQueryResultHKT, TRelations>) => Promise<T>,\n\t\t_config?: PgTransactionConfig,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the Postgres Proxy driver');\n\t}\n}\n\nexport interface PgRemoteQueryResultHKT extends PgQueryResultHKT {\n\ttype: Assume<this['row'], {\n\t\t[column: string]: any;\n\t}>[];\n}\n"],"mappings":";;;;;;;;AAmBA,IAAa,kBAAb,cAEUA,0CAAmD;CAC5D,QAA0BC,0BAAsB;CAEhD,AAAQ;CACR,AAAQ;CAER,YACC,AAAQ,QACR,SACA,AAAQ,WACR,AAAQ,UAAkC,EAAE,EAC3C;AACD,QAAM,QAAQ;EALN;EAEA;EACA;AAGR,OAAK,SAAS,QAAQ,UAAU,IAAIC,wBAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAIC,iCAAW;;CAG9C,aACC,OACA,MACA,OACA,QACA,eAIA,aACC;EACD,MAAM,WAAW,OAAO,WAAuB;AAC9C,OAAI,SAAS,SAAU,QAAO,KAAK,OAAO,MAAM,KAAK,QAAiB,OAAO,MAAM,QAAQ,CAAC,MAAM,MAAM,EAAE,KAAK;AAE/G,UAAO,KAAK,OAAO,MAAM,KAAK,QAAiB,WAAW,MAAM,QAAQ,CAAC,MAAM,MAAM,EAAE,KAAK;;AAG7F,SAAO,IAAIC,gDACV,UACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAGF,MAAe,YACd,cACA,SACa;AACb,QAAM,IAAI,MAAM,8DAA8D"}

package/pg-proxy/session.d.cts

@@ -2,56 +2,33 @@ import { RemoteCallback } from "./driver.cjs";
 import { entityKind } from "../entity.cjs";
 import { QueryWithTypings } from "../sql/sql.cjs";
 import { Assume } from "../utils.cjs";
-import * as V1 from "../_relations.cjs";
 import { Cache } from "../cache/core/cache.cjs";
 import { WithCacheConfig } from "../cache/core/types.cjs";
 import { AnyRelations } from "../relations.cjs";
 import { PgDialect } from "../pg-core/dialect.cjs";
 import { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from "../pg-core/session.cjs";
-import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.cjs";
-import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.cjs";
 import { Logger } from "../logger.cjs";
+import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.cjs";
 
 //#region src/pg-proxy/session.d.ts
 interface PgRemoteSessionOptions {
   logger?: Logger;
   cache?: Cache;
+  useJitMapper?: boolean;
 }
-declare class PgRemoteSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class PgRemoteSession<TRelations extends AnyRelations> extends PgAsyncSession<PgRemoteQueryResultHKT, TRelations> {
   private client;
   private relations;
-  private schema;
+  private options;
   static readonly [entityKind]: string;
   private logger;
   private cache;
-  constructor(client: RemoteCallback, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: PgRemoteSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig>(query: QueryWithTypings, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
-    type: 'select' | 'update' | 'delete' | 'insert';
-    tables: string[];
-  }, cacheConfig?: WithCacheConfig): PreparedQuery<T>;
-  prepareRelationalQuery<T extends PreparedQueryConfig>(query: QueryWithTypings, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): PreparedQuery<T, true>;
-  transaction<T>(_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
-}
-declare class PgProxyTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {
-  static readonly [entityKind]: string;
-  transaction<T>(_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
-}
-declare class PreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
-  private client;
-  private logger;
-  private fields;
-  private _isResponseInArrayMode;
-  private customResultMapper?;
-  private isRqbV2Query?;
-  static readonly [entityKind]: string;
-  protected query: QueryWithTypings;
-  constructor(client: RemoteCallback, query: QueryWithTypings, logger: Logger, cache: Cache, queryMetadata: {
+  constructor(client: RemoteCallback, dialect: PgDialect, relations: TRelations, options?: PgRemoteSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: QueryWithTypings, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
-  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
-  execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
-  private executeRqbV2;
-  all(): Promise<void>;
+  }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
+  transaction<T>(_transaction: (tx: PgAsyncTransaction<PgRemoteQueryResultHKT, TRelations>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
 }
 interface PgRemoteQueryResultHKT extends PgQueryResultHKT {
   type: Assume<this['row'], {
@@ -59,5 +36,5 @@ interface PgRemoteQueryResultHKT extends PgQueryResultHKT {
   }>[];
 }
 //#endregion
-export { PgProxyTransaction, PgRemoteQueryResultHKT, PgRemoteSession, PgRemoteSessionOptions, PreparedQuery };
+export { PgRemoteQueryResultHKT, PgRemoteSession, PgRemoteSessionOptions };
 //# sourceMappingURL=session.d.cts.map

package/pg-proxy/session.d.ts

@@ -2,56 +2,33 @@ import { RemoteCallback } from "./driver.js";
 import { entityKind } from "../entity.js";
 import { Assume } from "../utils.js";
 import { QueryWithTypings } from "../sql/sql.js";
-import * as V1 from "../_relations.js";
 import { Logger } from "../logger.js";
-import { PgDialect } from "../pg-core/dialect.js";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
-import { Cache } from "../cache/core/cache.js";
 import { AnyRelations } from "../relations.js";
+import { PgDialect } from "../pg-core/dialect.js";
+import { Cache } from "../cache/core/cache.js";
 import { WithCacheConfig } from "../cache/core/types.js";
 import { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from "../pg-core/session.js";
-import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.js";
 
 //#region src/pg-proxy/session.d.ts
 interface PgRemoteSessionOptions {
   logger?: Logger;
   cache?: Cache;
+  useJitMapper?: boolean;
 }
-declare class PgRemoteSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class PgRemoteSession<TRelations extends AnyRelations> extends PgAsyncSession<PgRemoteQueryResultHKT, TRelations> {
   private client;
   private relations;
-  private schema;
+  private options;
   static readonly [entityKind]: string;
   private logger;
   private cache;
-  constructor(client: RemoteCallback, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: PgRemoteSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig>(query: QueryWithTypings, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
-    type: 'select' | 'update' | 'delete' | 'insert';
-    tables: string[];
-  }, cacheConfig?: WithCacheConfig): PreparedQuery<T>;
-  prepareRelationalQuery<T extends PreparedQueryConfig>(query: QueryWithTypings, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): PreparedQuery<T, true>;
-  transaction<T>(_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
-}
-declare class PgProxyTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {
-  static readonly [entityKind]: string;
-  transaction<T>(_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
-}
-declare class PreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
-  private client;
-  private logger;
-  private fields;
-  private _isResponseInArrayMode;
-  private customResultMapper?;
-  private isRqbV2Query?;
-  static readonly [entityKind]: string;
-  protected query: QueryWithTypings;
-  constructor(client: RemoteCallback, query: QueryWithTypings, logger: Logger, cache: Cache, queryMetadata: {
+  constructor(client: RemoteCallback, dialect: PgDialect, relations: TRelations, options?: PgRemoteSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: QueryWithTypings, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
-  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
-  execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
-  private executeRqbV2;
-  all(): Promise<void>;
+  }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
+  transaction<T>(_transaction: (tx: PgAsyncTransaction<PgRemoteQueryResultHKT, TRelations>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
 }
 interface PgRemoteQueryResultHKT extends PgQueryResultHKT {
   type: Assume<this['row'], {
@@ -59,5 +36,5 @@ interface PgRemoteQueryResultHKT extends PgQueryResultHKT {
   }>[];
 }
 //#endregion
-export { PgProxyTransaction, PgRemoteQueryResultHKT, PgRemoteSession, PgRemoteSessionOptions, PreparedQuery };
+export { PgRemoteQueryResultHKT, PgRemoteSession, PgRemoteSessionOptions };
 //# sourceMappingURL=session.d.ts.map

package/pg-proxy/session.js

@@ -1,9 +1,6 @@
 import { entityKind } from "../entity.js";
-import { tracer } from "../tracing.js";
-import { mapResultRow } from "../utils.js";
-import { fillPlaceholders } from "../sql/sql.js";
 import { NoopLogger } from "../logger.js";
-import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
+import { PgAsyncPreparedQuery, PgAsyncSession } from "../pg-core/async/session.js";
 import { NoopCache } from "../cache/core/cache.js";
 
 //#region src/pg-proxy/session.ts
@@ -11,97 +8,26 @@ var PgRemoteSession = class extends PgAsyncSession {
 	static [entityKind] = "PgRemoteSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, schema, options = {}) {
+	constructor(client, dialect, relations, options = {}) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
-		this.schema = schema;
+		this.options = options;
 		this.logger = options.logger ?? new NoopLogger();
 		this.cache = options.cache ?? new NoopCache();
 	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new PreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new PreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, false, customResultMapper, true);
+	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
+		const executor = async (params) => {
+			if (mode === "arrays") return this.client(query.sql, params, "all", query.typings).then((r) => r.rows);
+			return this.client(query.sql, params, "execute", query.typings).then((r) => r.rows);
+		};
+		return new PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
 	}
 	async transaction(_transaction, _config) {
 		throw new Error("Transactions are not supported by the Postgres Proxy driver");
 	}
 };
-var PgProxyTransaction = class extends PgAsyncTransaction {
-	static [entityKind] = "PgProxyTransaction";
-	async transaction(_transaction) {
-		throw new Error("Transactions are not supported by the Postgres Proxy driver");
-	}
-};
-var PreparedQuery = class extends PgAsyncPreparedQuery {
-	static [entityKind] = "PgProxyPreparedQuery";
-	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
-		super(query, cache, queryMetadata, cacheConfig);
-		this.client = client;
-		this.logger = logger;
-		this.fields = fields;
-		this._isResponseInArrayMode = _isResponseInArrayMode;
-		this.customResultMapper = customResultMapper;
-		this.isRqbV2Query = isRqbV2Query;
-	}
-	async execute(placeholderValues = {}) {
-		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
-		return tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = fillPlaceholders(this.query.params, placeholderValues);
-			const { fields, client, query, joinsNotNullableMap, customResultMapper, logger } = this;
-			span?.setAttributes({
-				"drizzle.query.text": query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			logger.logQuery(query.sql, params);
-			if (!fields && !customResultMapper) return tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				const { rows } = await this.queryWithCache(query.sql, params, async () => {
-					return await client(query.sql, params, "execute", query.typings);
-				});
-				return rows;
-			});
-			const rows = await tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				span?.setAttributes({
-					"drizzle.query.text": query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				const { rows } = await this.queryWithCache(query.sql, params, async () => {
-					return await client(query.sql, params, "all", query.typings);
-				});
-				return rows;
-			});
-			return tracer.startActiveSpan("drizzle.mapResponse", () => {
-				return customResultMapper ? customResultMapper(rows) : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
-			});
-		});
-	}
-	async executeRqbV2(placeholderValues = {}) {
-		return tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = fillPlaceholders(this.query.params, placeholderValues);
-			const { client, query, customResultMapper, logger } = this;
-			span?.setAttributes({
-				"drizzle.query.text": query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			logger.logQuery(query.sql, params);
-			const rows = await tracer.startActiveSpan("drizzle.driver.execute", async () => {
-				const { rows } = await client(query.sql, params, "execute", query.typings);
-				return rows;
-			});
-			return tracer.startActiveSpan("drizzle.mapResponse", () => {
-				return customResultMapper(rows);
-			});
-		});
-	}
-	async all() {}
-	/** @internal */
-	isResponseInArrayMode() {
-		return this._isResponseInArrayMode;
-	}
-};
 
 //#endregion
-export { PgProxyTransaction, PgRemoteSession, PreparedQuery };
+export { PgRemoteSession };
 //# sourceMappingURL=session.js.map

package/pg-proxy/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":[],"sources":["../../src/pg-proxy/session.ts"],"sourcesContent":["import type * as V1 from '~/_relations.ts';\nimport { type Cache, NoopCache } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { SelectedFieldsOrdered } from '~/pg-core/query-builders/select.types.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { fillPlaceholders, type QueryWithTypings } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\nimport type { RemoteCallback } from './driver.ts';\n\nexport interface PgRemoteSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class PgRemoteSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PgRemoteSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\toptions: PgRemoteSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PreparedQuery<T> {\n\t\treturn new PreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t\tfields,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper?: (rows: Record<string, unknown>[]) => T['execute'],\n\t): PreparedQuery<T, true> {\n\t\treturn new PreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfields,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\t_config?: PgTransactionConfig,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the Postgres Proxy driver');\n\t}\n}\n\nexport class PgProxyTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PgProxyTransaction';\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the Postgres Proxy driver');\n\t}\n}\n\nexport class PreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends PgAsyncPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'PgProxyPreparedQuery';\n\n\tdeclare protected query: QueryWithTypings;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tquery: QueryWithTypings,\n\t\tprivate logger: Logger,\n\t\tcache: Cache,\n\t\tqueryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\tcacheConfig: WithCacheConfig | undefined,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => T['execute'],\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t) {\n\t\tsuper(query, cache, queryMetadata, cacheConfig);\n\t}\n\n\tasync execute(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);\n\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tconst { fields, client, query, joinsNotNullableMap, customResultMapper, logger } = this;\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tlogger.logQuery(query.sql, params);\n\n\t\t\tif (!fields && !customResultMapper) {\n\t\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\t\tconst { rows } = await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\t\treturn await client(query.sql, params as any[], 'execute', query.typings);\n\t\t\t\t\t});\n\n\t\t\t\t\treturn rows;\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tconst rows = await tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\n\t\t\t\tconst { rows } = await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\treturn await client(query.sql, params as any[], 'all', query.typings);\n\t\t\t\t});\n\n\t\t\t\treturn rows;\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn customResultMapper\n\t\t\t\t\t? customResultMapper(rows)\n\t\t\t\t\t: rows.map((row) => mapResultRow<T['execute']>(fields!, row, joinsNotNullableMap));\n\t\t\t});\n\t\t});\n\t}\n\n\tprivate async executeRqbV2(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tconst { client, query, customResultMapper, logger } = this;\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tlogger.logQuery(query.sql, params);\n\n\t\t\tconst rows = await tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\tconst { rows } = await client(query.sql, params as any[], 'execute', query.typings);\n\n\t\t\t\treturn rows;\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(rows);\n\t\t\t});\n\t\t});\n\t}\n\n\tasync all() {\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport interface PgRemoteQueryResultHKT extends PgQueryResultHKT {\n\ttype: Assume<this['row'], {\n\t\t[column: string]: any;\n\t}>[];\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.js","names":[],"sources":["../../src/pg-proxy/session.ts"],"sourcesContent":["import { type Cache, NoopCache } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, type PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { QueryWithTypings } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\nimport type { RemoteCallback } from './driver.ts';\n\nexport interface PgRemoteSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class PgRemoteSession<\n\tTRelations extends AnyRelations,\n> extends PgAsyncSession<PgRemoteQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PgRemoteSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate options: PgRemoteSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\t_name: string | boolean,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t) {\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\tif (mode === 'arrays') return this.client(query.sql, params as any[], 'all', query.typings).then((r) => r.rows);\n\n\t\t\treturn this.client(query.sql, params as any[], 'execute', query.typings).then((r) => r.rows);\n\t\t};\n\n\t\treturn new PgAsyncPreparedQuery<T>(\n\t\t\texecutor,\n\t\t\tquery,\n\t\t\tmapper,\n\t\t\tmode,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t);\n\t}\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: PgAsyncTransaction<PgRemoteQueryResultHKT, TRelations>) => Promise<T>,\n\t\t_config?: PgTransactionConfig,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the Postgres Proxy driver');\n\t}\n}\n\nexport interface PgRemoteQueryResultHKT extends PgQueryResultHKT {\n\ttype: Assume<this['row'], {\n\t\t[column: string]: any;\n\t}>[];\n}\n"],"mappings":";;;;;;AAmBA,IAAa,kBAAb,cAEU,eAAmD;CAC5D,QAA0B,cAAsB;CAEhD,AAAQ;CACR,AAAQ;CAER,YACC,AAAQ,QACR,SACA,AAAQ,WACR,AAAQ,UAAkC,EAAE,EAC3C;AACD,QAAM,QAAQ;EALN;EAEA;EACA;AAGR,OAAK,SAAS,QAAQ,UAAU,IAAI,YAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAI,WAAW;;CAG9C,aACC,OACA,MACA,OACA,QACA,eAIA,aACC;EACD,MAAM,WAAW,OAAO,WAAuB;AAC9C,OAAI,SAAS,SAAU,QAAO,KAAK,OAAO,MAAM,KAAK,QAAiB,OAAO,MAAM,QAAQ,CAAC,MAAM,MAAM,EAAE,KAAK;AAE/G,UAAO,KAAK,OAAO,MAAM,KAAK,QAAiB,WAAW,MAAM,QAAQ,CAAC,MAAM,MAAM,EAAE,KAAK;;AAG7F,SAAO,IAAI,qBACV,UACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAGF,MAAe,YACd,cACA,SACa;AACb,QAAM,IAAI,MAAM,8DAA8D"}

package/pglite/driver.cjs

@@ -2,50 +2,88 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 const require_pglite_session = require('./session.cjs');
 let __entity_ts = require("../entity.cjs");
-let ___relations_ts = require("../_relations.cjs");
-___relations_ts = require_runtime.__toESM(___relations_ts);
+let __utils_ts = require("../utils.cjs");
 let __logger_ts = require("../logger.cjs");
+let __pg_core_array_ts = require("../pg-core/array.cjs");
 let __pg_core_async_db_ts = require("../pg-core/async/db.cjs");
+let __pg_core_codecs_ts = require("../pg-core/codecs.cjs");
 let __pg_core_dialect_ts = require("../pg-core/dialect.cjs");
 let _electric_sql_pglite = require("@electric-sql/pglite");
 
 //#region src/pglite/driver.ts
-var PgliteDriver = class {
-	static [__entity_ts.entityKind] = "PgliteDriver";
-	constructor(client, dialect, options = {}) {
-		this.client = client;
-		this.dialect = dialect;
-		this.options = options;
-	}
-	createSession(relations, schema) {
-		return new require_pglite_session.PgliteSession(this.client, this.dialect, relations, schema, {
-			logger: this.options.logger,
-			cache: this.options.cache
-		});
-	}
-};
 var PgliteDatabase = class extends __pg_core_async_db_ts.PgAsyncDatabase {
 	static [__entity_ts.entityKind] = "PgliteDatabase";
 };
+const pgliteCodecs = (0, __pg_core_codecs_ts.refineGenericPgCodecs)({
+	bigint: {
+		cast: __pg_core_codecs_ts.castToText,
+		castArray: __pg_core_codecs_ts.castToTextArr
+	},
+	bigserial: {
+		cast: __pg_core_codecs_ts.castToText,
+		castArray: __pg_core_codecs_ts.castToTextArr
+	},
+	bytea: {
+		normalizeInJson: typeof Buffer === "undefined" ? __utils_ts.base64ToUint8Array : __pg_core_codecs_ts.genericPgCodecs.bytea?.normalizeInJson,
+		normalizeArrayInJson: typeof Buffer === "undefined" ? (0, __pg_core_codecs_ts.arrayCompatNormalize)(__utils_ts.base64ToUint8Array) : __pg_core_codecs_ts.genericPgCodecs.bytea?.normalizeArrayInJson,
+		normalize: typeof Buffer === "undefined" ? __pg_core_codecs_ts.genericPgCodecs.bytea?.normalize : (v) => Buffer.from(v),
+		normalizeArray: typeof Buffer === "undefined" ? __pg_core_codecs_ts.genericPgCodecs.bytea?.normalizeArray : (0, __pg_core_codecs_ts.arrayCompatNormalize)((v) => Buffer.from(v))
+	},
+	json: { normalizeParam: (v) => typeof v === "object" ? v : JSON.stringify(v) },
+	jsonb: { normalizeParam: (v) => typeof v === "object" ? v : JSON.stringify(v) },
+	geometry: {
+		castParam: (name) => `${name}::geometry`,
+		castArrayParam: (name, dimensions) => `${name}::geometry${"[]".repeat(dimensions)}`,
+		normalizeParamArray: __pg_core_array_ts.makePgArray
+	},
+	bit: { normalizeArray: void 0 },
+	halfvec: {
+		castParam: (name) => `${name}::halfvec`,
+		castArrayParam: (name, dimensions) => `${name}::halfvec${"[]".repeat(dimensions)}`,
+		normalizeParamArray: __pg_core_array_ts.makePgArray
+	},
+	vector: {
+		castParam: (name) => `${name}::vector`,
+		castArrayParam: (name, dimensions) => `${name}::vector${"[]".repeat(dimensions)}`,
+		normalizeParamArray: __pg_core_array_ts.makePgArray
+	},
+	sparsevec: {
+		castParam: (name) => `${name}::sparsevec`,
+		castArrayParam: (name, dimensions) => `${name}::sparsevec${"[]".repeat(dimensions)}`,
+		normalizeParamArray: __pg_core_array_ts.makePgArray
+	},
+	point: {
+		cast: void 0,
+		castArray: void 0,
+		castInJson: void 0,
+		castArrayInJson: void 0
+	},
+	line: {
+		cast: void 0,
+		castArray: void 0,
+		castInJson: void 0,
+		castArrayInJson: void 0
+	},
+	macaddr8: {
+		castArrayInJson: void 0,
+		castArray: void 0
+	}
+});
 function construct(client, config = {}) {
-	const dialect = new __pg_core_dialect_ts.PgDialect({ casing: config.casing });
+	const dialect = new __pg_core_dialect_ts.PgDialect({
+		casing: config.casing,
+		useJitMappers: config.useJitMappers,
+		codecs: config.codecs ?? pgliteCodecs
+	});
 	let logger;
 	if (config.logger === true) logger = new __logger_ts.DefaultLogger();
 	else if (config.logger !== false) logger = config.logger;
-	let schema;
-	if (config.schema) {
-		const tablesConfig = ___relations_ts.extractTablesRelationalConfig(config.schema, ___relations_ts.createTableRelationsHelpers);
-		schema = {
-			fullSchema: config.schema,
-			schema: tablesConfig.tables,
-			tableNamesMap: tablesConfig.tableNamesMap
-		};
-	}
 	const relations = config.relations ?? {};
-	const db = new PgliteDatabase(dialect, new PgliteDriver(client, dialect, {
+	const db = new PgliteDatabase(dialect, new require_pglite_session.PgliteSession(client, dialect, relations, {
 		logger,
+		useJitMapper: config.useJitMappers ?? false,
 		cache: config.cache
-	}).createSession(relations, schema), relations, schema);
+	}), relations);
 	db.$client = client;
 	db.$cache = config.cache;
 	if (db.$cache) db.$cache["invalidate"] = config.cache?.onMutate;
@@ -53,13 +91,13 @@ function construct(client, config = {}) {
 }
 function drizzle(...params) {
 	if (params[0] === void 0 || typeof params[0] === "string") return construct(new _electric_sql_pglite.PGlite(params[0]), params[1]);
-	const { connection, client, ...drizzleConfig } = params[0];
-	if (client) return construct(client, drizzleConfig);
+	const { connection, client, ...DrizzlePgConfig } = params[0];
+	if (client) return construct(client, DrizzlePgConfig);
 	if (typeof connection === "object") {
 		const { dataDir, ...options } = connection;
-		return construct(new _electric_sql_pglite.PGlite(dataDir, options), drizzleConfig);
+		return construct(new _electric_sql_pglite.PGlite(dataDir, options), DrizzlePgConfig);
 	}
-	return construct(new _electric_sql_pglite.PGlite(connection), drizzleConfig);
+	return construct(new _electric_sql_pglite.PGlite(connection), DrizzlePgConfig);
 }
 (function(_drizzle) {
 	function mock(config) {
@@ -70,11 +108,11 @@ function drizzle(...params) {
 
 //#endregion
 exports.PgliteDatabase = PgliteDatabase;
-exports.PgliteDriver = PgliteDriver;
 Object.defineProperty(exports, 'drizzle', {
   enumerable: true,
   get: function () {
     return drizzle;
   }
 });
+exports.pgliteCodecs = pgliteCodecs;
 //# sourceMappingURL=driver.cjs.map