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

package/postgres-js/driver.js

@@ -1,8 +1,9 @@
 import { PostgresJsSession } from "./session.js";
 import { entityKind } from "../entity.js";
-import * as V1 from "../_relations.js";
 import { DefaultLogger } from "../logger.js";
+import { makePgArray } from "../pg-core/array.js";
 import { PgAsyncDatabase } from "../pg-core/async/db.js";
+import { refineGenericPgCodecs } from "../pg-core/codecs.js";
 import { PgDialect } from "../pg-core/dialect.js";
 import pgClient from "postgres";
 
@@ -10,6 +11,114 @@ import pgClient from "postgres";
 var PostgresJsDatabase = class extends PgAsyncDatabase {
 	static [entityKind] = "PostgresJsDatabase";
 };
+const postgresJsCodecs = refineGenericPgCodecs({
+	interval: {
+		castArray: void 0,
+		normalizeParamArray: makePgArray
+	},
+	point: {
+		cast: void 0,
+		castArray: void 0,
+		castInJson: void 0,
+		castArrayInJson: void 0,
+		normalizeParamArray: makePgArray
+	},
+	line: {
+		cast: void 0,
+		castArray: void 0,
+		castInJson: void 0,
+		castArrayInJson: void 0,
+		normalizeParamArray: makePgArray
+	},
+	macaddr8: {
+		castArray: void 0,
+		castArrayInJson: void 0,
+		normalizeParamArray: makePgArray
+	},
+	json: { normalizeParam: (v) => JSON.stringify(v) },
+	jsonb: { normalizeParam: (v) => JSON.stringify(v) },
+	bit: {
+		normalizeParamArray: makePgArray,
+		normalizeArray: void 0
+	},
+	bool: { normalizeParamArray: makePgArray },
+	box: { normalizeParamArray: makePgArray },
+	box2d: { normalizeParamArray: makePgArray },
+	box3d: { normalizeParamArray: makePgArray },
+	char: { normalizeParamArray: makePgArray },
+	cidr: { normalizeParamArray: makePgArray },
+	circle: { normalizeParamArray: makePgArray },
+	datemultirange: { normalizeParamArray: makePgArray },
+	daterange: { normalizeParamArray: makePgArray },
+	float8: { normalizeParamArray: makePgArray },
+	geography: { normalizeParamArray: makePgArray },
+	halfvec: {
+		normalizeParamArray: makePgArray,
+		normalizeArray: void 0
+	},
+	inet: { normalizeParamArray: makePgArray },
+	int4multirange: { normalizeParamArray: makePgArray },
+	int4range: { normalizeParamArray: makePgArray },
+	int8multirange: { normalizeParamArray: makePgArray },
+	int8range: { normalizeParamArray: makePgArray },
+	lseg: { normalizeParamArray: makePgArray },
+	macaddr: { normalizeParamArray: makePgArray },
+	money: { normalizeParamArray: makePgArray },
+	nummultirange: { normalizeParamArray: makePgArray },
+	numrange: { normalizeParamArray: makePgArray },
+	oid: { normalizeParamArray: makePgArray },
+	path: { normalizeParamArray: makePgArray },
+	polygon: { normalizeParamArray: makePgArray },
+	raster: { normalizeParamArray: makePgArray },
+	regclass: { normalizeParamArray: makePgArray },
+	regconfig: { normalizeParamArray: makePgArray },
+	regdictionary: { normalizeParamArray: makePgArray },
+	regnamespace: { normalizeParamArray: makePgArray },
+	regoper: { normalizeParamArray: makePgArray },
+	regoperator: { normalizeParamArray: makePgArray },
+	regproc: { normalizeParamArray: makePgArray },
+	regprocedure: { normalizeParamArray: makePgArray },
+	regrole: { normalizeParamArray: makePgArray },
+	regtype: { normalizeParamArray: makePgArray },
+	serial: { normalizeParamArray: makePgArray },
+	smallint: { normalizeParamArray: makePgArray },
+	smallserial: { normalizeParamArray: makePgArray },
+	sparsevec: {
+		normalizeParamArray: makePgArray,
+		normalizeArray: void 0
+	},
+	text: { normalizeParamArray: makePgArray },
+	time: { normalizeParamArray: makePgArray },
+	timetz: { normalizeParamArray: makePgArray },
+	tsmultirange: { normalizeParamArray: makePgArray },
+	tsquery: { normalizeParamArray: makePgArray },
+	tsrange: { normalizeParamArray: makePgArray },
+	tstzmultirange: { normalizeParamArray: makePgArray },
+	tstzrange: { normalizeParamArray: makePgArray },
+	tsvector: { normalizeParamArray: makePgArray },
+	varbit: { normalizeParamArray: makePgArray },
+	varchar: { normalizeParamArray: makePgArray },
+	vector: {
+		normalizeParamArray: makePgArray,
+		normalizeArray: void 0
+	},
+	xml: { normalizeParamArray: makePgArray },
+	bytea: { normalizeParamArray: makePgArray },
+	enum: { normalizeParamArray: makePgArray },
+	geometry: {
+		normalizeArray: void 0,
+		normalizeParamArray: makePgArray
+	},
+	numeric: { normalizeParamArray: makePgArray },
+	bigint: { normalizeParamArray: makePgArray },
+	bigserial: { normalizeParamArray: makePgArray },
+	float4: { normalizeParamArray: makePgArray },
+	int: { normalizeParamArray: makePgArray },
+	uuid: { normalizeParamArray: makePgArray },
+	date: { normalizeParamArray: makePgArray },
+	timestamp: { normalizeParamArray: makePgArray },
+	timestamptz: { normalizeParamArray: makePgArray }
+});
 function construct(client, config = {}) {
 	const transparentParser = (val) => val;
 	for (const type of [
@@ -27,24 +136,20 @@ function construct(client, config = {}) {
 	}
 	client.options.serializers["114"] = transparentParser;
 	client.options.serializers["3802"] = transparentParser;
-	const dialect = new PgDialect({ casing: config.casing });
+	const dialect = new PgDialect({
+		casing: config.casing,
+		useJitMappers: config.useJitMappers,
+		codecs: config.codecs ?? postgresJsCodecs
+	});
 	let logger;
 	if (config.logger === true) logger = new DefaultLogger();
 	else if (config.logger !== false) logger = config.logger;
-	let schema;
-	if (config.schema) {
-		const tablesConfig = V1.extractTablesRelationalConfig(config.schema, V1.createTableRelationsHelpers);
-		schema = {
-			fullSchema: config.schema,
-			schema: tablesConfig.tables,
-			tableNamesMap: tablesConfig.tableNamesMap
-		};
-	}
 	const relations = config.relations ?? {};
-	const db = new PostgresJsDatabase(dialect, new PostgresJsSession(client, dialect, relations, schema, {
+	const db = new PostgresJsDatabase(dialect, new PostgresJsSession(client, dialect, relations, {
 		logger,
-		cache: config.cache
-	}), relations, schema);
+		cache: config.cache,
+		useJitMapper: config.useJitMappers
+	}), relations);
 	db.$client = client;
 	db.$cache = config.cache;
 	if (db.$cache) db.$cache["invalidate"] = config.cache?.onMutate;
@@ -52,13 +157,13 @@ function construct(client, config = {}) {
 }
 function drizzle(...params) {
 	if (typeof params[0] === "string") return construct(pgClient(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" && connection.url !== void 0) {
 		const { url, ...config } = connection;
-		return construct(pgClient(url, config), drizzleConfig);
+		return construct(pgClient(url, config), DrizzlePgConfig);
 	}
-	return construct(pgClient(connection), drizzleConfig);
+	return construct(pgClient(connection), DrizzlePgConfig);
 }
 (function(_drizzle) {
 	function mock(config) {
@@ -71,5 +176,5 @@ function drizzle(...params) {
 })(drizzle || (drizzle = {}));
 
 //#endregion
-export { PostgresJsDatabase, drizzle };
+export { PostgresJsDatabase, drizzle, postgresJsCodecs };
 //# sourceMappingURL=driver.js.map

package/postgres-js/driver.js.map

@@ -1 +1 @@
-{"version":3,"file":"driver.js","names":[],"sources":["../../src/postgres-js/driver.ts"],"sourcesContent":["import pgClient, { type Options, type PostgresType, type Sql } from 'postgres';\nimport * as V1 from '~/_relations.ts';\nimport { entityKind } from '~/entity.ts';\nimport { DefaultLogger } from '~/logger.ts';\nimport { PgAsyncDatabase } from '~/pg-core/async/db.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { DrizzleConfig } from '~/utils.ts';\nimport type { PostgresJsQueryResultHKT } from './session.ts';\nimport { PostgresJsSession } from './session.ts';\n\nexport class PostgresJsDatabase<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgAsyncDatabase<PostgresJsQueryResultHKT, TSchema, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsDatabase';\n}\n\nfunction construct<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n>(\n\tclient: Sql,\n\tconfig: DrizzleConfig<TSchema, TRelations> = {},\n): PostgresJsDatabase<TSchema, TRelations> & {\n\t$client: Sql;\n} {\n\tconst transparentParser = (val: any) => val;\n\n\t// Override postgres.js default date parsers: https://github.com/porsager/postgres/discussions/761\n\tfor (const type of ['1184', '1082', '1083', '1114', '1182', '1185', '1115', '1231']) {\n\t\tclient.options.parsers[type as any] = transparentParser;\n\t\tclient.options.serializers[type as any] = transparentParser;\n\t}\n\tclient.options.serializers['114'] = transparentParser;\n\tclient.options.serializers['3802'] = transparentParser;\n\n\tconst dialect = new PgDialect({ casing: config.casing });\n\tlet logger;\n\tif (config.logger === true) {\n\t\tlogger = new DefaultLogger();\n\t} else if (config.logger !== false) {\n\t\tlogger = config.logger;\n\t}\n\n\tlet schema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined;\n\tif (config.schema) {\n\t\tconst tablesConfig = V1.extractTablesRelationalConfig(\n\t\t\tconfig.schema,\n\t\t\tV1.createTableRelationsHelpers,\n\t\t);\n\t\tschema = {\n\t\t\tfullSchema: config.schema,\n\t\t\tschema: tablesConfig.tables,\n\t\t\ttableNamesMap: tablesConfig.tableNamesMap,\n\t\t};\n\t}\n\n\tconst relations = config.relations ?? {} as TRelations;\n\tconst session = new PostgresJsSession(client, dialect, relations, schema, { logger, cache: config.cache });\n\tconst db = new PostgresJsDatabase(dialect, session, relations, schema as V1.RelationalSchemaConfig<any>);\n\t(<any> db).$client = client;\n\t(<any> db).$cache = config.cache;\n\tif ((<any> db).$cache) {\n\t\t(<any> db).$cache['invalidate'] = config.cache?.onMutate;\n\t}\n\n\treturn db as any;\n}\n\nexport function drizzle<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends Sql = Sql,\n>(\n\t...params: [\n\t\tstring,\n\t] | [\n\t\tstring,\n\t\tDrizzleConfig<TSchema, TRelations>,\n\t] | [\n\t\t(\n\t\t\t& DrizzleConfig<TSchema, TRelations>\n\t\t\t& ({\n\t\t\t\tconnection: string | ({ url?: string } & Options<Record<string, PostgresType>>);\n\t\t\t} | {\n\t\t\t\tclient: TClient;\n\t\t\t})\n\t\t),\n\t]\n): PostgresJsDatabase<TSchema, TRelations> & {\n\t$client: TClient;\n} {\n\tif (typeof params[0] === 'string') {\n\t\tconst instance = pgClient(params[0] as string);\n\n\t\treturn construct(instance, params[1]) as any;\n\t}\n\n\tconst { connection, client, ...drizzleConfig } = params[0] as {\n\t\tconnection?: { url?: string } & Options<Record<string, PostgresType>>;\n\t\tclient?: TClient;\n\t} & DrizzleConfig<TSchema>;\n\n\tif (client) return construct(client, drizzleConfig) as any;\n\n\tif (typeof connection === 'object' && connection.url !== undefined) {\n\t\tconst { url, ...config } = connection;\n\n\t\tconst instance = pgClient(url, config);\n\t\treturn construct(instance, drizzleConfig) as any;\n\t}\n\n\tconst instance = pgClient(connection);\n\treturn construct(instance, drizzleConfig) as any;\n}\n\nexport namespace drizzle {\n\texport function mock<\n\t\tTSchema extends Record<string, unknown> = Record<string, never>,\n\t\tTRelations extends AnyRelations = EmptyRelations,\n\t>(\n\t\tconfig?: DrizzleConfig<TSchema, TRelations>,\n\t): PostgresJsDatabase<TSchema, TRelations> & {\n\t\t$client: '$client is not available on drizzle.mock()';\n\t} {\n\t\treturn construct({\n\t\t\toptions: {\n\t\t\t\tparsers: {},\n\t\t\t\tserializers: {},\n\t\t\t},\n\t\t} as any, config) as any;\n\t}\n}\n"],"mappings":";;;;;;;;;AAWA,IAAa,qBAAb,cAGU,gBAA+D;CACxE,QAA0B,cAAsB;;AAGjD,SAAS,UAIR,QACA,SAA6C,EAAE,EAG9C;CACD,MAAM,qBAAqB,QAAa;AAGxC,MAAK,MAAM,QAAQ;EAAC;EAAQ;EAAQ;EAAQ;EAAQ;EAAQ;EAAQ;EAAQ;EAAO,EAAE;AACpF,SAAO,QAAQ,QAAQ,QAAe;AACtC,SAAO,QAAQ,YAAY,QAAe;;AAE3C,QAAO,QAAQ,YAAY,SAAS;AACpC,QAAO,QAAQ,YAAY,UAAU;CAErC,MAAM,UAAU,IAAI,UAAU,EAAE,QAAQ,OAAO,QAAQ,CAAC;CACxD,IAAI;AACJ,KAAI,OAAO,WAAW,KACrB,UAAS,IAAI,eAAe;UAClB,OAAO,WAAW,MAC5B,UAAS,OAAO;CAGjB,IAAI;AACJ,KAAI,OAAO,QAAQ;EAClB,MAAM,eAAe,GAAG,8BACvB,OAAO,QACP,GAAG,4BACH;AACD,WAAS;GACR,YAAY,OAAO;GACnB,QAAQ,aAAa;GACrB,eAAe,aAAa;GAC5B;;CAGF,MAAM,YAAY,OAAO,aAAa,EAAE;CAExC,MAAM,KAAK,IAAI,mBAAmB,SADlB,IAAI,kBAAkB,QAAQ,SAAS,WAAW,QAAQ;EAAE;EAAQ,OAAO,OAAO;EAAO,CAAC,EACtD,WAAW,OAAyC;AACxG,CAAO,GAAI,UAAU;AACrB,CAAO,GAAI,SAAS,OAAO;AAC3B,KAAW,GAAI,OACd,CAAO,GAAI,OAAO,gBAAgB,OAAO,OAAO;AAGjD,QAAO;;AAGR,SAAgB,QAKf,GAAG,QAiBF;AACD,KAAI,OAAO,OAAO,OAAO,SAGxB,QAAO,UAFU,SAAS,OAAO,GAAa,EAEnB,OAAO,GAAG;CAGtC,MAAM,EAAE,YAAY,QAAQ,GAAG,kBAAkB,OAAO;AAKxD,KAAI,OAAQ,QAAO,UAAU,QAAQ,cAAc;AAEnD,KAAI,OAAO,eAAe,YAAY,WAAW,QAAQ,QAAW;EACnE,MAAM,EAAE,KAAK,GAAG,WAAW;AAG3B,SAAO,UADU,SAAS,KAAK,OAAO,EACX,cAAc;;AAI1C,QAAO,UADU,SAAS,WAAW,EACV,cAAc;;;CAIlC,SAAS,KAIf,QAGC;AACD,SAAO,UAAU,EAChB,SAAS;GACR,SAAS,EAAE;GACX,aAAa,EAAE;GACf,EACD,EAAS,OAAO"}
+{"version":3,"file":"driver.js","names":[],"sources":["../../src/postgres-js/driver.ts"],"sourcesContent":["import pgClient, { type Options, type PostgresType, type Sql } from 'postgres';\nimport { entityKind } from '~/entity.ts';\nimport { DefaultLogger } from '~/logger.ts';\nimport { makePgArray } from '~/pg-core/array.ts';\nimport { PgAsyncDatabase } from '~/pg-core/async/db.ts';\nimport { refineGenericPgCodecs } from '~/pg-core/codecs.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { DrizzlePgConfig } from '~/pg-core/utils.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { PostgresJsQueryResultHKT } from './session.ts';\nimport { PostgresJsSession } from './session.ts';\n\nexport class PostgresJsDatabase<TRelations extends AnyRelations = EmptyRelations>\n\textends PgAsyncDatabase<PostgresJsQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'PostgresJsDatabase';\n}\n\nexport const postgresJsCodecs = refineGenericPgCodecs({\n\tinterval: {\n\t\tcastArray: undefined,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tpoint: {\n\t\tcast: undefined,\n\t\tcastArray: undefined,\n\t\tcastInJson: undefined,\n\t\tcastArrayInJson: undefined,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tline: {\n\t\tcast: undefined,\n\t\tcastArray: undefined,\n\t\tcastInJson: undefined,\n\t\tcastArrayInJson: undefined,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tmacaddr8: {\n\t\tcastArray: undefined,\n\t\tcastArrayInJson: undefined,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tjson: {\n\t\tnormalizeParam: (v) => JSON.stringify(v),\n\t},\n\tjsonb: {\n\t\tnormalizeParam: (v) => JSON.stringify(v),\n\t},\n\n\tbit: {\n\t\tnormalizeParamArray: makePgArray,\n\t\tnormalizeArray: undefined,\n\t},\n\tbool: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbox: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbox2d: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbox3d: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tchar: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tcidr: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tcircle: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tdatemultirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tdaterange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tfloat8: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tgeography: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\thalfvec: {\n\t\tnormalizeParamArray: makePgArray,\n\t\tnormalizeArray: undefined,\n\t},\n\tinet: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tint4multirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tint4range: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tint8multirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tint8range: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tlseg: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tmacaddr: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tmoney: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tnummultirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tnumrange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\toid: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tpath: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tpolygon: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\traster: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregclass: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregconfig: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregdictionary: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregnamespace: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregoper: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregoperator: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregproc: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregprocedure: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregrole: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregtype: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tserial: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tsmallint: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tsmallserial: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tsparsevec: {\n\t\tnormalizeParamArray: makePgArray,\n\t\tnormalizeArray: undefined,\n\t},\n\ttext: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttime: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttimetz: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttsmultirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttsquery: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttsrange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttstzmultirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttstzrange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttsvector: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tvarbit: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tvarchar: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tvector: {\n\t\tnormalizeParamArray: makePgArray,\n\t\tnormalizeArray: undefined,\n\t},\n\txml: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbytea: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tenum: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tgeometry: {\n\t\tnormalizeArray: undefined,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tnumeric: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbigint: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbigserial: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tfloat4: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tint: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tuuid: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tdate: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttimestamp: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttimestamptz: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n});\n\nfunction construct<\n\tTRelations extends AnyRelations = EmptyRelations,\n>(\n\tclient: Sql,\n\tconfig: DrizzlePgConfig<TRelations> = {},\n): PostgresJsDatabase<TRelations> & {\n\t$client: Sql;\n} {\n\tconst transparentParser = (val: any) => val;\n\n\t// Override postgres.js default date parsers: https://github.com/porsager/postgres/discussions/761\n\tfor (const type of ['1184', '1082', '1083', '1114', '1182', '1185', '1115', '1231']) {\n\t\tclient.options.parsers[type as any] = transparentParser;\n\t\tclient.options.serializers[type as any] = transparentParser;\n\t}\n\tclient.options.serializers['114'] = transparentParser;\n\tclient.options.serializers['3802'] = transparentParser;\n\n\tconst dialect = new PgDialect({\n\t\tcasing: config.casing,\n\t\tuseJitMappers: config.useJitMappers,\n\t\tcodecs: config.codecs ?? postgresJsCodecs,\n\t});\n\tlet logger;\n\tif (config.logger === true) {\n\t\tlogger = new DefaultLogger();\n\t} else if (config.logger !== false) {\n\t\tlogger = config.logger;\n\t}\n\n\tconst relations = config.relations ?? {} as TRelations;\n\tconst session = new PostgresJsSession(client, dialect, relations, {\n\t\tlogger,\n\t\tcache: config.cache,\n\t\tuseJitMapper: config.useJitMappers,\n\t});\n\tconst db = new PostgresJsDatabase(dialect, session, relations);\n\t(<any> db).$client = client;\n\t(<any> db).$cache = config.cache;\n\tif ((<any> db).$cache) {\n\t\t(<any> db).$cache['invalidate'] = config.cache?.onMutate;\n\t}\n\n\treturn db as any;\n}\n\nexport function drizzle<\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends Sql = Sql,\n>(\n\t...params: [\n\t\tstring,\n\t] | [\n\t\tstring,\n\t\tDrizzlePgConfig<TRelations>,\n\t] | [\n\t\t(\n\t\t\t& DrizzlePgConfig<TRelations>\n\t\t\t& ({\n\t\t\t\tconnection: string | ({ url?: string } & Options<Record<string, PostgresType>>);\n\t\t\t} | {\n\t\t\t\tclient: TClient;\n\t\t\t})\n\t\t),\n\t]\n): PostgresJsDatabase<TRelations> & {\n\t$client: TClient;\n} {\n\tif (typeof params[0] === 'string') {\n\t\tconst instance = pgClient(params[0] as string);\n\n\t\treturn construct(instance, params[1]) as any;\n\t}\n\n\tconst { connection, client, ...DrizzlePgConfig } = params[0] as {\n\t\tconnection?: { url?: string } & Options<Record<string, PostgresType>>;\n\t\tclient?: TClient;\n\t} & DrizzlePgConfig<TRelations>;\n\n\tif (client) return construct(client, DrizzlePgConfig) as any;\n\n\tif (typeof connection === 'object' && connection.url !== undefined) {\n\t\tconst { url, ...config } = connection;\n\n\t\tconst instance = pgClient(url, config);\n\t\treturn construct(instance, DrizzlePgConfig) as any;\n\t}\n\n\tconst instance = pgClient(connection);\n\treturn construct(instance, DrizzlePgConfig) as any;\n}\n\nexport namespace drizzle {\n\texport function mock<\n\t\tTRelations extends AnyRelations = EmptyRelations,\n\t>(\n\t\tconfig?: DrizzlePgConfig<TRelations>,\n\t): PostgresJsDatabase<TRelations> & {\n\t\t$client: '$client is not available on drizzle.mock()';\n\t} {\n\t\treturn construct({\n\t\t\toptions: {\n\t\t\t\tparsers: {},\n\t\t\t\tserializers: {},\n\t\t\t},\n\t\t} as any, config) as any;\n\t}\n}\n"],"mappings":";;;;;;;;;;AAYA,IAAa,qBAAb,cACS,gBACT;CACC,QAA0B,cAAsB;;AAGjD,MAAa,mBAAmB,sBAAsB;CACrD,UAAU;EACT,WAAW;EACX,qBAAqB;EACrB;CACD,OAAO;EACN,MAAM;EACN,WAAW;EACX,YAAY;EACZ,iBAAiB;EACjB,qBAAqB;EACrB;CACD,MAAM;EACL,MAAM;EACN,WAAW;EACX,YAAY;EACZ,iBAAiB;EACjB,qBAAqB;EACrB;CACD,UAAU;EACT,WAAW;EACX,iBAAiB;EACjB,qBAAqB;EACrB;CACD,MAAM,EACL,iBAAiB,MAAM,KAAK,UAAU,EAAE,EACxC;CACD,OAAO,EACN,iBAAiB,MAAM,KAAK,UAAU,EAAE,EACxC;CAED,KAAK;EACJ,qBAAqB;EACrB,gBAAgB;EAChB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,KAAK,EACJ,qBAAqB,aACrB;CACD,OAAO,EACN,qBAAqB,aACrB;CACD,OAAO,EACN,qBAAqB,aACrB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,QAAQ,EACP,qBAAqB,aACrB;CACD,gBAAgB,EACf,qBAAqB,aACrB;CACD,WAAW,EACV,qBAAqB,aACrB;CACD,QAAQ,EACP,qBAAqB,aACrB;CACD,WAAW,EACV,qBAAqB,aACrB;CACD,SAAS;EACR,qBAAqB;EACrB,gBAAgB;EAChB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,gBAAgB,EACf,qBAAqB,aACrB;CACD,WAAW,EACV,qBAAqB,aACrB;CACD,gBAAgB,EACf,qBAAqB,aACrB;CACD,WAAW,EACV,qBAAqB,aACrB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,SAAS,EACR,qBAAqB,aACrB;CACD,OAAO,EACN,qBAAqB,aACrB;CACD,eAAe,EACd,qBAAqB,aACrB;CACD,UAAU,EACT,qBAAqB,aACrB;CACD,KAAK,EACJ,qBAAqB,aACrB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,SAAS,EACR,qBAAqB,aACrB;CACD,QAAQ,EACP,qBAAqB,aACrB;CACD,UAAU,EACT,qBAAqB,aACrB;CACD,WAAW,EACV,qBAAqB,aACrB;CACD,eAAe,EACd,qBAAqB,aACrB;CACD,cAAc,EACb,qBAAqB,aACrB;CACD,SAAS,EACR,qBAAqB,aACrB;CACD,aAAa,EACZ,qBAAqB,aACrB;CACD,SAAS,EACR,qBAAqB,aACrB;CACD,cAAc,EACb,qBAAqB,aACrB;CACD,SAAS,EACR,qBAAqB,aACrB;CACD,SAAS,EACR,qBAAqB,aACrB;CACD,QAAQ,EACP,qBAAqB,aACrB;CACD,UAAU,EACT,qBAAqB,aACrB;CACD,aAAa,EACZ,qBAAqB,aACrB;CACD,WAAW;EACV,qBAAqB;EACrB,gBAAgB;EAChB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,QAAQ,EACP,qBAAqB,aACrB;CACD,cAAc,EACb,qBAAqB,aACrB;CACD,SAAS,EACR,qBAAqB,aACrB;CACD,SAAS,EACR,qBAAqB,aACrB;CACD,gBAAgB,EACf,qBAAqB,aACrB;CACD,WAAW,EACV,qBAAqB,aACrB;CACD,UAAU,EACT,qBAAqB,aACrB;CACD,QAAQ,EACP,qBAAqB,aACrB;CACD,SAAS,EACR,qBAAqB,aACrB;CACD,QAAQ;EACP,qBAAqB;EACrB,gBAAgB;EAChB;CACD,KAAK,EACJ,qBAAqB,aACrB;CACD,OAAO,EACN,qBAAqB,aACrB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,UAAU;EACT,gBAAgB;EAChB,qBAAqB;EACrB;CACD,SAAS,EACR,qBAAqB,aACrB;CACD,QAAQ,EACP,qBAAqB,aACrB;CACD,WAAW,EACV,qBAAqB,aACrB;CACD,QAAQ,EACP,qBAAqB,aACrB;CACD,KAAK,EACJ,qBAAqB,aACrB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,MAAM,EACL,qBAAqB,aACrB;CACD,WAAW,EACV,qBAAqB,aACrB;CACD,aAAa,EACZ,qBAAqB,aACrB;CACD,CAAC;AAEF,SAAS,UAGR,QACA,SAAsC,EAAE,EAGvC;CACD,MAAM,qBAAqB,QAAa;AAGxC,MAAK,MAAM,QAAQ;EAAC;EAAQ;EAAQ;EAAQ;EAAQ;EAAQ;EAAQ;EAAQ;EAAO,EAAE;AACpF,SAAO,QAAQ,QAAQ,QAAe;AACtC,SAAO,QAAQ,YAAY,QAAe;;AAE3C,QAAO,QAAQ,YAAY,SAAS;AACpC,QAAO,QAAQ,YAAY,UAAU;CAErC,MAAM,UAAU,IAAI,UAAU;EAC7B,QAAQ,OAAO;EACf,eAAe,OAAO;EACtB,QAAQ,OAAO,UAAU;EACzB,CAAC;CACF,IAAI;AACJ,KAAI,OAAO,WAAW,KACrB,UAAS,IAAI,eAAe;UAClB,OAAO,WAAW,MAC5B,UAAS,OAAO;CAGjB,MAAM,YAAY,OAAO,aAAa,EAAE;CAMxC,MAAM,KAAK,IAAI,mBAAmB,SALlB,IAAI,kBAAkB,QAAQ,SAAS,WAAW;EACjE;EACA,OAAO,OAAO;EACd,cAAc,OAAO;EACrB,CAAC,EACkD,UAAU;AAC9D,CAAO,GAAI,UAAU;AACrB,CAAO,GAAI,SAAS,OAAO;AAC3B,KAAW,GAAI,OACd,CAAO,GAAI,OAAO,gBAAgB,OAAO,OAAO;AAGjD,QAAO;;AAGR,SAAgB,QAIf,GAAG,QAiBF;AACD,KAAI,OAAO,OAAO,OAAO,SAGxB,QAAO,UAFU,SAAS,OAAO,GAAa,EAEnB,OAAO,GAAG;CAGtC,MAAM,EAAE,YAAY,QAAQ,GAAG,oBAAoB,OAAO;AAK1D,KAAI,OAAQ,QAAO,UAAU,QAAQ,gBAAgB;AAErD,KAAI,OAAO,eAAe,YAAY,WAAW,QAAQ,QAAW;EACnE,MAAM,EAAE,KAAK,GAAG,WAAW;AAG3B,SAAO,UADU,SAAS,KAAK,OAAO,EACX,gBAAgB;;AAI5C,QAAO,UADU,SAAS,WAAW,EACV,gBAAgB;;;CAIpC,SAAS,KAGf,QAGC;AACD,SAAO,UAAU,EAChB,SAAS;GACR,SAAS,EAAE;GACX,aAAa,EAAE;GACf,EACD,EAAS,OAAO"}

package/postgres-js/index.cjs

@@ -3,7 +3,6 @@ const require_postgres_js_session = require('./session.cjs');
 const require_postgres_js_driver = require('./driver.cjs');
 
 exports.PostgresJsDatabase = require_postgres_js_driver.PostgresJsDatabase;
-exports.PostgresJsPreparedQuery = require_postgres_js_session.PostgresJsPreparedQuery;
 exports.PostgresJsSession = require_postgres_js_session.PostgresJsSession;
 exports.PostgresJsTransaction = require_postgres_js_session.PostgresJsTransaction;
 Object.defineProperty(exports, 'drizzle', {
@@ -11,4 +10,5 @@ Object.defineProperty(exports, 'drizzle', {
   get: function () {
     return require_postgres_js_driver.drizzle;
   }
-});
+});
+exports.postgresJsCodecs = require_postgres_js_driver.postgresJsCodecs;

package/postgres-js/index.d.cts

@@ -1,3 +1,3 @@
-import { PostgresJsPreparedQuery, PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction } from "./session.cjs";
-import { PostgresJsDatabase, drizzle } from "./driver.cjs";
-export { PostgresJsDatabase, PostgresJsPreparedQuery, PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction, drizzle };
+import { PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction } from "./session.cjs";
+import { PostgresJsDatabase, drizzle, postgresJsCodecs } from "./driver.cjs";
+export { PostgresJsDatabase, PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction, drizzle, postgresJsCodecs };

package/postgres-js/index.d.ts

@@ -1,3 +1,3 @@
-import { PostgresJsPreparedQuery, PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction } from "./session.js";
-import { PostgresJsDatabase, drizzle } from "./driver.js";
-export { PostgresJsDatabase, PostgresJsPreparedQuery, PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction, drizzle };
+import { PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction } from "./session.js";
+import { PostgresJsDatabase, drizzle, postgresJsCodecs } from "./driver.js";
+export { PostgresJsDatabase, PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction, drizzle, postgresJsCodecs };

package/postgres-js/index.js

@@ -1,4 +1,4 @@
-import { PostgresJsPreparedQuery, PostgresJsSession, PostgresJsTransaction } from "./session.js";
-import { PostgresJsDatabase, drizzle } from "./driver.js";
+import { PostgresJsSession, PostgresJsTransaction } from "./session.js";
+import { PostgresJsDatabase, drizzle, postgresJsCodecs } from "./driver.js";
 
-export { PostgresJsDatabase, PostgresJsPreparedQuery, PostgresJsSession, PostgresJsTransaction, drizzle };
+export { PostgresJsDatabase, PostgresJsSession, PostgresJsTransaction, drizzle, postgresJsCodecs };

package/postgres-js/migrator.cjs.map

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

package/postgres-js/migrator.d.cts

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

package/postgres-js/migrator.d.ts

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

package/postgres-js/migrator.js.map

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

package/postgres-js/session.cjs

@@ -1,129 +1,35 @@
 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 __cache_core_index_ts = require("../cache/core/index.cjs");
 let __pg_core_async_session_ts = require("../pg-core/async/session.cjs");
 
 //#region src/postgres-js/session.ts
-var PostgresJsPreparedQuery = class extends __pg_core_async_session_ts.PgAsyncPreparedQuery {
-	static [__entity_ts.entityKind] = "PostgresJsPreparedQuery";
-	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);
-			span?.setAttributes({
-				"drizzle.query.text": this.query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			this.logger.logQuery(this.query.sql, params);
-			const { fields, query, client, joinsNotNullableMap, customResultMapper } = this;
-			if (!fields && !customResultMapper) return __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", () => {
-				return this.queryWithCache(query.sql, params, async () => {
-					return await client.unsafe(query.sql, params);
-				});
-			});
-			const rows = await __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", () => {
-				span?.setAttributes({
-					"drizzle.query.text": query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return this.queryWithCache(query.sql, params, async () => {
-					return await client.unsafe(query.sql, params).values();
-				});
-			});
-			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);
-			span?.setAttributes({
-				"drizzle.query.text": this.query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			this.logger.logQuery(this.query.sql, params);
-			const { query, client, customResultMapper } = this;
-			const rows = await __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", () => {
-				span?.setAttributes({
-					"drizzle.query.text": query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return client.unsafe(query.sql, params);
-			});
-			return __tracing_ts.tracer.startActiveSpan("drizzle.mapResponse", () => {
-				return customResultMapper(rows);
-			});
-		});
-	}
-	all(placeholderValues = {}) {
-		return __tracing_ts.tracer.startActiveSpan("drizzle.execute", async (span) => {
-			const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-			span?.setAttributes({
-				"drizzle.query.text": this.query.sql,
-				"drizzle.query.params": JSON.stringify(params)
-			});
-			this.logger.logQuery(this.query.sql, params);
-			return __tracing_ts.tracer.startActiveSpan("drizzle.driver.execute", () => {
-				span?.setAttributes({
-					"drizzle.query.text": this.query.sql,
-					"drizzle.query.params": JSON.stringify(params)
-				});
-				return this.queryWithCache(this.query.sql, params, async () => {
-					return this.client.unsafe(this.query.sql, params);
-				});
-			});
-		});
-	}
-	/** @internal */
-	isResponseInArrayMode() {
-		return this._isResponseInArrayMode;
-	}
-};
 var PostgresJsSession = class PostgresJsSession extends __pg_core_async_session_ts.PgAsyncSession {
 	static [__entity_ts.entityKind] = "PostgresJsSession";
 	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_index_ts.NoopCache();
 	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new PostgresJsPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new PostgresJsPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, false, customResultMapper, true);
-	}
-	query(query, params) {
-		this.logger.logQuery(query, params);
-		return this.client.unsafe(query, params).values();
-	}
-	queryObjects(query, params) {
-		return this.client.unsafe(query, params);
+	prepareQuery(query, mode, name, mapper, queryMetadata, cacheConfig) {
+		const executor = async (params) => {
+			if (mode === "objects") return this.client.unsafe(query.sql, params ?? [], { prepare: name !== false }).then((rows) => Object.values(rows));
+			if (mode === "raw") return this.client.unsafe(query.sql, params ?? [], { prepare: name !== false });
+			return this.client.unsafe(query.sql, params ?? [], { prepare: name !== false }).values();
+		};
+		return new __pg_core_async_session_ts.PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
 	}
 	transaction(transaction, config) {
 		return this.client.begin(async (client) => {
-			const session = new PostgresJsSession(client, this.dialect, this.relations, this.schema, this.options);
-			const tx = new PostgresJsTransaction(this.dialect, session, this.schema, this.relations);
+			const session = new PostgresJsSession(client, this.dialect, this.relations, this.options);
+			const tx = new PostgresJsTransaction(this.dialect, session, this.relations);
 			if (config) await tx.setTransaction(config);
 			return transaction(tx);
 		});
@@ -131,20 +37,19 @@ var PostgresJsSession = class PostgresJsSession extends __pg_core_async_session_
 };
 var PostgresJsTransaction = class PostgresJsTransaction extends __pg_core_async_session_ts.PgAsyncTransaction {
 	static [__entity_ts.entityKind] = "PostgresJsTransaction";
-	constructor(dialect, session, schema, relations, nestedIndex = 0) {
-		super(dialect, session, relations, schema, nestedIndex);
+	constructor(dialect, session, relations, nestedIndex = 0) {
+		super(dialect, session, relations, nestedIndex, false);
 		this.session = session;
 	}
-	transaction(transaction) {
+	transaction = (transaction) => {
 		return this.session.client.savepoint((client) => {
-			const session = new PostgresJsSession(client, this.dialect, this.relations, this.schema, this.session.options);
-			return transaction(new PostgresJsTransaction(this.dialect, session, this.schema, this.relations));
+			const session = new PostgresJsSession(client, this.dialect, this._.relations, this.session.options);
+			return transaction(new PostgresJsTransaction(this.dialect, session, this._.relations));
 		});
-	}
+	};
 };
 
 //#endregion
-exports.PostgresJsPreparedQuery = PostgresJsPreparedQuery;
 exports.PostgresJsSession = PostgresJsSession;
 exports.PostgresJsTransaction = PostgresJsTransaction;
 //# sourceMappingURL=session.cjs.map

package/postgres-js/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["PgAsyncPreparedQuery","entityKind","tracer","PgAsyncSession","NoopLogger","NoopCache","PgAsyncTransaction"],"sources":["../../src/postgres-js/session.ts"],"sourcesContent":["import type { Row, RowList, Sql, TransactionSql } from 'postgres';\nimport type * as V1 from '~/_relations.ts';\nimport { type Cache, NoopCache } from '~/cache/core/index.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 } from '~/pg-core/session.ts';\nimport type { PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { fillPlaceholders, type Query } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\n\nexport class PostgresJsPreparedQuery<\n\tT extends PreparedQueryConfig,\n\tTIsRqbV2 extends boolean = false,\n> extends PgAsyncPreparedQuery<T> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsPreparedQuery';\n\n\tconstructor(\n\t\tprivate client: Sql,\n\t\tquery: Query,\n\t\tprivate logger: Logger,\n\t\tcache: Cache,\n\t\tqueryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\tcacheConfig: WithCacheConfig | undefined,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\tprivate _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\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\t\tconst { fields, query, client, joinsNotNullableMap, customResultMapper } = this;\n\t\t\tif (!fields && !customResultMapper) {\n\t\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', () => {\n\t\t\t\t\treturn this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\t\treturn await client.unsafe(query.sql, params as any[]);\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tconst rows = await tracer.startActiveSpan('drizzle.driver.execute', () => {\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\t\t\t\treturn this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\treturn await client.unsafe(query.sql, params as any[]).values();\n\t\t\t\t});\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 as (rows: unknown[][]) => T['execute'])(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\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\t\tconst { query, client, customResultMapper } = this;\n\n\t\t\tconst rows = await tracer.startActiveSpan('drizzle.driver.execute', () => {\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\treturn client.unsafe(query.sql, params as any[]);\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\tall(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['all']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\t\t\tthis.logger.logQuery(this.query.sql, params);\n\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', () => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': this.query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\t\t\t\treturn this.queryWithCache(this.query.sql, params, async () => {\n\t\t\t\t\treturn this.client.unsafe(this.query.sql, params as any[]);\n\t\t\t\t});\n\t\t\t});\n\t\t});\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport interface PostgresJsSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class PostgresJsSession<\n\tTSQL extends Sql,\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsSession';\n\n\tlogger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tpublic client: TSQL,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\t/** @internal */\n\t\treadonly options: PostgresJsSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new PostgresJsPreparedQuery(\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 = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper: (rows: Record<string, unknown>[]) => T['execute'],\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new PostgresJsPreparedQuery(\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\tquery(query: string, params: unknown[]): Promise<RowList<Row[]>> {\n\t\tthis.logger.logQuery(query, params);\n\t\treturn this.client.unsafe(query, params as any[]).values();\n\t}\n\n\tqueryObjects<T extends Row>(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<RowList<T[]>> {\n\t\treturn this.client.unsafe(query, params as any[]);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: PostgresJsTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig,\n\t): Promise<T> {\n\t\treturn this.client.begin(async (client) => {\n\t\t\tconst session = new PostgresJsSession<TransactionSql, TFullSchema, TRelations, TSchema>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t\tthis.options,\n\t\t\t);\n\t\t\tconst tx = new PostgresJsTransaction(this.dialect, session, this.schema, this.relations);\n\t\t\tif (config) {\n\t\t\t\tawait tx.setTransaction(config);\n\t\t\t}\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t}\n}\n\nexport class PostgresJsTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\t/** @internal */\n\t\toverride readonly session: PostgresJsSession<TransactionSql, TFullSchema, TRelations, TSchema>,\n\t\tschema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\trelations: TRelations,\n\t\tnestedIndex = 0,\n\t) {\n\t\tsuper(dialect, session, relations, schema, nestedIndex);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: PostgresJsTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\treturn this.session.client.savepoint((client) => {\n\t\t\tconst session = new PostgresJsSession<TransactionSql, TFullSchema, TRelations, TSchema>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t\tthis.session.options,\n\t\t\t);\n\t\t\tconst tx = new PostgresJsTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\t\tthis.dialect,\n\t\t\t\tsession,\n\t\t\t\tthis.schema,\n\t\t\t\tthis.relations,\n\t\t\t);\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t}\n}\n\nexport interface PostgresJsQueryResultHKT extends PgQueryResultHKT {\n\ttype: RowList<Assume<this['row'], Row>[]>;\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.cjs","names":["PgAsyncSession","entityKind","NoopLogger","NoopCache","PgAsyncPreparedQuery","PgAsyncTransaction"],"sources":["../../src/postgres-js/session.ts"],"sourcesContent":["import type { Row, RowList, Sql, TransactionSql } from 'postgres';\nimport { type Cache, NoopCache } from '~/cache/core/index.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig } from '~/pg-core/session.ts';\nimport type { PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\n\nexport interface PostgresJsSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class PostgresJsSession<TSQL extends Sql, TRelations extends AnyRelations>\n\textends PgAsyncSession<PostgresJsQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'PostgresJsSession';\n\n\tlogger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tpublic client: TSQL,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\t/** @internal */\n\t\treadonly options: PostgresJsSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\tname: string | boolean,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t) {\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\tif (mode === 'objects') {\n\t\t\t\treturn this.client.unsafe(query.sql, params ?? [] as any[], {\n\t\t\t\t\tprepare: name !== false,\n\t\t\t\t}).then((rows) => Object.values(rows));\n\t\t\t}\n\t\t\tif (mode === 'raw') {\n\t\t\t\treturn this.client.unsafe(query.sql, params ?? [] as any[], {\n\t\t\t\t\tprepare: name !== false,\n\t\t\t\t});\n\t\t\t}\n\t\t\treturn this.client.unsafe(query.sql, params ?? [] as any[], {\n\t\t\t\tprepare: name !== false,\n\t\t\t}).values();\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\toverride transaction<T>(\n\t\ttransaction: (tx: PostgresJsTransaction<TRelations>) => Promise<T>,\n\t\tconfig?: PgTransactionConfig,\n\t): Promise<T> {\n\t\treturn this.client.begin(async (client) => {\n\t\t\tconst session = new PostgresJsSession<TransactionSql, TRelations>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.options,\n\t\t\t);\n\t\t\tconst tx = new PostgresJsTransaction(this.dialect, session, this.relations);\n\t\t\tif (config) {\n\t\t\t\tawait tx.setTransaction(config);\n\t\t\t}\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t}\n}\n\nexport class PostgresJsTransaction<\n\tTRelations extends AnyRelations,\n> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PostgresJsTransaction';\n\n\tconstructor(\n\t\tdialect: PgDialect,\n\t\t/** @internal */\n\t\toverride readonly session: PostgresJsSession<TransactionSql, TRelations>,\n\t\trelations: TRelations,\n\t\tnestedIndex = 0,\n\t) {\n\t\tsuper(dialect, session, relations, nestedIndex, false);\n\t}\n\n\toverride transaction = <T>(\n\t\ttransaction: (tx: PostgresJsTransaction<TRelations>) => Promise<T>,\n\t): Promise<T> => {\n\t\treturn this.session.client.savepoint((client) => {\n\t\t\tconst session = new PostgresJsSession<TransactionSql, TRelations>(\n\t\t\t\tclient,\n\t\t\t\tthis.dialect,\n\t\t\t\tthis._.relations,\n\t\t\t\tthis.session.options,\n\t\t\t);\n\t\t\tconst tx = new PostgresJsTransaction<TRelations>(\n\t\t\t\tthis.dialect,\n\t\t\t\tsession,\n\t\t\t\tthis._.relations,\n\t\t\t);\n\t\t\treturn transaction(tx);\n\t\t}) as Promise<T>;\n\t};\n}\n\nexport interface PostgresJsQueryResultHKT extends PgQueryResultHKT {\n\ttype: RowList<Assume<this['row'], Row>[]>;\n}\n"],"mappings":";;;;;;;;AAoBA,IAAa,oBAAb,MAAa,0BACJA,0CACT;CACC,QAA0BC,0BAAsB;CAEhD;CACA,AAAQ;CAER,YACC,AAAO,QACP,SACA,AAAQ,WAER,AAAS,UAAoC,EAAE,EAC9C;AACD,QAAM,QAAQ;EANP;EAEC;EAEC;AAGT,OAAK,SAAS,QAAQ,UAAU,IAAIC,wBAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAIC,iCAAW;;CAG9C,aACC,OACA,MACA,MACA,QACA,eAIA,aACC;EACD,MAAM,WAAW,OAAO,WAAuB;AAC9C,OAAI,SAAS,UACZ,QAAO,KAAK,OAAO,OAAO,MAAM,KAAK,UAAU,EAAE,EAAW,EAC3D,SAAS,SAAS,OAClB,CAAC,CAAC,MAAM,SAAS,OAAO,OAAO,KAAK,CAAC;AAEvC,OAAI,SAAS,MACZ,QAAO,KAAK,OAAO,OAAO,MAAM,KAAK,UAAU,EAAE,EAAW,EAC3D,SAAS,SAAS,OAClB,CAAC;AAEH,UAAO,KAAK,OAAO,OAAO,MAAM,KAAK,UAAU,EAAE,EAAW,EAC3D,SAAS,SAAS,OAClB,CAAC,CAAC,QAAQ;;AAGZ,SAAO,IAAIC,gDACV,UACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAEF,AAAS,YACR,aACA,QACa;AACb,SAAO,KAAK,OAAO,MAAM,OAAO,WAAW;GAC1C,MAAM,UAAU,IAAI,kBACnB,QACA,KAAK,SACL,KAAK,WACL,KAAK,QACL;GACD,MAAM,KAAK,IAAI,sBAAsB,KAAK,SAAS,SAAS,KAAK,UAAU;AAC3E,OAAI,OACH,OAAM,GAAG,eAAe,OAAO;AAEhC,UAAO,YAAY,GAAG;IACrB;;;AAIJ,IAAa,wBAAb,MAAa,8BAEHC,8CAAyD;CAClE,QAA0BJ,0BAAsB;CAEhD,YACC,SAEA,AAAkB,SAClB,WACA,cAAc,GACb;AACD,QAAM,SAAS,SAAS,WAAW,aAAa,MAAM;EAJpC;;CAOnB,AAAS,eACR,gBACgB;AAChB,SAAO,KAAK,QAAQ,OAAO,WAAW,WAAW;GAChD,MAAM,UAAU,IAAI,kBACnB,QACA,KAAK,SACL,KAAK,EAAE,WACP,KAAK,QAAQ,QACb;AAMD,UAAO,YALI,IAAI,sBACd,KAAK,SACL,SACA,KAAK,EAAE,UACP,CACqB;IACrB"}

package/postgres-js/session.d.cts

@@ -1,67 +1,46 @@
 import { entityKind } from "../entity.cjs";
 import { Query } from "../sql/sql.cjs";
 import { Assume } from "../utils.cjs";
-import * as V1 from "../_relations.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";
 import { Cache } from "../cache/core/index.cjs";
 import { Row, RowList, Sql, TransactionSql } from "postgres";
 
 //#region src/postgres-js/session.d.ts
-declare class PostgresJsPreparedQuery<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;
-  constructor(client: Sql, query: Query, logger: Logger, cache: Cache, 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(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
-}
 interface PostgresJsSessionOptions {
   logger?: Logger;
   cache?: Cache;
+  useJitMapper?: boolean;
 }
-declare class PostgresJsSession<TSQL extends Sql, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class PostgresJsSession<TSQL extends Sql, TRelations extends AnyRelations> extends PgAsyncSession<PostgresJsQueryResultHKT, TRelations> {
   client: TSQL;
   private relations;
-  private schema;
   static readonly [entityKind]: string;
   logger: Logger;
   private cache;
-  constructor(client: TSQL, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, /** @internal */
+  constructor(client: TSQL, dialect: PgDialect, relations: TRelations, /** @internal */
 
   options?: PostgresJsSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper: (rows: Record<string, unknown>[]) => T['execute']): PgAsyncPreparedQuery<T>;
-  query(query: string, params: unknown[]): Promise<RowList<Row[]>>;
-  queryObjects<T extends Row>(query: string, params: unknown[]): Promise<RowList<T[]>>;
-  transaction<T>(transaction: (tx: PostgresJsTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
+  transaction<T>(transaction: (tx: PostgresJsTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
-declare class PostgresJsTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class PostgresJsTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<PostgresJsQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
   constructor(dialect: PgDialect, /** @internal */
 
-  session: PostgresJsSession<TransactionSql, TFullSchema, TRelations, TSchema>, schema: V1.RelationalSchemaConfig<TSchema> | undefined, relations: TRelations, nestedIndex?: number);
-  transaction<T>(transaction: (tx: PostgresJsTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
+  session: PostgresJsSession<TransactionSql, TRelations>, relations: TRelations, nestedIndex?: number);
+  transaction: <T>(transaction: (tx: PostgresJsTransaction<TRelations>) => Promise<T>) => Promise<T>;
 }
 interface PostgresJsQueryResultHKT extends PgQueryResultHKT {
   type: RowList<Assume<this['row'], Row>[]>;
 }
 //#endregion
-export { PostgresJsPreparedQuery, PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction };
+export { PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction };
 //# sourceMappingURL=session.d.cts.map