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

package/planetscale-serverless/session.js

@@ -1,40 +1,34 @@
 import { entityKind, is } from "../entity.js";
 import { Column } from "../column.js";
-import { makeJitQueryMapper, mapResultRow } from "../utils.js";
+import { mapResultRow } from "../utils.js";
 import { fillPlaceholders, sql } from "../sql/sql.js";
-import { NoopCache } from "../cache/core/index.js";
 import { NoopLogger } from "../logger.js";
+import { NoopCache } from "../cache/core/index.js";
 import { MySqlPreparedQuery, MySqlSession, MySqlTransaction } from "../mysql-core/session.js";
-import { makeRqbJitMapper } from "../relations.js";
 
 //#region src/planetscale-serverless/session.ts
 var PlanetScalePreparedQuery = class extends MySqlPreparedQuery {
 	static [entityKind] = "PlanetScalePreparedQuery";
-	jitMapper;
-	rawQuery = { as: "object" };
-	query = { as: "array" };
-	constructor(client, queryString, params, logger, cache, queryMetadata, cacheConfig, fields, useJitMapper, customResultMapper, generatedIds, returningIds, isRqbV2Query, rqbConfig) {
-		super(cache, queryMetadata, cacheConfig);
+	rawQueryConfig = { as: "object" };
+	queryConfig = { as: "array" };
+	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, customResultMapper, generatedIds, returningIds, isRqbV2Query) {
+		super(query, cache, queryMetadata, cacheConfig);
 		this.client = client;
-		this.queryString = queryString;
-		this.params = params;
 		this.logger = logger;
 		this.fields = fields;
-		this.useJitMapper = useJitMapper;
 		this.customResultMapper = customResultMapper;
 		this.generatedIds = generatedIds;
 		this.returningIds = returningIds;
 		this.isRqbV2Query = isRqbV2Query;
-		this.rqbConfig = rqbConfig;
 	}
 	async execute(placeholderValues = {}) {
 		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
-		const params = fillPlaceholders(this.params, placeholderValues);
-		this.logger.logQuery(this.queryString, params);
-		const { fields, client, queryString, rawQuery, query, joinsNotNullableMap, customResultMapper, returningIds, generatedIds } = this;
+		const params = fillPlaceholders(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		const { fields, client, query, rawQueryConfig, queryConfig, joinsNotNullableMap, customResultMapper, returningIds, generatedIds } = this;
 		if (!fields && !customResultMapper) {
-			const res = await this.queryWithCache(queryString, params, async () => {
-				return await client.execute(queryString, params, rawQuery);
+			const res = await this.queryWithCache(query.sql, params, async () => {
+				return await client.execute(query.sql, params, rawQueryConfig);
 			});
 			const insertId = Number.parseFloat(res.insertId);
 			const affectedRows = res.rowsAffected;
@@ -55,18 +49,17 @@ var PlanetScalePreparedQuery = class extends MySqlPreparedQuery {
 			}
 			return res;
 		}
-		const { rows } = await this.queryWithCache(queryString, params, async () => {
-			return await client.execute(queryString, params, query);
+		const { rows } = await this.queryWithCache(query.sql, params, async () => {
+			return await client.execute(query.sql, params, queryConfig);
 		});
 		if (customResultMapper) return customResultMapper(rows);
-		return this.useJitMapper ? (this.jitMapper = this.jitMapper ?? makeJitQueryMapper(fields, joinsNotNullableMap))(rows) : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
+		return rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
 	}
 	async executeRqbV2(placeholderValues = {}) {
-		const params = fillPlaceholders(this.params, placeholderValues);
-		this.logger.logQuery(this.queryString, params);
-		const { client, queryString, rawQuery, customResultMapper } = this;
-		const res = await client.execute(queryString, params, rawQuery);
-		return this.useJitMapper ? (this.jitMapper = this.jitMapper ?? makeRqbJitMapper(this.rqbConfig))(res.rows) : customResultMapper(res.rows);
+		const params = fillPlaceholders(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		const { client, query, rawQueryConfig, customResultMapper } = this;
+		return customResultMapper((await client.execute(query.sql, params, rawQueryConfig)).rows);
 	}
 	iterator(_placeholderValues) {
 		throw new Error("Streaming is not supported by the PlanetScale Serverless driver");
@@ -88,10 +81,10 @@ var PlanetscaleSession = class PlanetscaleSession extends MySqlSession {
 		this.cache = options.cache ?? new NoopCache();
 	}
 	prepareQuery(query, fields, customResultMapper, generatedIds, returningIds, queryMetadata, cacheConfig) {
-		return new PlanetScalePreparedQuery(this.client, query.sql, query.params, this.logger, this.cache, queryMetadata, cacheConfig, fields, this.options.useJitMapper, customResultMapper, generatedIds, returningIds);
+		return new PlanetScalePreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, customResultMapper, generatedIds, returningIds);
 	}
-	prepareRelationalQuery(query, fields, customResultMapper, config, generatedIds, returningIds) {
-		return new PlanetScalePreparedQuery(this.client, query.sql, query.params, this.logger, this.cache, void 0, void 0, fields, this.options.useJitMapper, customResultMapper, generatedIds, returningIds, true, config);
+	prepareRelationalQuery(query, fields, customResultMapper, generatedIds, returningIds) {
+		return new PlanetScalePreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, customResultMapper, generatedIds, returningIds, true);
 	}
 	async query(query, params) {
 		this.logger.logQuery(query, params);

package/planetscale-serverless/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":[],"sources":["../../src/planetscale-serverless/session.ts"],"sourcesContent":["import type { Client, Connection, ExecutedQuery, Transaction } from '@planetscale/database';\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 { Column } from '~/column.ts';\nimport { entityKind, is } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport type { MySqlDialect } from '~/mysql-core/dialect.ts';\nimport type { SelectedFieldsOrdered } from '~/mysql-core/query-builders/select.types.ts';\nimport {\n\tMySqlPreparedQuery,\n\ttype MySqlPreparedQueryConfig,\n\ttype MySqlPreparedQueryHKT,\n\ttype MySqlQueryResultHKT,\n\tMySqlSession,\n\tMySqlTransaction,\n} from '~/mysql-core/session.ts';\nimport {\n\ttype AnyRelations,\n\tmakeRqbJitMapper,\n\ttype RelationalQueryMapperConfig,\n\ttype RelationalRowsMapper,\n} from '~/relations.ts';\nimport { fillPlaceholders, type Query, type SQL, sql } from '~/sql/sql.ts';\nimport { type Assume, makeJitQueryMapper, mapResultRow, type RowsMapper } from '~/utils.ts';\n\nexport class PlanetScalePreparedQuery<T extends MySqlPreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends MySqlPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'PlanetScalePreparedQuery';\n\tprivate jitMapper?: RowsMapper<T['execute']> | RelationalRowsMapper<T['execute']>;\n\n\tprivate rawQuery = { as: 'object' } as const;\n\tprivate query = { as: 'array' } as const;\n\n\tconstructor(\n\t\tprivate client: Client | Transaction | Connection,\n\t\tprivate queryString: string,\n\t\tprivate params: unknown[],\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 useJitMapper: boolean | undefined,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => T['execute'],\n\t\t// Keys that were used in $default and the value that was generated for them\n\t\tprivate generatedIds?: Record<string, unknown>[],\n\t\t// Keys that should be returned, it has the column with all properries + key from object\n\t\tprivate returningIds?: SelectedFieldsOrdered,\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t\tprivate rqbConfig?: RelationalQueryMapperConfig,\n\t) {\n\t\tsuper(cache, queryMetadata, cacheConfig);\n\t}\n\n\tasync execute(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);\n\n\t\tconst params = fillPlaceholders(this.params, placeholderValues);\n\n\t\tthis.logger.logQuery(this.queryString, params);\n\n\t\tconst {\n\t\t\tfields,\n\t\t\tclient,\n\t\t\tqueryString,\n\t\t\trawQuery,\n\t\t\tquery,\n\t\t\tjoinsNotNullableMap,\n\t\t\tcustomResultMapper,\n\t\t\treturningIds,\n\t\t\tgeneratedIds,\n\t\t} = this;\n\t\tif (!fields && !customResultMapper) {\n\t\t\tconst res = await this.queryWithCache(queryString, params, async () => {\n\t\t\t\treturn await client.execute(queryString, params, rawQuery);\n\t\t\t});\n\n\t\t\tconst insertId = Number.parseFloat(res.insertId);\n\t\t\tconst affectedRows = res.rowsAffected;\n\n\t\t\t// for each row, I need to check keys from\n\t\t\tif (returningIds) {\n\t\t\t\tconst returningResponse = [];\n\t\t\t\tlet j = 0;\n\t\t\t\tfor (let i = insertId; i < insertId + affectedRows; i++) {\n\t\t\t\t\tfor (const column of returningIds) {\n\t\t\t\t\t\tconst key = returningIds[0]!.path[0]!;\n\t\t\t\t\t\tif (is(column.field, Column)) {\n\t\t\t\t\t\t\t// @ts-ignore\n\t\t\t\t\t\t\tif (column.field.primary && column.field.autoIncrement) {\n\t\t\t\t\t\t\t\treturningResponse.push({ [key]: i });\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (column.field.defaultFn && generatedIds) {\n\t\t\t\t\t\t\t\t// generatedIds[rowIdx][key]\n\t\t\t\t\t\t\t\treturningResponse.push({ [key]: generatedIds[j]![key] });\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tj++;\n\t\t\t\t}\n\t\t\t\treturn returningResponse;\n\t\t\t}\n\t\t\treturn res;\n\t\t}\n\t\tconst { rows } = await this.queryWithCache(queryString, params, async () => {\n\t\t\treturn await client.execute(queryString, params, query);\n\t\t});\n\n\t\tif (customResultMapper) {\n\t\t\treturn (customResultMapper as (rows: unknown[][]) => T['execute'])(rows as unknown[][]);\n\t\t}\n\n\t\treturn this.useJitMapper\n\t\t\t? (this.jitMapper = this.jitMapper as RowsMapper<T['execute']>\n\t\t\t\t?? makeJitQueryMapper<T['execute']>(fields!, joinsNotNullableMap))(\n\t\t\t\t\trows as unknown[][],\n\t\t\t\t)\n\t\t\t: rows.map((row) => mapResultRow(fields!, row as unknown[], joinsNotNullableMap));\n\t}\n\n\tprivate async executeRqbV2(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tconst params = fillPlaceholders(this.params, placeholderValues);\n\n\t\tthis.logger.logQuery(this.queryString, params);\n\n\t\tconst {\n\t\t\tclient,\n\t\t\tqueryString,\n\t\t\trawQuery,\n\t\t\tcustomResultMapper,\n\t\t} = this;\n\n\t\tconst res = await client.execute(queryString, params, rawQuery);\n\n\t\treturn this.useJitMapper\n\t\t\t? (this.jitMapper = this.jitMapper as RelationalRowsMapper<T['execute']>\n\t\t\t\t?? makeRqbJitMapper<T['execute']>(this.rqbConfig!))(res.rows as any as Record<string, unknown>[])\n\t\t\t: (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(\n\t\t\t\tres.rows as any as Record<string, unknown>[],\n\t\t\t);\n\t}\n\n\toverride iterator(_placeholderValues?: Record<string, unknown>): AsyncGenerator<T['iterator']> {\n\t\tthrow new Error('Streaming is not supported by the PlanetScale Serverless driver');\n\t}\n}\n\nexport interface PlanetscaleSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class PlanetscaleSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends MySqlSession<\n\tMySqlQueryResultHKT,\n\tPlanetScalePreparedQueryHKT,\n\tTFullSchema,\n\tTRelations,\n\tTSchema\n> {\n\tstatic override readonly [entityKind]: string = 'PlanetscaleSession';\n\n\tprivate logger: Logger;\n\tprivate client: Client | Transaction | Connection;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate baseClient: Client | Connection,\n\t\tdialect: MySqlDialect,\n\t\ttx: Transaction | undefined,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tprivate options: PlanetscaleSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.client = tx ?? baseClient;\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends MySqlPreparedQueryConfig = MySqlPreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tgeneratedIds?: Record<string, unknown>[],\n\t\treturningIds?: SelectedFieldsOrdered,\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): MySqlPreparedQuery<T> {\n\t\treturn new PlanetScalePreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery.sql,\n\t\t\tquery.params,\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\tthis.options.useJitMapper,\n\t\t\tcustomResultMapper,\n\t\t\tgeneratedIds,\n\t\t\treturningIds,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends MySqlPreparedQueryConfig = MySqlPreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tcustomResultMapper: (rows: Record<string, unknown>[]) => T['execute'],\n\t\tconfig: RelationalQueryMapperConfig,\n\t\tgeneratedIds?: Record<string, unknown>[],\n\t\treturningIds?: SelectedFieldsOrdered,\n\t): MySqlPreparedQuery<T> {\n\t\treturn new PlanetScalePreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery.sql,\n\t\t\tquery.params,\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\tthis.options.useJitMapper,\n\t\t\tcustomResultMapper,\n\t\t\tgeneratedIds,\n\t\t\treturningIds,\n\t\t\ttrue,\n\t\t\tconfig,\n\t\t);\n\t}\n\n\tasync query(query: string, params: unknown[]): Promise<ExecutedQuery> {\n\t\tthis.logger.logQuery(query, params);\n\n\t\treturn await this.client.execute(query, params, { as: 'array' });\n\t}\n\n\tasync queryObjects(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<ExecutedQuery> {\n\t\treturn this.client.execute(query, params, { as: 'object' });\n\t}\n\n\toverride all<T = unknown>(query: SQL): Promise<T[]> {\n\t\tconst querySql = this.dialect.sqlToQuery(query);\n\t\tthis.logger.logQuery(querySql.sql, querySql.params);\n\n\t\treturn this.client.execute<T>(querySql.sql, querySql.params, { as: 'object' }).then((\n\t\t\teQuery,\n\t\t) => eQuery.rows);\n\t}\n\n\toverride async count(sql: SQL): Promise<number> {\n\t\tconst res = await this.execute<{ rows: [{ count: string }] }>(sql);\n\n\t\treturn Number(\n\t\t\tres['rows'][0]['count'],\n\t\t);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: PlanetScaleTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\treturn this.baseClient.transaction((pstx) => {\n\t\t\tconst session = new PlanetscaleSession(\n\t\t\t\tthis.baseClient,\n\t\t\t\tthis.dialect,\n\t\t\t\tpstx,\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 PlanetScaleTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\t\tthis.dialect,\n\t\t\t\tsession as MySqlSession<any, any, any, any, any>,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t);\n\t\t\treturn transaction(tx);\n\t\t});\n\t}\n}\n\nexport class PlanetScaleTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends MySqlTransaction<\n\tPlanetscaleQueryResultHKT,\n\tPlanetScalePreparedQueryHKT,\n\tTFullSchema,\n\tTRelations,\n\tTSchema\n> {\n\tstatic override readonly [entityKind]: string = 'PlanetScaleTransaction';\n\n\tconstructor(\n\t\tdialect: MySqlDialect,\n\t\tsession: MySqlSession,\n\t\trelations: TRelations,\n\t\tschema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tnestedIndex = 0,\n\t) {\n\t\tsuper(dialect, session, relations, schema, nestedIndex, 'planetscale');\n\t}\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: PlanetScaleTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tconst savepointName = `sp${this.nestedIndex + 1}`;\n\t\tconst tx = new PlanetScaleTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t\tthis.nestedIndex + 1,\n\t\t);\n\t\tawait tx.execute(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tawait tx.execute(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\nexport interface PlanetscaleQueryResultHKT extends MySqlQueryResultHKT {\n\ttype: ExecutedQuery;\n}\n\nexport interface PlanetScalePreparedQueryHKT extends MySqlPreparedQueryHKT {\n\ttype: PlanetScalePreparedQuery<Assume<this['config'], MySqlPreparedQueryConfig>>;\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.js","names":[],"sources":["../../src/planetscale-serverless/session.ts"],"sourcesContent":["import type { Client, Connection, ExecutedQuery, Transaction } from '@planetscale/database';\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 { Column } from '~/column.ts';\nimport { entityKind, is } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport type { MySqlDialect } from '~/mysql-core/dialect.ts';\nimport type { SelectedFieldsOrdered } from '~/mysql-core/query-builders/select.types.ts';\nimport {\n\tMySqlPreparedQuery,\n\ttype MySqlPreparedQueryConfig,\n\ttype MySqlPreparedQueryHKT,\n\ttype MySqlQueryResultHKT,\n\tMySqlSession,\n\tMySqlTransaction,\n} from '~/mysql-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { fillPlaceholders, type Query, type SQL, sql } from '~/sql/sql.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\n\nexport class PlanetScalePreparedQuery<T extends MySqlPreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends MySqlPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'PlanetScalePreparedQuery';\n\n\tprivate rawQueryConfig = { as: 'object' } as const;\n\tprivate queryConfig = { as: 'array' } as const;\n\n\tconstructor(\n\t\tprivate client: Client | Transaction | Connection,\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 customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => T['execute'],\n\t\t// Keys that were used in $default and the value that was generated for them\n\t\tprivate generatedIds?: Record<string, unknown>[],\n\t\t// Keys that should be returned, it has the column with all properries + key from object\n\t\tprivate returningIds?: SelectedFieldsOrdered,\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t) {\n\t\tsuper(query, cache, queryMetadata, cacheConfig);\n\t}\n\n\tasync execute(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);\n\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst {\n\t\t\tfields,\n\t\t\tclient,\n\t\t\tquery,\n\t\t\trawQueryConfig,\n\t\t\tqueryConfig,\n\t\t\tjoinsNotNullableMap,\n\t\t\tcustomResultMapper,\n\t\t\treturningIds,\n\t\t\tgeneratedIds,\n\t\t} = this;\n\t\tif (!fields && !customResultMapper) {\n\t\t\tconst res = await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\treturn await client.execute(query.sql, params, rawQueryConfig);\n\t\t\t});\n\n\t\t\tconst insertId = Number.parseFloat(res.insertId);\n\t\t\tconst affectedRows = res.rowsAffected;\n\n\t\t\t// for each row, I need to check keys from\n\t\t\tif (returningIds) {\n\t\t\t\tconst returningResponse = [];\n\t\t\t\tlet j = 0;\n\t\t\t\tfor (let i = insertId; i < insertId + affectedRows; i++) {\n\t\t\t\t\tfor (const column of returningIds) {\n\t\t\t\t\t\tconst key = returningIds[0]!.path[0]!;\n\t\t\t\t\t\tif (is(column.field, Column)) {\n\t\t\t\t\t\t\t// @ts-ignore\n\t\t\t\t\t\t\tif (column.field.primary && column.field.autoIncrement) {\n\t\t\t\t\t\t\t\treturningResponse.push({ [key]: i });\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (column.field.defaultFn && generatedIds) {\n\t\t\t\t\t\t\t\t// generatedIds[rowIdx][key]\n\t\t\t\t\t\t\t\treturningResponse.push({ [key]: generatedIds[j]![key] });\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tj++;\n\t\t\t\t}\n\t\t\t\treturn returningResponse;\n\t\t\t}\n\t\t\treturn res;\n\t\t}\n\t\tconst { rows } = await this.queryWithCache(query.sql, params, async () => {\n\t\t\treturn await client.execute(query.sql, params, queryConfig);\n\t\t});\n\n\t\tif (customResultMapper) {\n\t\t\treturn (customResultMapper as (rows: unknown[][]) => T['execute'])(rows as unknown[][]);\n\t\t}\n\n\t\treturn rows.map((row) => mapResultRow<T['execute']>(fields!, row as unknown[], joinsNotNullableMap));\n\t}\n\n\tprivate async executeRqbV2(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst {\n\t\t\tclient,\n\t\t\tquery,\n\t\t\trawQueryConfig,\n\t\t\tcustomResultMapper,\n\t\t} = this;\n\n\t\tconst res = await client.execute(query.sql, params, rawQueryConfig);\n\n\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(\n\t\t\tres.rows as any as Record<string, unknown>[],\n\t\t);\n\t}\n\n\toverride iterator(_placeholderValues?: Record<string, unknown>): AsyncGenerator<T['iterator']> {\n\t\tthrow new Error('Streaming is not supported by the PlanetScale Serverless driver');\n\t}\n}\n\nexport interface PlanetscaleSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class PlanetscaleSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends MySqlSession<\n\tMySqlQueryResultHKT,\n\tPlanetScalePreparedQueryHKT,\n\tTFullSchema,\n\tTRelations,\n\tTSchema\n> {\n\tstatic override readonly [entityKind]: string = 'PlanetscaleSession';\n\n\tprivate logger: Logger;\n\tprivate client: Client | Transaction | Connection;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate baseClient: Client | Connection,\n\t\tdialect: MySqlDialect,\n\t\ttx: Transaction | undefined,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tprivate options: PlanetscaleSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.client = tx ?? baseClient;\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends MySqlPreparedQueryConfig = MySqlPreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tgeneratedIds?: Record<string, unknown>[],\n\t\treturningIds?: SelectedFieldsOrdered,\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): MySqlPreparedQuery<T> {\n\t\treturn new PlanetScalePreparedQuery(\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\tcustomResultMapper,\n\t\t\tgeneratedIds,\n\t\t\treturningIds,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends MySqlPreparedQueryConfig = MySqlPreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tcustomResultMapper: (rows: Record<string, unknown>[]) => T['execute'],\n\t\tgeneratedIds?: Record<string, unknown>[],\n\t\treturningIds?: SelectedFieldsOrdered,\n\t): MySqlPreparedQuery<T> {\n\t\treturn new PlanetScalePreparedQuery(\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\tcustomResultMapper,\n\t\t\tgeneratedIds,\n\t\t\treturningIds,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\tasync query(query: string, params: unknown[]): Promise<ExecutedQuery> {\n\t\tthis.logger.logQuery(query, params);\n\n\t\treturn await this.client.execute(query, params, { as: 'array' });\n\t}\n\n\tasync queryObjects(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<ExecutedQuery> {\n\t\treturn this.client.execute(query, params, { as: 'object' });\n\t}\n\n\toverride all<T = unknown>(query: SQL): Promise<T[]> {\n\t\tconst querySql = this.dialect.sqlToQuery(query);\n\t\tthis.logger.logQuery(querySql.sql, querySql.params);\n\n\t\treturn this.client.execute<T>(querySql.sql, querySql.params, { as: 'object' }).then((\n\t\t\teQuery,\n\t\t) => eQuery.rows);\n\t}\n\n\toverride async count(sql: SQL): Promise<number> {\n\t\tconst res = await this.execute<{ rows: [{ count: string }] }>(sql);\n\n\t\treturn Number(\n\t\t\tres['rows'][0]['count'],\n\t\t);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: PlanetScaleTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\treturn this.baseClient.transaction((pstx) => {\n\t\t\tconst session = new PlanetscaleSession(\n\t\t\t\tthis.baseClient,\n\t\t\t\tthis.dialect,\n\t\t\t\tpstx,\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 PlanetScaleTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\t\tthis.dialect,\n\t\t\t\tsession as MySqlSession<any, any, any, any, any>,\n\t\t\t\tthis.relations,\n\t\t\t\tthis.schema,\n\t\t\t);\n\t\t\treturn transaction(tx);\n\t\t});\n\t}\n}\n\nexport class PlanetScaleTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends MySqlTransaction<\n\tPlanetscaleQueryResultHKT,\n\tPlanetScalePreparedQueryHKT,\n\tTFullSchema,\n\tTRelations,\n\tTSchema\n> {\n\tstatic override readonly [entityKind]: string = 'PlanetScaleTransaction';\n\n\tconstructor(\n\t\tdialect: MySqlDialect,\n\t\tsession: MySqlSession,\n\t\trelations: TRelations,\n\t\tschema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tnestedIndex = 0,\n\t) {\n\t\tsuper(dialect, session, relations, schema, nestedIndex, 'planetscale');\n\t}\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: PlanetScaleTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tconst savepointName = `sp${this.nestedIndex + 1}`;\n\t\tconst tx = new PlanetScaleTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t\tthis.nestedIndex + 1,\n\t\t);\n\t\tawait tx.execute(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tawait tx.execute(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\nexport interface PlanetscaleQueryResultHKT extends MySqlQueryResultHKT {\n\ttype: ExecutedQuery;\n}\n\nexport interface PlanetScalePreparedQueryHKT extends MySqlPreparedQueryHKT {\n\ttype: PlanetScalePreparedQuery<Assume<this['config'], MySqlPreparedQueryConfig>>;\n}\n"],"mappings":"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"}

package/postgres-js/driver.cjs

@@ -2,10 +2,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 const require_postgres_js_session = require('./session.cjs');
 let __entity_ts = require("../entity.cjs");
+let ___relations_ts = require("../_relations.cjs");
+___relations_ts = require_runtime.__toESM(___relations_ts);
 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 postgres = require("postgres");
 postgres = require_runtime.__toESM(postgres);
@@ -14,114 +14,6 @@ postgres = require_runtime.__toESM(postgres);
 var PostgresJsDatabase = class extends __pg_core_async_db_ts.PgAsyncDatabase {
 	static [__entity_ts.entityKind] = "PostgresJsDatabase";
 };
-const postgresJsCodecs = (0, __pg_core_codecs_ts.refineGenericPgCodecs)({
-	interval: {
-		castArray: void 0,
-		normalizeParamArray: __pg_core_array_ts.makePgArray
-	},
-	point: {
-		cast: void 0,
-		castArray: void 0,
-		castInJson: void 0,
-		castArrayInJson: void 0,
-		normalizeParamArray: __pg_core_array_ts.makePgArray
-	},
-	line: {
-		cast: void 0,
-		castArray: void 0,
-		castInJson: void 0,
-		castArrayInJson: void 0,
-		normalizeParamArray: __pg_core_array_ts.makePgArray
-	},
-	macaddr8: {
-		castArray: void 0,
-		castArrayInJson: void 0,
-		normalizeParamArray: __pg_core_array_ts.makePgArray
-	},
-	json: { normalizeParam: (v) => JSON.stringify(v) },
-	jsonb: { normalizeParam: (v) => JSON.stringify(v) },
-	bit: {
-		normalizeParamArray: __pg_core_array_ts.makePgArray,
-		normalizeArray: void 0
-	},
-	bool: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	box: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	box2d: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	box3d: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	char: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	cidr: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	circle: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	datemultirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	daterange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	float8: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	geography: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	halfvec: {
-		normalizeParamArray: __pg_core_array_ts.makePgArray,
-		normalizeArray: void 0
-	},
-	inet: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	int4multirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	int4range: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	int8multirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	int8range: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	lseg: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	macaddr: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	money: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	nummultirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	numrange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	oid: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	path: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	polygon: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	raster: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	regclass: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	regconfig: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	regdictionary: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	regnamespace: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	regoper: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	regoperator: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	regproc: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	regprocedure: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	regrole: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	regtype: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	serial: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	smallint: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	smallserial: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	sparsevec: {
-		normalizeParamArray: __pg_core_array_ts.makePgArray,
-		normalizeArray: void 0
-	},
-	text: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	time: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	timetz: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	tsmultirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	tsquery: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	tsrange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	tstzmultirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	tstzrange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	tsvector: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	varbit: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	varchar: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	vector: {
-		normalizeParamArray: __pg_core_array_ts.makePgArray,
-		normalizeArray: void 0
-	},
-	xml: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	bytea: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	enum: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	geometry: {
-		normalizeArray: void 0,
-		normalizeParamArray: __pg_core_array_ts.makePgArray
-	},
-	numeric: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	bigint: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	bigserial: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	float4: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	int: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	uuid: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	date: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	timestamp: { normalizeParamArray: __pg_core_array_ts.makePgArray },
-	timestamptz: { normalizeParamArray: __pg_core_array_ts.makePgArray }
-});
 function construct(client, config = {}) {
 	const transparentParser = (val) => val;
 	for (const type of [
@@ -139,20 +31,24 @@ function construct(client, config = {}) {
 	}
 	client.options.serializers["114"] = transparentParser;
 	client.options.serializers["3802"] = transparentParser;
-	const dialect = new __pg_core_dialect_ts.PgDialect({
-		casing: config.casing,
-		useJitMappers: config.useJitMappers,
-		codecs: config.codecs ?? postgresJsCodecs
-	});
+	const dialect = new __pg_core_dialect_ts.PgDialect({ casing: config.casing });
 	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 PostgresJsDatabase(dialect, new require_postgres_js_session.PostgresJsSession(client, dialect, relations, {
+	const db = new PostgresJsDatabase(dialect, new require_postgres_js_session.PostgresJsSession(client, dialect, relations, schema, {
 		logger,
-		cache: config.cache,
-		useJitMapper: config.useJitMappers
-	}), relations);
+		cache: config.cache
+	}), relations, schema);
 	db.$client = client;
 	db.$cache = config.cache;
 	if (db.$cache) db.$cache["invalidate"] = config.cache?.onMutate;
@@ -160,13 +56,13 @@ function construct(client, config = {}) {
 }
 function drizzle(...params) {
 	if (typeof params[0] === "string") return construct((0, postgres.default)(params[0]), params[1]);
-	const { connection, client, ...DrizzlePgConfig } = params[0];
-	if (client) return construct(client, DrizzlePgConfig);
+	const { connection, client, ...drizzleConfig } = params[0];
+	if (client) return construct(client, drizzleConfig);
 	if (typeof connection === "object" && connection.url !== void 0) {
 		const { url, ...config } = connection;
-		return construct((0, postgres.default)(url, config), DrizzlePgConfig);
+		return construct((0, postgres.default)(url, config), drizzleConfig);
 	}
-	return construct((0, postgres.default)(connection), DrizzlePgConfig);
+	return construct((0, postgres.default)(connection), drizzleConfig);
 }
 (function(_drizzle) {
 	function mock(config) {
@@ -186,5 +82,4 @@ Object.defineProperty(exports, 'drizzle', {
     return drizzle;
   }
 });
-exports.postgresJsCodecs = postgresJsCodecs;
 //# sourceMappingURL=driver.cjs.map

package/postgres-js/driver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"driver.cjs","names":["PgAsyncDatabase","entityKind","makePgArray","PgDialect","DefaultLogger","PostgresJsSession"],"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":"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"}
+{"version":3,"file":"driver.cjs","names":["PgAsyncDatabase","entityKind","PgDialect","DefaultLogger","V1","PostgresJsSession"],"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,cAGUA,sCAA+D;CACxE,QAA0BC,0BAAsB;;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,IAAIC,+BAAU,EAAE,QAAQ,OAAO,QAAQ,CAAC;CACxD,IAAI;AACJ,KAAI,OAAO,WAAW,KACrB,UAAS,IAAIC,2BAAe;UAClB,OAAO,WAAW,MAC5B,UAAS,OAAO;CAGjB,IAAI;AACJ,KAAI,OAAO,QAAQ;EAClB,MAAM,eAAeC,gBAAG,8BACvB,OAAO,QACPA,gBAAG,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,IAAIC,8CAAkB,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,gCAFmB,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,gCADmB,KAAK,OAAO,EACX,cAAc;;AAI1C,QAAO,gCADmB,WAAW,EACV,cAAc;;;CAIlC,SAAS,KAIf,QAGC;AACD,SAAO,UAAU,EAChB,SAAS;GACR,SAAS,EAAE;GACX,aAAa,EAAE;GACf,EACD,EAAS,OAAO"}

package/postgres-js/driver.d.cts

@@ -1,32 +1,28 @@
-import { PartialWithUndefined } from "../utils.cjs";
-import { Codec } from "../codecs.cjs";
 import { PostgresJsQueryResultHKT } from "./session.cjs";
 import { entityKind } from "../entity.cjs";
+import { DrizzleConfig } from "../utils.cjs";
 import { AnyRelations, EmptyRelations } from "../relations.cjs";
-import * as __pg_core_codecs_ts0 from "../pg-core/codecs.cjs";
 import { PgAsyncDatabase } from "../pg-core/async/db.cjs";
-import { DrizzlePgConfig } from "../pg-core/utils.cjs";
 import { Options, PostgresType, Sql } from "postgres";
 
 //#region src/postgres-js/driver.d.ts
-declare class PostgresJsDatabase<TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<PostgresJsQueryResultHKT, TRelations> {
+declare class PostgresJsDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<PostgresJsQueryResultHKT, TSchema, TRelations> {
   static readonly [entityKind]: string;
 }
-declare const postgresJsCodecs: PartialWithUndefined<Record<__pg_core_codecs_ts0.PostgresType, Codec>>;
-declare function drizzle<TRelations extends AnyRelations = EmptyRelations, TClient extends Sql = Sql>(...params: [string] | [string, DrizzlePgConfig<TRelations>] | [(DrizzlePgConfig<TRelations> & ({
+declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations, TClient extends Sql = Sql>(...params: [string] | [string, DrizzleConfig<TSchema, TRelations>] | [(DrizzleConfig<TSchema, TRelations> & ({
   connection: string | ({
     url?: string;
   } & Options<Record<string, PostgresType>>);
 } | {
   client: TClient;
-}))]): PostgresJsDatabase<TRelations> & {
+}))]): PostgresJsDatabase<TSchema, TRelations> & {
   $client: TClient;
 };
 declare namespace drizzle {
-  function mock<TRelations extends AnyRelations = EmptyRelations>(config?: DrizzlePgConfig<TRelations>): PostgresJsDatabase<TRelations> & {
+  function mock<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(config?: DrizzleConfig<TSchema, TRelations>): PostgresJsDatabase<TSchema, TRelations> & {
     $client: '$client is not available on drizzle.mock()';
   };
 }
 //#endregion
-export { PostgresJsDatabase, drizzle, postgresJsCodecs };
+export { PostgresJsDatabase, drizzle };
 //# sourceMappingURL=driver.d.cts.map

package/postgres-js/driver.d.ts

@@ -1,32 +1,28 @@
-import { PartialWithUndefined } from "../utils.js";
-import { Codec } from "../codecs.js";
 import { PostgresJsQueryResultHKT } from "./session.js";
 import { entityKind } from "../entity.js";
-import { AnyRelations, EmptyRelations } from "../relations.js";
+import { DrizzleConfig } from "../utils.js";
 import { PgAsyncDatabase } from "../pg-core/async/db.js";
-import * as __pg_core_codecs_ts0 from "../pg-core/codecs.js";
+import { AnyRelations, EmptyRelations } from "../relations.js";
 import { Options, PostgresType, Sql } from "postgres";
-import { DrizzlePgConfig } from "../pg-core/utils.js";
 
 //#region src/postgres-js/driver.d.ts
-declare class PostgresJsDatabase<TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<PostgresJsQueryResultHKT, TRelations> {
+declare class PostgresJsDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<PostgresJsQueryResultHKT, TSchema, TRelations> {
   static readonly [entityKind]: string;
 }
-declare const postgresJsCodecs: PartialWithUndefined<Record<__pg_core_codecs_ts0.PostgresType, Codec>>;
-declare function drizzle<TRelations extends AnyRelations = EmptyRelations, TClient extends Sql = Sql>(...params: [string] | [string, DrizzlePgConfig<TRelations>] | [(DrizzlePgConfig<TRelations> & ({
+declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations, TClient extends Sql = Sql>(...params: [string] | [string, DrizzleConfig<TSchema, TRelations>] | [(DrizzleConfig<TSchema, TRelations> & ({
   connection: string | ({
     url?: string;
   } & Options<Record<string, PostgresType>>);
 } | {
   client: TClient;
-}))]): PostgresJsDatabase<TRelations> & {
+}))]): PostgresJsDatabase<TSchema, TRelations> & {
   $client: TClient;
 };
 declare namespace drizzle {
-  function mock<TRelations extends AnyRelations = EmptyRelations>(config?: DrizzlePgConfig<TRelations>): PostgresJsDatabase<TRelations> & {
+  function mock<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(config?: DrizzleConfig<TSchema, TRelations>): PostgresJsDatabase<TSchema, TRelations> & {
     $client: '$client is not available on drizzle.mock()';
   };
 }
 //#endregion
-export { PostgresJsDatabase, drizzle, postgresJsCodecs };
+export { PostgresJsDatabase, drizzle };
 //# sourceMappingURL=driver.d.ts.map