@shivaedev/sql 0.46.3 → 0.47.0

package/dist/transact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transact.d.ts","sourceRoot":"","sources":["../src/transact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAc,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,KAAK,YAAY,IAAI,UAAU,EAAe,MAAM,+BAA+B,CAAC;AAC7F,OAAO,EAAoB,KAAK,QAAQ,EAAc,MAAM,+BAA+B,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAG7D,MAAM,MAAM,gBAAgB,GAAG,SAAS,OAAO,EAAE,GAAG,cAAc,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC;AAE/F,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC1C;AAED,KAAK,QAAQ,GAAG,SAAS,CAAC,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC;AAE5D,eAAO,MAAM,cAAc,sCAA4G,CAAC;AACxI,eAAO,MAAM,YAAY,4DAEvB,CAAC;AACH,eAAO,MAAM,aAAa,2DAExB,CAAC;AA8CH,eAAO,MAAM,kBAAkB,6GAI7B,CAAC;AAEH,MAAM,WAAW,eAAe,CAAC,MAAM;IACtC,QAAQ,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,MAAM,CAAC;CACjD;AAED,eAAO,MAAM,QAAQ,EAAE;IACtB,CAAC,MAAM,EACN,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,GAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IACjJ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,GAC9B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;CAkBpG,CAAC"}
+{"version":3,"file":"transact.d.ts","sourceRoot":"","sources":["../src/transact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAc,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,KAAK,YAAY,IAAI,UAAU,EAAe,MAAM,+BAA+B,CAAC;AAC7F,OAAO,EAAoB,KAAK,QAAQ,EAAc,MAAM,+BAA+B,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAG7D,MAAM,MAAM,gBAAgB,GAAG,SAAS,OAAO,EAAE,GAAG,cAAc,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC;AAE/F,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC1C;AAED,KAAK,QAAQ,GAAG,SAAS,CAAC,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC;AAE5D,eAAO,MAAM,cAAc,sCAA4G,CAAC;AACxI,eAAO,MAAM,YAAY,4DAEvB,CAAC;AACH,eAAO,MAAM,aAAa,2DAExB,CAAC;AA8CH,eAAO,MAAM,kBAAkB,6GAI7B,CAAC;AAEH,MAAM,WAAW,eAAe,CAAC,MAAM;IACtC,QAAQ,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,MAAM,CAAC;CACjD;AAED,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;AAEhG,eAAO,MAAM,QAAQ,EAAE;IACtB,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC;IAChF,CAAC,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;IACzI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;CAkBrI,CAAC"}

package/dist/transact.js

@@ -56,13 +56,17 @@ export const invalidateOnCommit = Effect.fn("Transact.invalidateOnCommit")(funct
         .record(flatten(keys).map((key) => ({ key, publication: options?.publication ?? "shared" })))
         .pipe(Effect.provideService(invalidations.Observer, observe));
 });
