@fragno-dev/db 0.2.1 → 0.3.0

package/src/adapters/adapters.ts

@@ -1,9 +1,11 @@
 import type { SimpleQueryInterface } from "../query/simple-query-interface";
-import type { SchemaGenerator } from "../schema-generator/schema-generator";
 import type { AnySchema } from "../schema/create";
 import type { RequestContextStorage } from "@fragno-dev/core/internal/request-context-storage";
 import type { IUnitOfWork } from "../query/unit-of-work/unit-of-work";
 import type { PreparedMigrations } from "./generic-sql/migration/prepared-migrations";
+import type { SQLProvider } from "../shared/providers";
+import type { SQLiteStorageMode } from "./generic-sql/sqlite-storage";
+import type { SqlNamingStrategy } from "../naming/sql-naming";
 
 export const fragnoDatabaseAdapterNameFakeSymbol = "$fragno-database-adapter-name" as const;
 export const fragnoDatabaseAdapterVersionFakeSymbol = "$fragno-database-adapter-version" as const;
@@ -16,12 +18,12 @@ export type DatabaseContextStorage = {
   uow: IUnitOfWork;
 };
 
-/**
- * Maps logical table names (used by fragment authors) to physical table names (with namespace suffix)
- */
-export interface TableNameMapper {
-  toPhysical(logicalName: string): string;
-  toLogical(physicalName: string): string;
+export type SQLiteProfile = "default" | "prisma";
+
+export interface DatabaseAdapterMetadata {
+  databaseType?: SQLProvider;
+  sqliteProfile?: SQLiteProfile;
+  sqliteStorageMode?: SQLiteStorageMode;
 }
 
 export interface DatabaseAdapter<TUOWConfig = void> {
@@ -34,36 +36,40 @@ export interface DatabaseAdapter<TUOWConfig = void> {
    */
   readonly contextStorage: RequestContextStorage<DatabaseContextStorage>;
 
+  /**
+   * Optional adapter override used for durable hook processing.
+   * Use this when the public adapter wraps another adapter (e.g. model checker).
+   */
+  getHookProcessingAdapter?: () => DatabaseAdapter<TUOWConfig>;
+
   /**
    * Get current schema version, undefined if not initialized.
    */
   getSchemaVersion(namespace: string): Promise<string | undefined>;
 
+  /**
+   * Optional metadata used by schema output tooling.
+   */
+  readonly adapterMetadata?: DatabaseAdapterMetadata;
+
+  /**
+   * Naming strategy used for physical SQL identifiers.
+   */
+  readonly namingStrategy: SqlNamingStrategy;
+
+  /**
+   * @deprecated Avoid using query engines directly in fragment code. Prefer handlerTx/serviceTx.
+   */
   createQueryEngine: <const T extends AnySchema>(
     schema: T,
-    namespace: string,
+    namespace: string | null,
   ) => SimpleQueryInterface<T, TUOWConfig>;
 
   prepareMigrations?: <const T extends AnySchema>(
     schema: T,
-    namespace: string,
+    namespace: string | null,
   ) => PreparedMigrations;
 
-  /**
-   * Generate a combined schema file from one or more fragments.
-   * If not implemented, schema generation is not supported for this adapter.
-   */
-  createSchemaGenerator?: (
-    fragments: { schema: AnySchema; namespace: string }[],
-    options?: { path?: string },
-  ) => SchemaGenerator;
-
-  /**
-   * Creates a table name mapper for the given namespace.
-   * Used to convert between logical table names and physical table names.
-   */
-  createTableNameMapper: (namespace: string) => TableNameMapper;
-
   isConnectionHealthy: () => Promise<boolean>;
 
   close: () => Promise<void>;

package/src/adapters/drizzle/migrate-drizzle.test.ts

@@ -9,7 +9,7 @@ const { generateDrizzleJson, generateMigration } =
   require("drizzle-kit/api") as typeof import("drizzle-kit/api");
 
 describe("generateSchema and migrate", () => {
-  const testSchema = schema((s) => {
+  const testSchema = schema("test", (s) => {
     return s
       .addTable("users", (t) => {
         return t
@@ -155,7 +155,8 @@ describe("generateSchema and migrate", () => {
       	"key" text NOT NULL,
       	"value" text NOT NULL,
       	"_internalId" bigserial PRIMARY KEY NOT NULL,
-      	"_version" integer DEFAULT 0 NOT NULL
+      	"_version" integer DEFAULT 0 NOT NULL,
+      	CONSTRAINT "fragno_db_settings_id_unique" UNIQUE("id")
       );
 
       CREATE TABLE "fragno_hooks" (
@@ -172,10 +173,23 @@ describe("generateSchema and migrate", () => {
       	"createdAt" timestamp DEFAULT now() NOT NULL,
       	"nonce" text NOT NULL,
       	"_internalId" bigserial PRIMARY KEY NOT NULL,
-      	"_version" integer DEFAULT 0 NOT NULL
+      	"_version" integer DEFAULT 0 NOT NULL,
+      	CONSTRAINT "fragno_hooks_id_unique" UNIQUE("id")
       );
 
-      CREATE TABLE "users" (
+      CREATE TABLE "fragno_db_outbox" (
+      	"id" varchar(30) NOT NULL,
+      	"versionstamp" text NOT NULL,
+      	"uowId" text NOT NULL,
+      	"payload" json NOT NULL,
+      	"refMap" json,
+      	"createdAt" timestamp DEFAULT now() NOT NULL,
+      	"_internalId" bigserial PRIMARY KEY NOT NULL,
+      	"_version" integer DEFAULT 0 NOT NULL,
+      	CONSTRAINT "fragno_db_outbox_id_unique" UNIQUE("id")
+      );
+
+      CREATE TABLE "test"."users" (
       	"id" varchar(30) NOT NULL,
       	"name" text NOT NULL,
       	"email" text NOT NULL,
@@ -185,10 +199,11 @@ describe("generateSchema and migrate", () => {
       	"createdAt" timestamp DEFAULT now() NOT NULL,
       	"updatedAt" timestamp DEFAULT now() NOT NULL,
       	"_internalId" bigserial PRIMARY KEY NOT NULL,
-      	"_version" integer DEFAULT 0 NOT NULL
+      	"_version" integer DEFAULT 0 NOT NULL,
+      	CONSTRAINT "users_id_unique" UNIQUE("id")
       );
 
-      CREATE TABLE "posts" (
+      CREATE TABLE "test"."posts" (
       	"id" varchar(30) NOT NULL,
       	"title" text NOT NULL,
       	"slug" varchar(255) NOT NULL,
@@ -204,10 +219,11 @@ describe("generateSchema and migrate", () => {
       	"thumbnail" "bytea",
       	"createdAt" timestamp DEFAULT now() NOT NULL,
       	"_internalId" bigserial PRIMARY KEY NOT NULL,
-      	"_version" integer DEFAULT 0 NOT NULL
+      	"_version" integer DEFAULT 0 NOT NULL,
+      	CONSTRAINT "posts_id_unique" UNIQUE("id")
       );
 
-      CREATE TABLE "comments" (
+      CREATE TABLE "test"."comments" (
       	"id" varchar(30) NOT NULL,
       	"content" text NOT NULL,
       	"postId" bigint NOT NULL,
@@ -217,10 +233,11 @@ describe("generateSchema and migrate", () => {
       	"editedAt" timestamp,
       	"isDeleted" boolean DEFAULT false NOT NULL,
       	"_internalId" bigserial PRIMARY KEY NOT NULL,
-      	"_version" integer DEFAULT 0 NOT NULL
+      	"_version" integer DEFAULT 0 NOT NULL,
+      	CONSTRAINT "comments_id_unique" UNIQUE("id")
       );
 
-      CREATE TABLE "tags" (
+      CREATE TABLE "test"."tags" (
       	"id" varchar(30) NOT NULL,
       	"name" text NOT NULL,
       	"slug" varchar(100) NOT NULL,
@@ -228,42 +245,46 @@ describe("generateSchema and migrate", () => {
       	"color" varchar(7),
       	"usageCount" bigint DEFAULT 0 NOT NULL,
       	"_internalId" bigserial PRIMARY KEY NOT NULL,
-      	"_version" integer DEFAULT 0 NOT NULL
+      	"_version" integer DEFAULT 0 NOT NULL,
+      	CONSTRAINT "tags_id_unique" UNIQUE("id")
       );
 
-      CREATE TABLE "postTags" (
+      CREATE TABLE "test"."postTags" (
       	"id" varchar(30) NOT NULL,
       	"postId" bigint NOT NULL,
       	"tagId" bigint NOT NULL,
       	"order" integer DEFAULT 0 NOT NULL,
       	"createdAt" timestamp DEFAULT now() NOT NULL,
       	"_internalId" bigserial PRIMARY KEY NOT NULL,
-      	"_version" integer DEFAULT 0 NOT NULL
+      	"_version" integer DEFAULT 0 NOT NULL,
+      	CONSTRAINT "postTags_id_unique" UNIQUE("id")
       );
 
-      ALTER TABLE "posts" ADD CONSTRAINT "posts_users_author_fk" FOREIGN KEY ("userId") REFERENCES "public"."users"("_internalId") ON DELETE no action ON UPDATE no action;
-      ALTER TABLE "comments" ADD CONSTRAINT "comments_posts_post_fk" FOREIGN KEY ("postId") REFERENCES "public"."posts"("_internalId") ON DELETE no action ON UPDATE no action;
-      ALTER TABLE "comments" ADD CONSTRAINT "comments_users_author_fk" FOREIGN KEY ("userId") REFERENCES "public"."users"("_internalId") ON DELETE no action ON UPDATE no action;
-      ALTER TABLE "comments" ADD CONSTRAINT "comments_comments_parent_fk" FOREIGN KEY ("parentId") REFERENCES "public"."comments"("_internalId") ON DELETE no action ON UPDATE no action;
-      ALTER TABLE "postTags" ADD CONSTRAINT "postTags_posts_post_fk" FOREIGN KEY ("postId") REFERENCES "public"."posts"("_internalId") ON DELETE no action ON UPDATE no action;
-      ALTER TABLE "postTags" ADD CONSTRAINT "postTags_tags_tag_fk" FOREIGN KEY ("tagId") REFERENCES "public"."tags"("_internalId") ON DELETE no action ON UPDATE no action;
+      ALTER TABLE "test"."posts" ADD CONSTRAINT "fk_posts_users_author" FOREIGN KEY ("userId") REFERENCES "test"."users"("_internalId") ON DELETE no action ON UPDATE no action;
+      ALTER TABLE "test"."comments" ADD CONSTRAINT "fk_comments_posts_post" FOREIGN KEY ("postId") REFERENCES "test"."posts"("_internalId") ON DELETE no action ON UPDATE no action;
+      ALTER TABLE "test"."comments" ADD CONSTRAINT "fk_comments_users_author" FOREIGN KEY ("userId") REFERENCES "test"."users"("_internalId") ON DELETE no action ON UPDATE no action;
+      ALTER TABLE "test"."comments" ADD CONSTRAINT "fk_comments_comments_parent" FOREIGN KEY ("parentId") REFERENCES "test"."comments"("_internalId") ON DELETE no action ON UPDATE no action;
+      ALTER TABLE "test"."postTags" ADD CONSTRAINT "fk_postTags_posts_post" FOREIGN KEY ("postId") REFERENCES "test"."posts"("_internalId") ON DELETE no action ON UPDATE no action;
+      ALTER TABLE "test"."postTags" ADD CONSTRAINT "fk_postTags_tags_tag" FOREIGN KEY ("tagId") REFERENCES "test"."tags"("_internalId") ON DELETE no action ON UPDATE no action;
       CREATE UNIQUE INDEX "unique_key" ON "fragno_db_settings" USING btree ("key");
       CREATE INDEX "idx_namespace_status_retry" ON "fragno_hooks" USING btree ("namespace","status","nextRetryAt");
       CREATE INDEX "idx_nonce" ON "fragno_hooks" USING btree ("nonce");
-      CREATE UNIQUE INDEX "idx_users_email" ON "users" USING btree ("email");
-      CREATE INDEX "idx_users_name" ON "users" USING btree ("name");
-      CREATE INDEX "idx_users_active" ON "users" USING btree ("isActive");
-      CREATE INDEX "idx_posts_user" ON "posts" USING btree ("userId");
-      CREATE INDEX "idx_posts_title" ON "posts" USING btree ("title");
-      CREATE UNIQUE INDEX "idx_posts_slug" ON "posts" USING btree ("slug");
-      CREATE INDEX "idx_posts_published" ON "posts" USING btree ("isPublished","publishedAt");
-      CREATE INDEX "idx_comments_post" ON "comments" USING btree ("postId");
-      CREATE INDEX "idx_comments_user" ON "comments" USING btree ("userId");
-      CREATE INDEX "idx_comments_parent" ON "comments" USING btree ("parentId");
-      CREATE UNIQUE INDEX "idx_tags_slug" ON "tags" USING btree ("slug");
-      CREATE INDEX "idx_tags_name" ON "tags" USING btree ("name");
-      CREATE UNIQUE INDEX "idx_postTags_post_tag" ON "postTags" USING btree ("postId","tagId");
-      CREATE INDEX "idx_postTags_tag" ON "postTags" USING btree ("tagId");"
+      CREATE UNIQUE INDEX "idx_outbox_versionstamp" ON "fragno_db_outbox" USING btree ("versionstamp");
+      CREATE INDEX "idx_outbox_uow" ON "fragno_db_outbox" USING btree ("uowId");
+      CREATE UNIQUE INDEX "idx_users_email" ON "test"."users" USING btree ("email");
+      CREATE INDEX "idx_users_name" ON "test"."users" USING btree ("name");
+      CREATE INDEX "idx_users_active" ON "test"."users" USING btree ("isActive");
+      CREATE INDEX "idx_posts_user" ON "test"."posts" USING btree ("userId");
+      CREATE INDEX "idx_posts_title" ON "test"."posts" USING btree ("title");
+      CREATE UNIQUE INDEX "idx_posts_slug" ON "test"."posts" USING btree ("slug");
+      CREATE INDEX "idx_posts_published" ON "test"."posts" USING btree ("isPublished","publishedAt");
+      CREATE INDEX "idx_comments_post" ON "test"."comments" USING btree ("postId");
+      CREATE INDEX "idx_comments_user" ON "test"."comments" USING btree ("userId");
+      CREATE INDEX "idx_comments_parent" ON "test"."comments" USING btree ("parentId");
+      CREATE UNIQUE INDEX "idx_tags_slug" ON "test"."tags" USING btree ("slug");
+      CREATE INDEX "idx_tags_name" ON "test"."tags" USING btree ("name");
+      CREATE UNIQUE INDEX "idx_postTags_post_tag" ON "test"."postTags" USING btree ("postId","tagId");
+      CREATE INDEX "idx_postTags_tag" ON "test"."postTags" USING btree ("tagId");"
     `);
   });
 });