@shivaedev/sql 0.37.0 → 0.39.0

package/dist/versionedStatements.js

@@ -1,9 +1,13 @@
 import { Effect, Schema } from "effect";
 import { SqlClient } from "effect/sql";
+import { storageSchema } from "#adapters/storageSchema.ts";
 import { makeConflictClause } from "#makeConflictClause.ts";
+import { selectedUpdate } from "#repositoryUpdate.ts";
+import { sqlNameTransforms } from "#sqlNameTransforms.ts";
 const Version = Schema.Number.check(Schema.isInt(), Schema.isGreaterThanOrEqualTo(0));
 export const versionedStatements = Effect.fnUntraced(function* (model, options) {
     const sql = yield* SqlClient.SqlClient;
+    const nameTransforms = yield* sqlNameTransforms;
     const { tableName, idColumns, versionColumn, conflict } = options;
     const entries = [];
     for (const column of idColumns) {
@@ -19,8 +23,8 @@ export const versionedStatements = Effect.fnUntraced(function* (model, options)
         return yield* Effect.die(new Error(`Unknown version column: ${versionColumn}`));
     }
     const encodeVersion = Schema.encodeEffect(versionSchema);
-    const encodeInsert = Schema.encodeEffect(model.insert);
-    const encodeUpdate = Schema.encodeEffect(model.update);
+    const encodeInsert = Schema.encodeEffect(storageSchema(model.insert, model.fields, nameTransforms));
+    const encodeUpdate = Schema.encodeEffect(storageSchema(model.update, model.fields, nameTransforms));
     const record = Schema.decodeUnknownEffect(Schema.Record(Schema.String, Schema.Unknown));
     const validateVersion = Schema.decodeUnknownEffect(Version);
     const clause = options.conflictColumns === undefined ? undefined : yield* makeConflictClause(model, { ...options, conflictColumns: options.conflictColumns });
@@ -46,9 +50,11 @@ export const versionedStatements = Effect.fnUntraced(function* (model, options)
             return sql `insert into ${sql(tableName)} ${sql.insert(encoded)} ${suffix}`;
         });
     }
-    function update(input) {
+    function update(input, columns) {
         return Effect.gen(function* () {
-            const encoded = yield* record(yield* encodeUpdate(input));
+            const encoded = yield* record(yield* columns === undefined
+                ? encodeUpdate(input)
+                : Effect.flatMap(selectedUpdate(model, columns, [...idColumns, versionColumn], input), (schema) => Schema.encodeEffect(storageSchema(schema, model.fields, nameTransforms))(input)));
             const expectedVersion = yield* validateVersion(encoded[versionColumn]);
             const assignments = Object.entries(encoded).filter(([column]) => !idColumns.includes(column) && column !== versionColumn);
             const set = sql.csv([

package/dist/versionedStatements.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/sql",
-  "version": "0.37.0",
+  "version": "0.39.0",
   "description": "Schema-derived repositories over native Effect SQL",
   "keywords": [
     "effect"
@@ -43,27 +43,27 @@
     "README.md"
   ],
   "dependencies": {
-    "@shivaedev/changes": "0.10.0",
-    "@shivaedev/service": "0.7.0"
+    "@shivaedev/changes": "0.10.1",
+    "@shivaedev/service": "0.7.1"
   },
   "devDependencies": {
-    "@effect/platform-node": "4.0.6",
-    "@effect/sql-pg": "4.0.6",
-    "@effect/sql-sqlite-node": "4.0.6",
-    "@shivaedev/contract": "0.36.0",
-    "@shivaedev/jobs": "0.35.0",
-    "@shivaedev/quality": "0.60.0",
-    "@shivaedev/test-kits": "0.3.0",
-    "@shivaedev/test-sql": "0.20.0",
-    "@shivaedev/test-story": "0.38.0",
+    "@effect/platform-node": "4.0.7",
+    "@effect/sql-pg": "4.0.7",
+    "@effect/sql-sqlite-node": "4.0.7",
+    "@shivaedev/contract": "0.36.1",
+    "@shivaedev/jobs": "0.36.0",
+    "@shivaedev/quality": "0.61.1",
+    "@shivaedev/test-kits": "0.4.0",
+    "@shivaedev/test-sql": "0.21.1",
+    "@shivaedev/test-story": "0.39.1",
     "@types/node": "24.19.2",
-    "effect": "4.0.6",
+    "effect": "4.0.7",
     "typescript": "7.0.2",
     "vitest": "5.0.5"
   },
   "peerDependencies": {
-    "@effect/sql-pg": "4.0.6",
-    "effect": "4.0.6"
+    "@effect/sql-pg": "4.0.7",
+    "effect": "4.0.7"
   },
   "peerDependenciesMeta": {
     "@effect/sql-pg": {

package/src/Model.ts

@@ -0,0 +1,7 @@
+import { Schema } from "effect";
+
+function Group<TFields extends Schema.Struct.Fields>(fields: TFields, options: { readonly prefix: string }) {
+	return Schema.Struct(fields).annotate({ "@shivaedev/sql/groupPrefix": options.prefix });
+}
+
+export const Model = { Group };

package/src/VersionedRepositoryShape.ts

@@ -0,0 +1,11 @@
+import type { Model } from "effect/schema";
+import type { PrimaryKey, Repository } from "#compositeRepository.ts";
+import type { Queries } from "#repositoryQueries.ts";
+import type { VersionColumn, VersionedWrites } from "#versionedRepository.ts";
+
+export type VersionedRepositoryShape<TModel extends Model.Any, TId extends PrimaryKey<TModel>, TVersion extends VersionColumn<TModel, TId>> = Omit<
+	Repository<TModel, TId>,
+	keyof VersionedWrites<TModel, TId, TVersion>
+> &
+	VersionedWrites<TModel, TId, TVersion> &
+	Queries<TModel>;

package/src/WorkerRelease.ts

@@ -1,40 +1,11 @@
-import { Effect, Semaphore } from "effect";
 import { defineService } from "@shivaedev/service/defineService.ts";
 import { genericMethod } from "@shivaedev/service/genericMethod.ts";
-
-export const makeWorkerRelease = Effect.fn("EffectSql.makeWorkerRelease")(function* () {
-	const mutex = Semaphore.makeUnsafe(1);
-	const controls = new Set<(active: boolean) => Effect.Effect<void, unknown>>();
-	let active = false;
-	const locked = mutex.withPermits(1);
-	function register<E>(control: (active: boolean) => Effect.Effect<void, E>) {
-		const attach = Effect.gen(function* () {
-			controls.add(control);
-			yield* control(active);
-		});
-		const detach = Effect.sync(() => {
-			controls.delete(control);
-		});
-		return Effect.acquireRelease(locked(attach), () => locked(detach));
-	}
-	return {
-		service: { register },
-		setActive: (next: boolean) =>
-			locked(
-				Effect.gen(function* () {
-					if (next === active) {
-						return;
-					}
-					active = next;
-					yield* Effect.forEach(controls, (control) => control(active), { concurrency: "unbounded", discard: true });
-				}),
-			).pipe(Effect.uninterruptible),
-	};
-});
+import { initializeWorkerRelease } from "./initializeWorkerRelease.ts";
+import { registerWorkerRelease } from "./registerWorkerRelease.ts";
 
 export const WorkerRelease = defineService({
 	id: "@shivaedev/sql/WorkerRelease",
-	initialize: makeWorkerRelease(),
-	methods: ({ service }) => ({ register: genericMethod(service.register) }),
+	initialize: initializeWorkerRelease,
+	methods: (state) => ({ register: genericMethod(registerWorkerRelease(state)) }),
 	requires: [],
 });

package/src/adapters/groupColumns.ts

@@ -0,0 +1,63 @@
+import type { Schema } from "effect";
+import { Predicate, SchemaAST } from "effect";
+import type { SqlNameTransforms } from "#clientOptions.ts";
+
+interface Column {
+	readonly column: string;
+	readonly key: string;
+	readonly member: PropertyKey | undefined;
+}
+
+export function groupColumns(fields: Schema.Struct.Fields, keys: readonly string[] = Object.keys(fields)): Column[] {
+	return keys.flatMap<Column>((key) => {
+		const ast = fields[key]?.ast;
+		const prefix = ast?.annotations?.["@shivaedev/sql/groupPrefix"];
+		return typeof prefix === "string" && ast !== undefined && SchemaAST.isObjects(ast)
+			? ast.propertySignatures.map((field) => ({ column: `${prefix}${String(field.name)}`, key, member: field.name }))
+			: [{ column: key, key, member: undefined }];
+	});
+}
+
+export function rowMapping(fields: Schema.Struct.Fields, names?: SqlNameTransforms) {
+	const columns = groupColumns(fields);
+	function returnedName(column: string) {
+		return names?.transformResultNames?.(names.transformQueryNames?.(column) ?? column) ?? column;
+	}
+	const seen = new Set<string>();
+	for (const { column } of columns) {
+		if (seen.has(column)) {
+			throw new Error(`Duplicate grouped column: ${column}`);
+		}
+		seen.add(column);
+	}
+	return {
+		expand: (row: Readonly<Record<string, unknown>>) => {
+			const expanded: Record<string, unknown> = { ...row };
+			for (const { key, member, column } of columns) {
+				if (member !== undefined && Object.hasOwn(row, returnedName(column))) {
+					const held = expanded[key];
+					expanded[key] = { ...(typeof held === "object" && held !== null ? held : {}), [member]: row[returnedName(column)] };
+					delete expanded[returnedName(column)];
+				}
+			}
+			return expanded;
+		},
+		flatten: (row: unknown) => {
+			if (!Predicate.isObject(row)) {
+				return {};
+			}
+			const flat: Record<string, unknown> = { ...row };
+			for (const { key, member, column } of columns) {
+				if (member === undefined) {
+					continue;
+				}
+				delete flat[key];
+				const value = row[key];
+				if (Predicate.isObject(value) && Object.hasOwn(value, member)) {
+					flat[column] = Reflect.get(value, member);
+				}
+			}
+			return flat;
+		},
+	};
+}

package/src/adapters/storageSchema.ts

@@ -0,0 +1,10 @@
+import { Schema, SchemaGetter } from "effect";
+import { rowMapping } from "#adapters/groupColumns.ts";
+import type { SqlNameTransforms } from "#clientOptions.ts";
+
+export function storageSchema<TSchema extends Schema.Constraint>(schema: TSchema, fields: Schema.Struct.Fields, names?: SqlNameTransforms) {
+	const mapping = rowMapping(fields, names);
+	return Schema.Record(Schema.String, Schema.Unknown).pipe(
+		Schema.decodeTo(schema, { decode: SchemaGetter.transform(mapping.expand), encode: SchemaGetter.transform(mapping.flatten) }),
+	);
+}

package/src/backfillPostgres.ts

@@ -0,0 +1,47 @@
+import { Data, Effect, Option, Schema } from "effect";
+import { SqlClient } from "effect/sql";
+import { advisoryXactLock } from "#advisoryXactLock.ts";
+import { transact } from "#transact.ts";
+
+export class BackfillInsideTransaction extends Data.TaggedError("BackfillInsideTransaction") {}
+
+export interface BackfillOptions<TRow extends object, TProgress, E, R> {
+	readonly batchSize: number;
+	readonly loadProgress: Effect.Effect<TProgress, E, R>;
+	readonly lock: bigint | string;
+	readonly process: (row: TRow) => Effect.Effect<unknown, E, R>;
+	readonly saveProgress: (last: TRow, previous: TProgress) => Effect.Effect<unknown, E, R>;
+	readonly select: (progress: TProgress, limit: number) => Effect.Effect<readonly TRow[], E, R>;
+}
+
+const BatchSize = Schema.Number.check(Schema.isInt(), Schema.isGreaterThan(0), Schema.isLessThanOrEqualTo(Number.MAX_SAFE_INTEGER));
+
+export const backfillPostgres = Effect.fn("Sql.backfillPostgres")(function* <TRow extends object, TProgress, E, R>(
+	options: BackfillOptions<TRow, TProgress, E, R>,
+) {
+	const sql = yield* SqlClient.SqlClient;
+	if (Option.isSome(yield* Effect.serviceOption(sql.transactionService))) {
+		return yield* new BackfillInsideTransaction();
+	}
+	const batchSize = yield* Schema.decodeUnknownEffect(BatchSize)(options.batchSize);
+	let processed = 0;
+	while (true) {
+		const count = yield* Effect.gen(function* () {
+			yield* advisoryXactLock(options.lock).pipe(Effect.catchTag("AdvisoryLockOutsideTransaction", Effect.die));
+			const progress = yield* options.loadProgress;
+			const rows = (yield* options.select(progress, batchSize)).slice(0, batchSize);
+			for (const row of rows) {
+				yield* options.process(row);
+			}
+			const last = rows.at(-1);
+			if (last !== undefined) {
+				yield* options.saveProgress(last, progress);
+			}
+			return rows.length;
+		}).pipe(transact({ onSqlError: (error) => error }));
+		processed += count;
+		if (count === 0) {
+			return processed;
+		}
+	}
+});

package/src/batchWrites.ts

@@ -3,7 +3,9 @@ import type { Model } from "effect/schema";
 import { SqlClient } from "effect/sql";
 import type { SqlError } from "effect/sql/SqlError";
 import type { Fragment } from "effect/sql/Statement";
+import { storageSchema } from "#adapters/storageSchema.ts";
 import type { RepositoryChanges } from "#repositoryChanges.ts";
+import { sqlNameTransforms } from "#sqlNameTransforms.ts";
 import { makeUpsertDecoder, upsertReturning } from "#upsertResult.ts";
 
 export type InsertMany<TModel extends Model.Any, TServices = never> = (
@@ -22,11 +24,12 @@ export const makeInsertMany = Effect.fnUntraced(function* <TServices = never>(
 	upsert = false,
 ) {
 	const sql = yield* SqlClient.SqlClient;
+	const nameTransforms = yield* sqlNameTransforms;
 	const prepareRow = prepare ?? (() => Effect.succeed(sql``));
-	const encode = Schema.encodeEffect(model.insert);
+	const encode = Schema.encodeEffect(storageSchema(model.insert, model.fields, nameTransforms));
 	const record = Schema.decodeUnknownEffect(Schema.Record(Schema.String, Schema.Unknown));
-	const decode = Schema.decodeUnknownEffect(Schema.Array(model));
-	const decodeUpsert = makeUpsertDecoder(model);
+	const decode = Schema.decodeUnknownEffect(Schema.Array(storageSchema(model, model.fields, nameTransforms)));
+	const decodeUpsert = makeUpsertDecoder(model, nameTransforms);
 	const returning = options.changes.returning(upsert ? yield* upsertReturning() : sql`*`);
 	return (inputs: readonly unknown[]) =>
 		Effect.gen(function* () {

package/src/compositeRecordKey.ts

@@ -0,0 +1,26 @@
+import * as PgTypes from "@effect/sql-pg/PgTypes";
+import { Effect, Schema } from "effect";
+import type { Model } from "effect/schema";
+import { compositeId, recordKey } from "@shivaedev/changes/keys.ts";
+import type { CompositeKey } from "#compositeRepository.ts";
+
+export function compositeRecordKey<TModel extends Model.Any, const TColumns extends CompositeKey<TModel>>(
+	model: TModel,
+	options: { readonly tableName: string; readonly idColumn: TColumns },
+	value: Pick<Schema.Struct.Type<TModel["fields"]>, TColumns[number]>,
+): Effect.Effect<string, Schema.SchemaError, TModel["fields"][TColumns[number]]["EncodingServices"]>;
+export function compositeRecordKey(
+	model: Model.Any,
+	options: { readonly tableName: string; readonly idColumn: readonly string[] },
+	value: Readonly<Record<string, unknown>>,
+): Effect.Effect<string, Schema.SchemaError, unknown> {
+	return Effect.fn("Sql.compositeRecordKey")(function* () {
+		const fields = Object.fromEntries(Object.entries(model.fields).filter(([column]) => options.idColumn.includes(column)));
+		const encoded = yield* Schema.encodeUnknownEffect(Schema.Struct(fields))(value);
+		const values = options.idColumn.map((column) => {
+			const stored = encoded[column];
+			return PgTypes.isParameter(stored) ? stored.value : stored;
+		});
+		return recordKey(options.tableName, compositeId(values));
+	})();
+}

package/src/compositeRepository.ts

@@ -3,11 +3,13 @@ import { Effect, Schema } from "effect";
 import type { Model } from "effect/schema";
 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 { RepositoryChanges } from "#repositoryChanges.ts";
 import type { RepositoryListFilter } from "#repositoryFilter.ts";
 import type { Update, UpdateVoid } from "#repositoryUpdate.ts";
 import { repositoryWrites } from "#repositoryWrites.ts";
+import { sqlNameTransforms } from "#sqlNameTransforms.ts";
 import type { IdColumn, NativeRepository } from "#versionedRepository.ts";
 
 export type CompositeKey<TModel extends Model.Any> = readonly [IdColumn<TModel>, IdColumn<TModel>, ...IdColumn<TModel>[]];
@@ -51,6 +53,7 @@ export const makeCompositeCrud = Effect.fnUntraced(function* (
 	changes: RepositoryChanges,
 ) {
 	const sql = yield* SqlClient.SqlClient;
+	const nameTransforms = yield* sqlNameTransforms;
 	const { columns, tableName, spanPrefix } = options;
 	const entries: [string, Schema.Constraint][] = [];
 	for (const column of columns) {
@@ -76,7 +79,7 @@ export const makeCompositeCrud = Effect.fnUntraced(function* (
 				(key) => sql`select * from ${sql(tableName)} where ${predicate(key)}`,
 			),
 		Request: Key,
-		Result: model,
+		Result: storageSchema(model, model.fields, nameTransforms),
 	});
 
 	return {

package/src/conditionalUpsert.ts

@@ -2,9 +2,11 @@ import { Effect, Schema } from "effect";
 import type { Model } from "effect/schema";
 import { SqlClient } from "effect/sql";
 import type { SqlError } from "effect/sql/SqlError";
+import { storageSchema } from "#adapters/storageSchema.ts";
 import { makeConflictClause } from "#makeConflictClause.ts";
 import type { RepositoryChanges } from "#repositoryChanges.ts";
 import type { Comparisons, FindManyFilter } from "#repositoryFilter.ts";
+import { sqlNameTransforms } from "#sqlNameTransforms.ts";
 import type { UpsertAssignment } from "#upsertColumns.ts";
 import { makeUpsertDecoder, type UpsertRow, upsertReturning } from "#upsertResult.ts";
 
@@ -65,10 +67,11 @@ export const makeConditionalUpsert = Effect.fnUntraced(function* (
 	},
 ) {
 	const sql = yield* SqlClient.SqlClient;
+	const nameTransforms = yield* sqlNameTransforms;
 	const returning = yield* upsertReturning();
-	const encode = Schema.encodeEffect(model.insert);
+	const encode = Schema.encodeEffect(storageSchema(model.insert, model.fields, nameTransforms));
 	const record = Schema.decodeUnknownEffect(Schema.Record(Schema.String, Schema.Unknown));
-	const decode = makeUpsertDecoder(model);
+	const decode = makeUpsertDecoder(model, nameTransforms);
 	const clause = yield* makeConflictClause(model, options);
 	return (
 		inputs: readonly unknown[],

package/src/conflictWrites.ts

@@ -2,11 +2,13 @@ import { Effect, Option, Schema } from "effect";
 import type { Model } from "effect/schema";
 import { SqlClient } from "effect/sql";
 import type { SqlError } from "effect/sql/SqlError";
+import { storageSchema } from "#adapters/storageSchema.ts";
 import { type InsertMany, makeInsertMany } from "#batchWrites.ts";
 import { type ConditionalUpsert, type ConditionalUpsertMany, makeConditionalUpsert } from "#conditionalUpsert.ts";
 import { type InsertFromSelect, makeInsertFromSelect } from "#insertFromSelect.ts";
 import { makeConflictClause } from "#makeConflictClause.ts";
 import type { RepositoryChanges } from "#repositoryChanges.ts";
+import { sqlNameTransforms } from "#sqlNameTransforms.ts";
 import type { UpsertAssignment, UpsertColumn } from "#upsertColumns.ts";
 import { makeUpsertDecoder, upsertReturning } from "#upsertResult.ts";
 
@@ -52,11 +54,12 @@ export const makeConflictWrites = Effect.fnUntraced(function* (
 	},
 ) {
 	const sql = yield* SqlClient.SqlClient;
+	const nameTransforms = yield* sqlNameTransforms;
 	const { tableName, spanPrefix } = options;
 	const returning = yield* upsertReturning();
-	const encode = Schema.encodeEffect(model.insert);
-	const decode = Schema.decodeUnknownEffect(model);
-	const decodeUpsert = makeUpsertDecoder(model);
+	const encode = Schema.encodeEffect(storageSchema(model.insert, model.fields, nameTransforms));
+	const decode = Schema.decodeUnknownEffect(storageSchema(model, model.fields, nameTransforms));
+	const decodeUpsert = makeUpsertDecoder(model, nameTransforms);
 	const record = Schema.decodeUnknownEffect(Schema.Record(Schema.String, Schema.Unknown));
 	const conditional = yield* makeConditionalUpsert(model, options);
 	const clause = yield* makeConflictClause(model, options);

package/src/coordinateWorkerRelease.ts

@@ -1,9 +1,9 @@
 import { Duration, Effect, Exit, Option, Predicate, Schedule, Scope } from "effect";
 import { isSqlError } from "effect/sql/SqlError";
 import { WorkerReleaseTesting } from "#testing/WorkerRelease.ts";
+import { makeWorkerRelease } from "./makeWorkerRelease.ts";
 import { readPostgresRelease } from "./postgresRelease.ts";
 import { releaseWorkers } from "./releaseWorkers.ts";
-import { makeWorkerRelease } from "./WorkerRelease.ts";
 
 function isCloseable(scope: Scope.Scope): scope is Scope.Closeable {
 	return Predicate.hasProperty(scope, "~effect/Scope/Closeable") && scope["~effect/Scope/Closeable"] === "~effect/Scope/Closeable";

package/src/initializeWorkerRelease.ts

@@ -0,0 +1,7 @@
+import { Effect, Semaphore } from "effect";
+
+export const initializeWorkerRelease = Effect.sync(() => ({
+	active: false,
+	controls: new Set<(active: boolean) => Effect.Effect<void, unknown>>(),
+	locked: Semaphore.makeUnsafe(1).withPermits(1),
+}));

package/src/insertFromSelect.ts

@@ -3,8 +3,10 @@ import type { Model } from "effect/schema";
 import { SqlClient } from "effect/sql";
 import type { SqlError } from "effect/sql/SqlError";
 import type { Fragment } from "effect/sql/Statement";
+import { storageSchema } from "#adapters/storageSchema.ts";
 import type { RepositoryChanges } from "#repositoryChanges.ts";
 import type { RepositorySelect } from "#repositoryQueries.ts";
+import { sqlNameTransforms } from "#sqlNameTransforms.ts";
 
 type CompatibleColumn<TType, TEncoded, TFields extends Schema.Struct.Fields> = {
 	[TKey in keyof TFields]: TFields[TKey]["Type"] extends TType ? (TFields[TKey]["Encoded"] extends TEncoded ? TKey : never) : never;
@@ -31,7 +33,8 @@ export const makeInsertFromSelect = Effect.fnUntraced(function* <TServices = nev
 	prepare?: (columns: readonly string[]) => Effect.Effect<Fragment, SqlError | Schema.SchemaError, TServices>,
 ) {
 	const sql = yield* SqlClient.SqlClient;
-	const decode = Schema.decodeUnknownEffect(Schema.Array(model));
+	const nameTransforms = yield* sqlNameTransforms;
+	const decode = Schema.decodeUnknownEffect(Schema.Array(storageSchema(model, model.fields, nameTransforms)));
 	return (source: RepositorySelect<Schema.Struct.Fields, unknown>, columns: Readonly<Record<string, string>>) =>
 		Effect.gen(function* () {
 			const names = Object.keys(columns);

package/src/latestPerGroup.ts

@@ -2,9 +2,12 @@ import { Effect, Schema } from "effect";
 import type { Model } from "effect/schema";
 import { SqlClient } from "effect/sql";
 import type { Fragment } from "effect/sql/Statement";
+import { groupColumns } from "#adapters/groupColumns.ts";
+import { storageSchema } from "#adapters/storageSchema.ts";
 import { pinnedGroups } from "#pinnedGroups.ts";
 import type { LatestPerGroup } from "#repository.ts";
 import { makeFilter } from "#repositoryFilter.ts";
+import { sqlNameTransforms } from "#sqlNameTransforms.ts";
 import { tupleUnnest } from "#tupleUnnest.ts";
 
 function groupMasks(input: readonly (readonly unknown[])[]) {
@@ -20,6 +23,7 @@ function groupMasks(input: readonly (readonly unknown[])[]) {
 
 export const latestPerGroup = Effect.fnUntraced(function* (model: Model.Any, tableName: string) {
 	const sql = yield* SqlClient.SqlClient;
+	const nameTransforms = yield* sqlNameTransforms;
 	const { fieldAt, where } = yield* makeFilter(model);
 	function groupSource(groups: readonly (readonly unknown[])[], partitionBy: readonly string[], fromTuple: boolean) {
 		const partitions = sql.csv(partitionBy.map((key) => sql`${sql(key)}`));
@@ -37,7 +41,7 @@ export const latestPerGroup = Effect.fnUntraced(function* (model: Model.Any, tab
 		const predicate = yield* where(query.where, true);
 		const partitions = sql.csv(query.partitionBy.map((key) => sql`${sql(key)}`));
 		const keys = Object.keys(model.fields);
-		const columns = sql.csv(keys.map((key) => sql`${sql(key)}`));
+		const columns = sql.csv(groupColumns(model.fields, keys).map(({ column }) => sql`${sql(column)}`));
 		const pinned = yield* pinnedGroups(model, query.partitionBy, query.where).pipe(Effect.provideService(SqlClient.SqlClient, sql));
 		if (pinned !== undefined && pinned.groups.length === 0) {
 			return [];
@@ -70,7 +74,7 @@ export const latestPerGroup = Effect.fnUntraced(function* (model: Model.Any, tab
 			const ordering = sql.csv(query.orderBy.map(({ field, direction }) => sql`${sql(field)} ${sql.literal(direction === "desc" ? "desc" : "asc")}`));
 			const rows =
 				yield* sql`${tupleSource} select ${columns} from (${sql.join(" union all ")(branches)}) as ${sql("__effect_sql_pinned")} order by ${partitions}, ${ordering}`;
-			return yield* Schema.decodeUnknownEffect(Schema.Array(Schema.Struct(model.fields)))(rows);
+			return yield* Schema.decodeUnknownEffect(Schema.Array(storageSchema(Schema.Struct(model.fields), model.fields, nameTransforms)))(rows);
 		}
 		let rankColumn = "__effect_sql_rank";
 		while (Object.hasOwn(model.fields, rankColumn)) {
@@ -81,6 +85,6 @@ export const latestPerGroup = Effect.fnUntraced(function* (model: Model.Any, tab
 			from ${sql(tableName)} where ${predicate}
 		) as ${sql("__effect_sql_ranked")} where ${sql(rankColumn)} <= ${rowLimit}
 		order by ${partitions}, ${sql(rankColumn)}`;
-		return yield* Schema.decodeUnknownEffect(Schema.Array(Schema.Struct(model.fields)))(rows);
+		return yield* Schema.decodeUnknownEffect(Schema.Array(storageSchema(Schema.Struct(model.fields), model.fields, nameTransforms)))(rows);
 	});
 });

package/src/makeOrderedChildren.ts

@@ -0,0 +1,78 @@
+import { type Cause, Effect, Schema } from "effect";
+import type { Model } from "effect/schema";
+import { SqlClient, SqlSchema } from "effect/sql";
+import type { SqlError } from "effect/sql/SqlError";
+import { storageSchema } from "#adapters/storageSchema.ts";
+import { type ChildOrderError, orderedChildStatements } from "#orderedChildStatements.ts";
+import { repositoryChanges } from "#repositoryChanges.ts";
+import { sqlNameTransforms } from "#sqlNameTransforms.ts";
+import type { IdColumn, VersionColumn } from "#versionedRepository.ts";
+
+type Column<TModel extends Model.Any> = Extract<keyof TModel["fields"] & keyof TModel["insert"]["Type"], string>;
+type Position<TModel extends Model.Any> = {
+	[TKey in Column<TModel>]: TModel["fields"][TKey] extends Schema.ConstraintCodec<number, number, never, never> ? TKey : never;
+}[Column<TModel>];
+
+export const makeOrderedChildren = Effect.fn("Sql.makeOrderedChildren")(function* <
+	TModel extends Model.Any,
+	const TId extends Extract<IdColumn<TModel>, string>,
+	const TParent extends Column<TModel>,
+	const TPosition extends Position<TModel>,
+>(
+	model: TModel,
+	options: {
+		readonly idColumn: TId;
+		readonly parentColumn: TParent;
+		readonly parentTable: string;
+		readonly parentIdColumn: string;
+		readonly positionColumn: TPosition;
+		readonly spanPrefix: string;
+		readonly tableName: string;
+		readonly versionColumn?: VersionColumn<TModel, TId>;
+	},
+) {
+	const sql = yield* SqlClient.SqlClient;
+	const nameTransforms = yield* sqlNameTransforms;
+	const changes = yield* repositoryChanges(options.tableName, [options.idColumn], model.fields);
+	const statements = yield* orderedChildStatements(model, options, changes);
+	const encode = Schema.encodeEffect(storageSchema(model.insert, model.fields, nameTransforms));
+	const decode = Schema.decodeUnknownEffect(storageSchema(model, model.fields, nameTransforms));
+	const { parentColumn, positionColumn, versionColumn, tableName, spanPrefix } = options;
+	function append(
+		parent: TModel["fields"][TParent]["Type"],
+		input: Omit<TModel["insert"]["Type"], TParent | TPosition>,
+	): Effect.Effect<
+		TModel["Type"],
+		SqlError | Schema.SchemaError | Cause.NoSuchElementError,
+		TModel["insert"]["EncodingServices"] | TModel["DecodingServices"]
+	> {
+		return Effect.gen(function* () {
+			const encodedParent = yield* statements.lock(parent);
+			const last = yield* SqlSchema.findOne({
+				execute: (value) =>
+					sql`select coalesce(max(${sql(positionColumn)}) + 1, 0)::integer as next from ${sql(tableName)} where ${sql(parentColumn)} = ${value}`,
+				Request: Schema.Unknown,
+				Result: Schema.Struct({ next: Schema.Int }),
+			})(encodedParent);
+			const encoded = yield* encode({ ...input, [parentColumn]: parent, [positionColumn]: last.next });
+			const row = versionColumn === undefined ? encoded : { ...encoded, [versionColumn]: 0 };
+			const rows = yield* sql`insert into ${sql(tableName)} ${sql.insert(row)} returning ${changes.returning()}`;
+			yield* changes.record(rows);
+			return yield* decode(rows[0]);
+		}).pipe(changes.write, Effect.withSpan(`${spanPrefix}.append`));
+	}
+	type OrderResult = Effect.Effect<
+		void,
+		SqlError | Schema.SchemaError | Cause.NoSuchElementError | ChildOrderError,
+		TModel["fields"][TParent | TId]["EncodingServices"] | TModel["fields"][TId]["DecodingServices"]
+	>;
+	function move(parent: TModel["fields"][TParent]["Type"], id: TModel["fields"][TId]["Type"], position: number): OrderResult;
+	function move(parent: unknown, id: unknown, position: number) {
+		return statements.move(parent, id, position).pipe(changes.write, Effect.withSpan(`${spanPrefix}.move`));
+	}
+	function reorder(parent: TModel["fields"][TParent]["Type"], ids: readonly TModel["fields"][TId]["Type"][]): OrderResult;
+	function reorder(parent: unknown, ids: readonly unknown[]) {
+		return statements.reorder(parent, ids).pipe(changes.write, Effect.withSpan(`${spanPrefix}.reorder`));
+	}
+	return { append, move, reorder };
+});

package/src/makeWorkerRelease.ts

@@ -0,0 +1,12 @@
+import { Effect } from "effect";
+import { initializeWorkerRelease } from "./initializeWorkerRelease.ts";
+import { registerWorkerRelease } from "./registerWorkerRelease.ts";
+import { setWorkerReleaseActive } from "./setWorkerReleaseActive.ts";
+
+export const makeWorkerRelease = Effect.fn("EffectSql.makeWorkerRelease")(function* () {
+	const state = yield* initializeWorkerRelease;
+	return {
+		service: { register: registerWorkerRelease(state) },
+		setActive: setWorkerReleaseActive(state),
+	};
+});