-export const transact = dual(2, Effect.fn("Transact.transact")(function* (effect, options) {
+export const transact = dual((args) => Effect.isEffect(args[0]), Effect.fn("Transact.transact")(function* (effect, options) {
     const sql = yield* SqlClient.SqlClient;
     const native = yield* Effect.serviceOption(sql.transactionService);
-    return yield* invalidations
+    const transacted = invalidations
         .within((body, boundary) => native._tag === "Some"
         ? sql.withTransaction(body)
         : boundary.restore(sql.withTransaction(Effect.tap(body, () => sql.afterCommit(boundary.committed)))))(effect)
-        .pipe(Effect.provideService(invalidations.Observer, observe), Effect.provideService(invalidations.CommittedSink, committed), Effect.catchIf(isSqlError, (error) => Effect.fail(options.onSqlError(error))));
+        .pipe(Effect.provideService(invalidations.Observer, observe), Effect.provideService(invalidations.CommittedSink, committed));
+    if (options === undefined) {
+        return yield* transacted;
+    }
+    return yield* Effect.catchIf(transacted, isSqlError, (error) => Effect.fail(options.onSqlError(error)));
 }));
 //# sourceMappingURL=transact.js.map

package/dist/transact.js.map

@@ -1 +1 @@
-{"version":3,"file":"transact.js","sourceRoot":"","sources":["../src/transact.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transact.js","sourceRoot":"","sources":["../src/transact.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/sql",
-  "version": "0.46.3",
+  "version": "0.47.0",
   "description": "Schema-derived repositories over native Effect SQL",
   "keywords": [
     "effect"
@@ -43,27 +43,27 @@
     "README.md"
   ],
   "dependencies": {
-    "@shivaedev/changes": "0.11.1",
-    "@shivaedev/service": "0.8.2"
+    "@shivaedev/changes": "0.12.0",
+    "@shivaedev/service": "0.9.1"
   },
   "devDependencies": {
-    "@effect/platform-node": "4.1.1",
-    "@effect/sql-pg": "4.1.1",
-    "@effect/sql-sqlite-node": "4.1.1",
-    "@shivaedev/contract": "0.43.2",
-    "@shivaedev/jobs": "0.41.4",
-    "@shivaedev/quality": "0.73.1",
-    "@shivaedev/test-kits": "0.10.5",
-    "@shivaedev/test-sql": "0.24.7",
-    "@shivaedev/test-story": "0.45.4",
+    "@effect/platform-node": "4.1.2",
+    "@effect/sql-pg": "4.1.2",
+    "@effect/sql-sqlite-node": "4.1.2",
+    "@shivaedev/contract": "0.44.0",
+    "@shivaedev/jobs": "0.42.2",
+    "@shivaedev/quality": "0.77.0",
+    "@shivaedev/test-kits": "0.12.0",
+    "@shivaedev/test-sql": "0.24.9",
+    "@shivaedev/test-story": "0.47.0",
     "@types/node": "24.19.2",
-    "effect": "4.1.1",
+    "effect": "4.1.2",
     "typescript": "7.0.2",
-    "vitest": "5.0.5"
+    "vitest": "5.1.0"
   },
   "peerDependencies": {
-    "@effect/sql-pg": "4.1.1",
-    "effect": "4.1.1"
+    "@effect/sql-pg": "4.1.2",
+    "effect": "4.1.2"
   },
   "peerDependenciesMeta": {
     "@effect/sql-pg": {

package/src/backfillPostgres.ts

@@ -38,7 +38,7 @@ export const backfillPostgres = Effect.fn("Sql.backfillPostgres")(function* <TRo
 				yield* options.saveProgress(last, progress);
 			}
 			return rows.length;
-		}).pipe(transact({ onSqlError: (error) => error }));
+		}).pipe(transact());
 		processed += count;
 		if (count === 0) {
 			return processed;

package/src/compositeRepository.ts

@@ -5,6 +5,7 @@ import { SqlClient, SqlSchema } from "effect/sql";
 import type { SqlError } from "effect/sql/SqlError";
 import { storageSchema } from "#adapters/storageSchema.ts";
 import type { BatchedDelete } from "#batchedDelete.ts";
+import type { RecordRead } from "#recordRepositoryRead.ts";
 import type { RepositoryChanges } from "#repositoryChanges.ts";
 import type { RepositoryListFilter } from "#repositoryFilter.ts";
 import type { Update, UpdateVoid } from "#repositoryUpdate.ts";
@@ -47,6 +48,7 @@ export const makeCompositeCrud = Effect.fnUntraced(function* (
 	model: Model.Any,
 	options: {
 		readonly columns: readonly string[];
+		readonly recordRead: RecordRead;
 		readonly tableName: string;
 		readonly spanPrefix: string;
 	},
@@ -54,7 +56,7 @@ export const makeCompositeCrud = Effect.fnUntraced(function* (
 ) {
 	const sql = yield* SqlClient.SqlClient;
 	const nameTransforms = yield* sqlNameTransforms;
-	const { columns, tableName, spanPrefix } = options;
+	const { columns, recordRead, tableName, spanPrefix } = options;
 	const entries: [string, Schema.Constraint][] = [];
 	for (const column of columns) {
 		const field = model.fields[column];
@@ -84,6 +86,11 @@ export const makeCompositeCrud = Effect.fnUntraced(function* (
 
 	return {
 		...(yield* repositoryWrites(model, { ...options, idColumns: columns }, changes)),
-		findById: (id: unknown) => find(id).pipe(Effect.withSpan(`${spanPrefix}.findById`)),
+		findById: (id: unknown) =>
+			record(columns.length === 1 ? { [columns[0] ?? ""]: id } : id).pipe(
+				Effect.flatMap(recordRead),
+				Effect.andThen(find(id)),
+				Effect.withSpan(`${spanPrefix}.findById`),
+			),
 	};
 });

package/src/databaseAddress.ts

@@ -1,25 +1,43 @@
 import type { PgPoolConfig } from "@effect/sql-pg/PgClient";
 import { Redacted } from "effect";
 
+function isDecodableHost(hostname: string): boolean {
+	const runs = hostname.match(/(?:%[\da-f]{2})+/giu) ?? [];
+	if (hostname.replace(/(?:%[\da-f]{2})+/giu, "").includes("%")) {
+		return false;
+	}
+	const encoder = new TextEncoder();
+	const decoder = new TextDecoder();
+	return runs.every((run) => {
+		const bytes = Uint8Array.from(run.match(/[\da-f]{2}/giu) ?? [], (byte) => Number.parseInt(byte, 16));
+		const decoded = encoder.encode(decoder.decode(bytes));
+		return decoded.length === bytes.length && decoded.every((byte, index) => byte === bytes[index]);
+	});
+}
+
 export function databaseAddress(value: Redacted.Redacted<string>): Pick<PgPoolConfig, "host" | "port"> {
-	try {
-		const url = new URL(Redacted.value(value));
-		if (url.protocol !== "postgres:" && url.protocol !== "postgresql:") {
-			return {};
-		}
-		const hostname = url.hostname.startsWith("[") ? url.hostname.slice(1, -1) : decodeURIComponent(url.hostname);
-		// PgConnection applies query parameters in order, after the authority.
-		const host = url.searchParams.getAll("host").at(-1) ?? hostname;
-		const rawPort = url.searchParams.getAll("port").at(-1) ?? url.port;
-		const port = rawPort === "" ? undefined : Number(rawPort);
-		if (host.includes(",") || (port !== undefined && (!Number.isInteger(port) || port < 1 || port > 65_535))) {
-			return {};
-		}
-		return {
-			...(host === "" && !url.searchParams.has("host") ? {} : { host }),
-			...(port === undefined ? {} : { port }),
-		};
-	} catch {
+	const address = Redacted.value(value);
+	if (!URL.canParse(address)) {
+		return {};
+	}
+	const url = new URL(address);
+	if (url.protocol !== "postgres:" && url.protocol !== "postgresql:") {
+		return {};
+	}
+	const rawHostname = url.hostname.startsWith("[") ? url.hostname.slice(1, -1) : url.hostname;
+	if (!isDecodableHost(rawHostname)) {
+		return {};
+	}
+	const hostname = decodeURIComponent(rawHostname);
+	// PgConnection applies query parameters in order, after the authority.
+	const host = url.searchParams.getAll("host").at(-1) ?? hostname;
+	const rawPort = url.searchParams.getAll("port").at(-1) ?? url.port;
+	const port = rawPort === "" ? undefined : Number(rawPort);
+	if (host.includes(",") || (port !== undefined && (!Number.isInteger(port) || port < 1 || port > 65_535))) {
 		return {};
 	}
+	return {
+		...(host === "" && !url.searchParams.has("host") ? {} : { host }),
+		...(port === undefined ? {} : { port }),
+	};
 }

package/src/deleteGroupsBatched.ts

@@ -35,7 +35,6 @@ export const deleteGroupsBatched = Effect.fn("Sql.deleteGroupsBatched")(function
 				}
 				return { count, done: candidates.length === 0 };
 			}),
-			{ onSqlError: (error) => error },
 		),
 	).pipe(Effect.scoped);
 });

package/src/makeAggregate.ts

@@ -6,15 +6,16 @@ import type { Fragment } from "effect/sql/Statement";
 import { aggregateColumn } from "#aggregateColumn.ts";
 import type { Aggregate } from "#aggregateQuery.ts";
 import { makeQueryClauses } from "#makeQueryClauses.ts";
+import type { RecordRead } from "#recordRepositoryRead.ts";
 import { type FindManyFilter, makeFilter } from "#repositoryFilter.ts";
 
 export function makeAggregate<TModel extends Model.Any>(
 	model: TModel,
-	options: { readonly tableName: string; readonly spanPrefix: string },
+	options: { readonly recordRead: RecordRead; readonly tableName: string; readonly spanPrefix: string },
 ): Effect.Effect<Aggregate<TModel>, never, SqlClient.SqlClient>;
 export function makeAggregate(
 	model: Model.Any,
-	options: { readonly tableName: string; readonly spanPrefix: string },
+	options: { readonly recordRead: RecordRead; readonly tableName: string; readonly spanPrefix: string },
 ): Effect.Effect<unknown, never, SqlClient.SqlClient> {
 	return Effect.fnUntraced(function* () {
 		const sql = yield* SqlClient.SqlClient;
@@ -56,6 +57,7 @@ export function makeAggregate(
 				const predicate = yield* where(query.where, true, true);
 				const order = yield* clauses.orderClause(query.orderBy);
 				const limit = yield* clauses.limitClause(query.limit);
+				yield* options.recordRead(query.where);
 				const partitions = sql.csv(groups.map((key) => sql`${sql(key)}`));
 				const rows =
 					yield* sql`select ${sql.csv(columns)} from ${sql(options.tableName)} where ${predicate} group by ${partitions} ${order} ${limit}`;

package/src/migrations.ts

@@ -78,7 +78,7 @@ export const migratePostgres = Effect.fn("EffectSql.migratePostgres")(function*
 			}
 		}
 		return yield* migrate({ loader: Effect.succeed(current), table });
-	}).pipe(transact({ onSqlError: (error) => error }), Effect.provideService(Reactivity.Reactivity, reactivity));
+	}).pipe(transact(), Effect.provideService(Reactivity.Reactivity, reactivity));
 	const schemaComponents: readonly SchemaComponent<R, E | SqlError | Schema.SchemaError>[] = [
 		...components,
 		...(release === undefined ? [] : [postgresRelease(release, table)]),

package/src/postgresChanges.ts

@@ -59,7 +59,7 @@ export function postgresChanges(options: PostgresChangesOptions) {
 			const publication: CommandPublisher = {
 				publish: (keys) =>
 					invalidateOnCommit(keys).pipe(
-						transact({ onSqlError: (error) => error }),
+						transact(),
 						Effect.provideService(SqlClient.SqlClient, options.client),
 						Effect.catchCause((cause) => Effect.fail(new CommandPublicationError({ cause }))),
 					),

package/src/readSql.ts

@@ -0,0 +1,51 @@
+import { Data, Effect, Schema } from "effect";
+import { SqlClient } from "effect/sql";
+import { type Composite, type CompositeBucketKey, type CompositeItemKey, isComposite } from "@shivaedev/changes/compositeKeys.ts";
+import { type BucketKey, type ItemKey, Key, recordKey } from "@shivaedev/changes/keys.ts";
+import { recordRead } from "@shivaedev/changes/readRecorder.ts";
+
+export class MultiColumnKeyParameter extends Data.TaggedError("MultiColumnKeyParameter")<{
+	readonly key: CompositeBucketKey | CompositeItemKey;
+}> {
+	override get message() {
+		const named =
+			this.key._tag === "Bucket"
+				? `the tuple bucket ${this.key.collection}.${this.key.field} ${this.key.value}`
+				: `the composite row ${recordKey(this.key.collection, this.key.id)}`;
+		return `readSql cannot bind ${named} as one parameter, because it spans several columns. Bind each column's value and declare the key in the query's reads.`;
+	}
+}
+
+type Refused<TArgs extends readonly unknown[]> = {
+	readonly [TIndex in keyof TArgs]: TArgs[TIndex] extends { readonly [Composite]: true }
+		? "A tuple bucket or composite row key spans several columns, so it cannot be one parameter"
+		: TArgs[TIndex];
+};
+
+const isKey = Schema.is(Key);
+
+function isReadKey(value: unknown): value is BucketKey | ItemKey {
+	return isKey(value) && value._tag !== "List";
+}
+
+function bound(value: unknown) {
+	if (!isReadKey(value)) {
+		return value;
+	}
+	return value._tag === "Bucket" ? value.value : value.id;
+}
+
+const readMarked = Effect.fn("Sql.readMarked")(function* (strings: TemplateStringsArray, args: readonly unknown[]) {
+	const keys = args.filter(isReadKey);
+	const multiColumn = keys.find(isComposite);
+	if (multiColumn !== undefined) {
+		return yield* new MultiColumnKeyParameter({ key: multiColumn });
+	}
+	const sql = yield* SqlClient.SqlClient;
+	yield* recordRead(keys, { inferred: true });
+	return yield* sql(strings, ...args.map(bound));
+});
+
+export function readSql<const TArgs extends readonly unknown[]>(strings: TemplateStringsArray, ...args: TArgs & Refused<TArgs>) {
+	return readMarked(strings, args);
+}

package/src/recordRepositoryRead.ts

@@ -0,0 +1,126 @@
+import { Effect, Schema } from "effect";
+import type { Model } from "effect/schema";
+import { declaredBuckets } from "@shivaedev/changes/buckets.ts";
+import { collection, compositeId, type Identity, type Key } from "@shivaedev/changes/keys.ts";
+import { recordRead } from "@shivaedev/changes/readRecorder.ts";
+import type { RepositoryCollection } from "#repositoryCollection.ts";
+
+type Where = Readonly<Record<string, unknown>>;
+
+export type RecordRead = (where?: Where) => Effect.Effect<void, Schema.SchemaError, unknown>;
+
+const AnyIdentity = Schema.Union([Schema.String, Schema.Number]);
+
+// Each key is its own registration, renewed on every rerun, so a read pinned to more keys listens on a broader bucket instead.
+const MAX_BUCKET_KEYS = 1000;
+
+function isIdentity(value: unknown): value is Identity {
+	return typeof value === "string" || typeof value === "number";
+}
+
+function isPrimitive(value: unknown): value is Identity | bigint | boolean {
+	return isIdentity(value) || typeof value === "bigint" || typeof value === "boolean";
+}
+
+function combinations<T>(columns: readonly (readonly T[])[]): readonly (readonly T[])[] {
+	return columns.reduce<readonly (readonly T[])[]>((rows, values) => rows.flatMap((row) => values.map((value) => [...row, value])), [[]]);
+}
+
+type Pin = readonly [column: string, value: Identity];
+
+interface Bucket {
+	readonly columns: readonly string[];
+	readonly make: (pins: readonly Pin[]) => readonly Key[];
+}
+
+export function makeRecordRead(
+	model: Model.Any,
+	options: { readonly tableName: string; readonly idColumns: readonly string[]; readonly tuples?: RepositoryCollection["tuples"] },
+): RecordRead {
+	const fields = declaredBuckets(model.fields).map(({ field }) => field);
+	const keys = collection(options.tableName, AnyIdentity, Object.fromEntries(fields.map((field) => [field, AnyIdentity])));
+	const tupleKeys = collection(options.tableName, AnyIdentity, {}, options.tuples);
+	const buckets: readonly Bucket[] = [
+		...Object.entries(tupleKeys.tuples).flatMap(([tuple, columns]) => {
+			const make = tupleKeys.bucket[tuple];
+			return make === undefined ? [] : [{ columns, make: (pins: readonly Pin[]) => [make(Object.fromEntries(pins))] }];
+		}),
+		...fields.flatMap((field) => {
+			const make = keys.bucket[field];
+			return make === undefined ? [] : [{ columns: [field], make: (pins: readonly Pin[]) => pins.map(([, value]) => make(value)) }];
+		}),
+	];
+	function pinned(where: Where, column: string): readonly unknown[] | undefined {
+		const field = model.fields[column];
+		const value = where[column];
+		if (field === undefined || value === undefined || value === null) {
+			return undefined;
+		}
+		const acceptsValue: (input: unknown) => boolean = Schema.is(field);
+		if (acceptsValue(value)) {
+			return [value];
+		}
+		return typeof value === "object" && "in" in value && Array.isArray(value.in) && value.in.every((entry) => entry !== null && entry !== undefined)
+			? value.in
+			: undefined;
+	}
+	// Writes key a row by the values the driver returns, which the encoded value matches unless the codec wraps it in a driver parameter.
+	const storedPart = Effect.fnUntraced(function* (column: string, value: unknown) {
+		const field = model.fields[column];
+		const encoded = field === undefined ? undefined : yield* Schema.encodeUnknownEffect(field)(value);
+		return [encoded, value].find(isPrimitive);
+	});
+	const rowId = Effect.fnUntraced(function* (row: readonly unknown[]) {
+		const [single] = row;
+		if (row.length === 1 && isIdentity(single)) {
+			return single;
+		}
+		const parts = yield* Effect.forEach(row, (value, index) => storedPart(options.idColumns[index] ?? "", value));
+		if (!parts.every(isPrimitive)) {
+			return undefined;
+		}
+		return parts.length === 1 ? String(parts[0]) : compositeId(parts);
+	});
+	const rowKeys = Effect.fnUntraced(function* (where: Where) {
+		const columns: (readonly unknown[])[] = [];
+		for (const column of options.idColumns) {
+			const values = pinned(where, column);
+			if (values === undefined) {
+				return undefined;
+			}
+			columns.push(values);
+		}
+		const ids = yield* Effect.forEach(combinations(columns), rowId);
+		return ids.every((id) => id !== undefined) ? ids.map((id): Key => keys.item(id)) : undefined;
+	});
+	function pinnedKeys(where: Where, { columns, make }: Bucket) {
+		const pins: (readonly Pin[])[] = [];
+		let count = 1;
+		for (const column of columns) {
+			const values = pinned(where, column);
+			if (values === undefined || !values.every(isIdentity)) {
+				return undefined;
+			}
+			count *= values.length;
+			pins.push(values.map((value): Pin => [column, value]));
+		}
+		return count > MAX_BUCKET_KEYS ? undefined : { columns, keys: combinations(pins).flatMap(make) };
+	}
+	function bucketKeys(where: Where): readonly Key[] | undefined {
+		const pinnedBuckets = buckets.flatMap((bucket) => pinnedKeys(where, bucket) ?? []);
+		let narrowest: readonly Key[] | undefined;
+		for (const { columns, keys: candidate } of pinnedBuckets) {
+			const covered = pinnedBuckets.some(
+				(other) => other.columns.length > columns.length && columns.every((column) => other.columns.includes(column)),
+			);
+			if (!covered && (narrowest === undefined || candidate.length < narrowest.length)) {
+				narrowest = candidate;
+			}
+		}
+		return narrowest;
+	}
+	return (where = {}) =>
+		Effect.gen(function* () {
+			yield* recordRead((yield* rowKeys(where)) ?? bucketKeys(where) ?? [keys.list], { inferred: true });
+		});
+}

package/src/repository.ts

@@ -6,6 +6,7 @@ import { type BatchWrites, makeInsertMany } from "#batchWrites.ts";
 import { makeCompositeCrud, type PrimaryKey, type Repository } from "#compositeRepository.ts";
 import { type ConflictColumns, type ConflictWrites, makeConflictWrites } from "#conflictWrites.ts";
 import { makeInsertFromSelect, type SelectWrites } from "#insertFromSelect.ts";
+import { makeRecordRead } from "#recordRepositoryRead.ts";
 import { repositoryChanges } from "#repositoryChanges.ts";
 import { type BucketRegistrationError, type RepositoryOptions, validateRepositoryCollection } from "#repositoryCollection.ts";
 import type { FindManyFilter, RepositoryFilter, RepositoryListFilter } from "#repositoryFilter.ts";
@@ -118,14 +119,14 @@ export function makeRepository<TModel extends Model.Any, TId extends IdColumn<TM
 ): Effect.Effect<unknown, BucketRegistrationError, SqlClient.SqlClient> {
 	return Effect.fnUntraced(function* () {
 		yield* validateRepositoryCollection(model.fields, options);
-		const composite = typeof options.idColumn === "object";
-		const idColumns = (composite ? options.idColumn : [options.idColumn]).map(String);
-		const changes = yield* repositoryChanges(options.tableName, idColumns, model.fields);
+		const idColumns = (typeof options.idColumn === "object" ? options.idColumn : [options.idColumn]).map(String);
+		const changes = yield* repositoryChanges(options.tableName, idColumns, model.fields, options.collection?.tuples);
+		const recordRead = makeRecordRead(model, { idColumns, tableName: options.tableName, tuples: options.collection?.tuples });
 		const crud = {
-			...(yield* makeCompositeCrud(model, { ...options, columns: idColumns }, changes)),
+			...(yield* makeCompositeCrud(model, { ...options, columns: idColumns, recordRead }, changes)),
 			deleteBatched: yield* makeBatchedDelete(model, options, changes),
 		};
-		const queries = yield* makeQueries(model, options);
+		const queries = yield* makeQueries(model, { ...options, recordRead });
 		return {
 			...crud,
 			...queries,

package/src/repositoryChanges.ts

@@ -1,34 +1,61 @@
 import { Effect, Option, type Schema } from "effect";
 import * as Reactivity from "effect/reactivity/Reactivity";
 import { SqlClient } from "effect/sql";
-import { declaredBuckets } from "@shivaedev/changes/buckets.ts";
-import { collectionInvalidationKeys, compositeId, invalidationKeys, type Key, recordKey } from "@shivaedev/changes/keys.ts";
+import { declaredBuckets, decodeBucketValue } from "@shivaedev/changes/buckets.ts";
+import { collectionInvalidationKeys, compositeId, type Identity, invalidationKeys, type Key, recordKey } from "@shivaedev/changes/keys.ts";
 import { ChangeDeclarations } from "#ChangeDeclarations.ts";
 import { invalidateOnCommit, transact } from "#transact.ts";
 
 export type RepositoryChanges = Effect.Success<ReturnType<typeof repositoryChanges>>;
 
-export const repositoryChanges = Effect.fnUntraced(function* (table: string, columns: readonly string[], fields: Schema.Struct.Fields = {}) {
+export const repositoryChanges = Effect.fnUntraced(function* (
+	table: string,
+	columns: readonly string[],
+	fields: Schema.Struct.Fields = {},
+	tuples: Readonly<Record<string, readonly string[]>> = {},
+) {
 	const sql = yield* SqlClient.SqlClient;
-	const buckets = declaredBuckets(fields);
+	const declared = [
+		...declaredBuckets(fields).map(({ field }) => ({ columns: [field], field, tuple: false })),
+		...Object.entries(tuples).map(([field, tupleColumns]) => ({ columns: tupleColumns, field, tuple: true })),
+	];
+	const columnParts = new Map(
+		[...new Set(declared.flatMap((bucket) => bucket.columns))].flatMap((column, index) => {
+			const schema = fields[column];
+			return schema === undefined ? [] : [[column, { column, decode: decodeBucketValue(schema), old: `shivaeOldBucket${index}` }] as const];
+		}),
+	);
+	const buckets = declared.map((bucket) => ({ ...bucket, parts: bucket.columns.flatMap((column) => columnParts.get(column) ?? []) }));
+	const bucketValue = Effect.fnUntraced(function* (
+		row: Readonly<Record<string, unknown>>,
+		{ parts, tuple }: (typeof buckets)[number],
+		side: "column" | "old",
+	) {
+		const values: Identity[] = [];
+		for (const part of parts) {
+			const stored = row[part[side]];
+			const decoded = stored === null || stored === undefined ? undefined : yield* part.decode(stored);
+			if (decoded === null || decoded === undefined) {
+				return undefined;
+			}
+			values.push(decoded);
+		}
+		return tuple ? compositeId(values.map(String)) : values[0];
+	});
 	const bucketKeys = Effect.fnUntraced(function* (row: Readonly<Record<string, unknown>>) {
 		const keys: Key[] = [];
-		for (const [index, { field, decode }] of buckets.entries()) {
-			for (const value of [row[field], row[`shivaeOldBucket${index}`]]) {
-				if (value === null || value === undefined) {
-					continue;
-				}
-				const decoded = yield* decode(value);
-				if (decoded === null || decoded === undefined) {
-					continue;
+		for (const bucket of buckets) {
+			for (const side of ["column", "old"] as const) {
+				const value = yield* bucketValue(row, bucket, side);
+				if (value !== undefined) {
+					keys.push({ _tag: "Bucket", collection: table, field: bucket.field, value });
 				}
-				keys.push({ _tag: "Bucket", collection: table, field, value: decoded });
 			}
 		}
 		return invalidationKeys(keys);
 	});
 	function returning(base = sql`*`) {
-		return sql.csv([base, ...buckets.map(({ field }, index) => sql`old.${sql(field)} as ${sql(`shivaeOldBucket${index}`)}`)]);
+		return sql.csv([base, ...[...columnParts.values()].map(({ column, old }) => sql`old.${sql(column)} as ${sql(old)}`)]);
 	}
 	const initial = yield* Effect.serviceOption(Reactivity.Reactivity);
 	const fallback = Option.isSome(initial) ? initial.value : yield* Reactivity.make;
@@ -60,7 +87,7 @@ export const repositoryChanges = Effect.fnUntraced(function* (table: string, col
 		yield* provide(invalidateOnCommit([...keys]));
 	});
 	function write<A, E, R>(effect: Effect.Effect<A, E, R>) {
-		return provide(transact(effect, { onSqlError: (error) => error }));
+		return provide(transact(effect));
 	}
 	const recordTable = Effect.fnUntraced(function* (rows: number) {
 		if (rows === 0) {

package/src/repositoryCollection.ts

@@ -1,9 +1,11 @@
 import { Data, Effect, Order, type Schema } from "effect";
 import { declaredBuckets } from "@shivaedev/changes/buckets.ts";
+import { isBucketSchema } from "@shivaedev/changes/keys.ts";
 
 export interface RepositoryCollection {
 	readonly bucket: Readonly<Record<string, unknown>>;
 	readonly name: string;
+	readonly tuples?: Readonly<Record<string, readonly [string, string, ...string[]]>>;
 }
 
 export interface RepositoryOptions<TId> {
@@ -19,11 +21,15 @@ export class BucketRegistrationError extends Data.TaggedError("BucketRegistratio
 	readonly modelFields: readonly string[];
 	readonly collectionFields: readonly string[];
 	readonly invalidFields: readonly string[];
+	readonly invalidTupleColumns: readonly string[];
 }> {
 	override get message() {
 		if (this.invalidFields.length > 0) {
 			return `Bucket registration for ${this.tableName}: fields ${JSON.stringify(this.invalidFields)} must decode to strings, numbers or absent values`;
 		}
+		if (this.invalidTupleColumns.length > 0) {
+			return `Bucket registration for ${this.tableName}: tuple columns ${JSON.stringify(this.invalidTupleColumns)} must be model fields that decode to strings, numbers or absent values`;
+		}
 		return `Bucket registration for ${this.tableName}: model fields ${JSON.stringify(this.modelFields)} disagree with collection ${this.collectionName ?? "(missing)"} fields ${JSON.stringify(this.collectionFields)}`;
 	}
 }
@@ -37,10 +43,20 @@ export const validateRepositoryCollection = Effect.fnUntraced(function* (
 		.filter(({ supported }) => !supported)
 		.map(({ field }) => field)
 		.sort(Order.String);
+	const tuples = options.collection?.tuples ?? {};
+	const invalidTupleColumns = Object.entries(tuples).flatMap(([tuple, columns]) =>
+		columns.flatMap((column) => {
+			const schema = fields[column];
+			return schema !== undefined && isBucketSchema(schema) ? [] : [`${tuple}.${column}`];
+		}),
+	);
 	const modelFields = buckets.map(({ field }) => field).sort(Order.String);
-	const collectionFields = Object.keys(options.collection?.bucket ?? {}).sort(Order.String);
+	const collectionFields = Object.keys(options.collection?.bucket ?? {})
+		.filter((field) => !Object.hasOwn(tuples, field))
+		.sort(Order.String);
 	if (
 		invalidFields.length === 0
+		&& invalidTupleColumns.length === 0
 		&& ((options.collection === undefined && modelFields.length === 0)
 			|| (options.collection?.name === options.tableName
 				&& modelFields.length === collectionFields.length
@@ -53,6 +69,7 @@ export const validateRepositoryCollection = Effect.fnUntraced(function* (
 			collectionFields,
 			collectionName: options.collection?.name,
 			invalidFields,
+			invalidTupleColumns,
 			modelFields,
 			tableName: options.tableName,
 		}),