@shivaedev/sql 0.29.0 → 0.31.0

package/src/repositoryWrites.ts

@@ -3,6 +3,7 @@ import type { Model } from "effect/schema";
 import { type SqlClient, SqlSchema } from "effect/sql";
 import type { RepositoryChanges } from "./repositoryChanges.ts";
 import { makeFilter } from "./repositoryFilter.ts";
+import { selectedUpdate } from "./repositoryUpdate.ts";
 
 export function repositoryWrites(
 	model: Model.Any,
@@ -36,6 +37,15 @@ export function repositoryWrites(
 	const insertVoid = SqlSchema.void({ execute: insert, Request: model.insert });
 	const updateRow = SqlSchema.findOne({ execute: update, Request: model.update, Result: model });
 	const updateVoid = SqlSchema.void({ execute: update, Request: model.update });
+	function selected(input: unknown, columns: readonly string[], returning: boolean) {
+		return Effect.gen(function* () {
+			const row = yield* record(input);
+			const Request = yield* selectedUpdate(model, columns, idColumns, row);
+			return yield* returning
+				? SqlSchema.findOne({ execute: update, Request, Result: model })(row)
+				: SqlSchema.void({ execute: update, Request })(row);
+		});
+	}
 	const idColumn = idColumns[0] ?? "";
 	const key = model.fields[idColumn];
 	if (key === undefined) {
@@ -63,10 +73,15 @@ export function repositoryWrites(
 		insert: (input: unknown) =>
 			changes.write(insertRow(input).pipe(Effect.catchTag("NoSuchElementError", Effect.die))).pipe(Effect.withSpan(`${spanPrefix}.insert`)),
 		insertVoid: (input: unknown) => changes.write(insertVoid(input)).pipe(Effect.withSpan(`${spanPrefix}.insertVoid`)),
-		update: (input: unknown, settings?: { readonly onMissing: "fail" }) =>
+		update: (input: unknown, settings?: { readonly onMissing?: "fail"; readonly columns?: readonly string[] }) => {
+			const result = settings?.columns === undefined ? updateRow(input) : selected(input, settings.columns, true);
+			return changes
+				.write(settings?.onMissing === "fail" ? result : result.pipe(Effect.catchTag("NoSuchElementError", Effect.die)))
+				.pipe(Effect.withSpan(`${spanPrefix}.update`));
+		},
+		updateVoid: (input: unknown, settings?: { readonly columns: readonly string[] }) =>
 			changes
-				.write(settings?.onMissing === "fail" ? updateRow(input) : updateRow(input).pipe(Effect.catchTag("NoSuchElementError", Effect.die)))
-				.pipe(Effect.withSpan(`${spanPrefix}.update`)),
-		updateVoid: (input: unknown) => changes.write(updateVoid(input)).pipe(Effect.withSpan(`${spanPrefix}.updateVoid`)),
+				.write(settings === undefined ? updateVoid(input) : selected(input, settings.columns, false))
+				.pipe(Effect.withSpan(`${spanPrefix}.updateVoid`)),
 	};
 }

package/src/tryPurgeLock.ts

@@ -0,0 +1,18 @@
+import { Effect } from "effect";
+import { SqlClient } from "effect/sql";
+import type { Statement } from "effect/sql/Statement";
+
+export const tryPurgeLock = Effect.fnUntraced(function* (tableName: string) {
+	const sql = yield* SqlClient.SqlClient;
+	const [identifier] = sql`${sql(tableName)}`.compile();
+	const key = sql`hashtextextended('@shivaedev/sql/deleteBatched:' || ${identifier}::regclass::oid::text, 0)`;
+	const connection = yield* sql.reserve;
+	function execute(statement: Statement<Readonly<Record<string, unknown>>>) {
+		const [text, parameters] = statement.compile();
+		return connection.execute(text, parameters, undefined);
+	}
+	const [lock] = yield* Effect.acquireRelease(execute(sql`select pg_try_advisory_lock(${key}) as acquired`), (rows) =>
+		rows[0]?.acquired === true ? Effect.orDie(execute(sql`select pg_advisory_unlock(${key})`)) : Effect.void,
+	);
+	return lock?.acquired === true;
+});

package/src/versionedRepository.ts

@@ -4,6 +4,7 @@ import type { SqlClient, SqlModel } from "effect/sql";
 import type { SqlError } from "effect/sql/SqlError";
 import type { PrimaryKey, Repository } from "#compositeRepository.ts";
 import type { OptimisticConcurrencyError } from "#repository.ts";
+import type { UpdateInput } from "#repositoryUpdate.ts";
 import { type VersionedOptions, versionedStatements } from "#versionedStatements.ts";
 import type { RepositoryChanges } from "./repositoryChanges.ts";
 
@@ -37,9 +38,9 @@ export interface VersionedWrites<TModel extends Model.Any, TId extends PrimaryKe
 	readonly insert: Repository<TModel, TId>["insert"];
 	readonly insertVoid: Repository<TModel, TId>["insertVoid"];
 	readonly update: (
-		input: TModel["update"]["Type"],
+		input: UpdateInput<TModel>,
 	) => Effect.Effect<TModel["Type"], WriteError, TModel["update"]["EncodingServices"] | TModel["DecodingServices"]>;
-	readonly updateVoid: (input: TModel["update"]["Type"]) => Effect.Effect<void, WriteError, TModel["update"]["EncodingServices"]>;
+	readonly updateVoid: (input: UpdateInput<TModel>) => Effect.Effect<void, WriteError, TModel["update"]["EncodingServices"]>;
 }
 
 export function makeVersionedWrites(