Merge pull request #1243 from ponder-sh/kjs/schema

fix: `onchainSchema` creating undefined schema
ponder-sh · Nov 15, 2024 · 843e2f7 · 843e2f7
2 parents 019a8f8 + e7d67be
commit 843e2f7
Show file tree

Hide file tree

Showing 3 changed files with 132 additions and 106 deletions.
diff --git a/.changeset/long-queens-end.md b/.changeset/long-queens-end.md
@@ -0,0 +1,5 @@
+---
+"@ponder/core": patch
+---
+
+Fixed `onchainSchema`.
diff --git a/packages/core/src/database/index.ts b/packages/core/src/database/index.ts
@@ -473,25 +473,6 @@ export const createDatabase = (args: {
       });
     },
     async setup() {
-      await qb.internal.wrap({ method: "setup" }, async () => {
-        for (const statement of args.statements.schema.sql) {
-          await sql.raw(statement).execute(qb.internal);
-        }
-
-        await qb.internal.schema
-          .createSchema(args.namespace)
-          .ifNotExists()
-          .execute();
-
-        // Create "_ponder_meta" table if it doesn't exist
-        await qb.internal.schema
-          .createTable("_ponder_meta")
-          .addColumn("key", "text", (col) => col.primaryKey())
-          .addColumn("value", "jsonb")
-          .ifNotExists()
-          .execute();
-      });
-
       ////////
       // Migrate
       ////////
@@ -511,113 +492,154 @@ export const createDatabase = (args: {
         .then((schema) => schema?.schema_name === "ponder");
 
       if (hasPonderSchema) {
-        await qb.internal.wrap({ method: "setup" }, async () => {
-          const namespaceCount = await qb.internal
-            .withSchema("ponder")
-            // @ts-ignore
-            .selectFrom("namespace_lock")
-            .select(sql`count(*)`.as("count"))
-            .executeTakeFirst();
-
-          const tableNames = await qb.internal
-            .withSchema("ponder")
-            // @ts-ignore
-            .selectFrom("namespace_lock")
-            // @ts-ignore
-            .select("schema")
-            // @ts-ignore
-            .where("namespace", "=", args.namespace)
-            .executeTakeFirst()
-            .then((schema: any | undefined) =>
-              schema === undefined
-                ? undefined
-                : Object.keys(schema.schema.tables),
-            );
-          if (tableNames) {
-            for (const tableName of tableNames) {
-              await qb.internal.schema
-                .dropTable(tableName)
-                .ifExists()
-                .cascade()
-                .execute();
-            }
+        const hasNamespaceLockTable = await qb.internal
+          // @ts-ignore
+          .selectFrom("information_schema.tables")
+          // @ts-ignore
+          .select("table_name")
+          // @ts-ignore
+          .where("table_name", "=", "namespace_lock")
+          .executeTakeFirst()
+          .then((table) => table?.table_name === "namespace_lock");
 
-            await qb.internal
+        if (hasNamespaceLockTable) {
+          await qb.internal.wrap({ method: "migrate" }, async () => {
+            const namespaceCount = await qb.internal
               .withSchema("ponder")
               // @ts-ignore
-              .deleteFrom("namespace_lock")
+              .selectFrom("namespace_lock")
+              .select(sql`count(*)`.as("count"))
+              .executeTakeFirst();
+
+            const tableNames = await qb.internal
+              .withSchema("ponder")
+              // @ts-ignore
+              .selectFrom("namespace_lock")
+              // @ts-ignore
+              .select("schema")
               // @ts-ignore
               .where("namespace", "=", args.namespace)
-              .execute();
+              .executeTakeFirst()
+              .then((schema: any | undefined) =>
+                schema === undefined
+                  ? undefined
+                  : Object.keys(schema.schema.tables),
+              );
+            if (tableNames) {
+              for (const tableName of tableNames) {
+                await qb.internal.schema
+                  .dropTable(tableName)
+                  .ifExists()
+                  .cascade()
+                  .execute();
+              }
 
-            if (namespaceCount!.count === 1) {
-              await qb.internal.schema.dropSchema("ponder").cascade().execute();
+              await qb.internal
+                .withSchema("ponder")
+                // @ts-ignore
+                .deleteFrom("namespace_lock")
+                // @ts-ignore
+                .where("namespace", "=", args.namespace)
+                .execute();
 
-              args.common.logger.debug({
-                service: "database",
-                msg: `Removed 'ponder' schema`,
-              });
+              if (namespaceCount!.count === 1) {
+                await qb.internal.schema
+                  .dropSchema("ponder")
+                  .cascade()
+                  .execute();
+
+                args.common.logger.debug({
+                  service: "database",
+                  msg: `Removed 'ponder' schema`,
+                });
+              }
             }
-          }
-        });
+          });
+        }
       }
 
       // v0.7 migration
 
-      await qb.internal.wrap({ method: "migrate" }, () =>
-        qb.internal.transaction().execute(async (tx) => {
-          const previousApp: PonderApp | undefined = await tx
-            .selectFrom("_ponder_meta")
-            // @ts-ignore
-            .where("key", "=", "app")
-            .select("value")
-            .executeTakeFirst()
-            .then((row) =>
-              row === undefined ? undefined : (row.value as PonderApp),
-            );
-
-          if (previousApp) {
-            const instanceId = crypto.randomBytes(2).toString("hex");
+      const hasPonderMetaTable = await qb.internal
+        // @ts-ignore
+        .selectFrom("information_schema.tables")
+        // @ts-ignore
+        .select("table_name")
+        // @ts-ignore
+        .where("table_name", "=", "_ponder_meta")
+        .executeTakeFirst()
+        .then((table) => table?.table_name === "_ponder_meta");
 
-            await tx
-              .deleteFrom("_ponder_meta")
+      if (hasPonderMetaTable) {
+        await qb.internal.wrap({ method: "migrate" }, () =>
+          qb.internal.transaction().execute(async (tx) => {
+            const previousApp: PonderApp | undefined = await tx
+              .selectFrom("_ponder_meta")
               // @ts-ignore
               .where("key", "=", "app")
-              .execute();
+              .select("value")
+              .executeTakeFirst()
+              .then((row) =>
+                row === undefined ? undefined : (row.value as PonderApp),
+              );
 
-            await tx
-              .deleteFrom("_ponder_meta")
-              // @ts-ignore
-              .where("key", "=", "status")
-              .execute();
+            if (previousApp) {
+              const instanceId = crypto.randomBytes(2).toString("hex");
 
-            for (const tableName of previousApp.table_names) {
-              await tx.schema
-                .alterTable(tableName)
-                .renameTo(userToSqlTableName(tableName, instanceId))
+              await tx
+                .deleteFrom("_ponder_meta")
+                // @ts-ignore
+                .where("key", "=", "app")
                 .execute();
 
-              await tx.schema
-                .alterTable(`_ponder_reorg__${tableName}`)
-                .renameTo(userToReorgTableName(tableName, instanceId))
+              await tx
+                .deleteFrom("_ponder_meta")
+                // @ts-ignore
+                .where("key", "=", "status")
+                .execute();
+
+              for (const tableName of previousApp.table_names) {
+                await tx.schema
+                  .alterTable(tableName)
+                  .renameTo(userToSqlTableName(tableName, instanceId))
+                  .execute();
+
+                await tx.schema
+                  .alterTable(`_ponder_reorg__${tableName}`)
+                  .renameTo(userToReorgTableName(tableName, instanceId))
+                  .execute();
+              }
+
+              await tx
+                .insertInto("_ponder_meta")
+                .values({
+                  key: `app_${instanceId}`,
+                  value: { ...previousApp, instance_id: instanceId },
+                })
                 .execute();
+
+              args.common.logger.debug({
+                service: "database",
+                msg: "Migrated previous app to v0.7",
+              });
             }
+          }),
+        );
+      }
 
-            await tx
-              .insertInto("_ponder_meta")
-              .values({
-                key: `app_${instanceId}`,
-                value: { ...previousApp, instance_id: instanceId },
-              })
-              .execute();
+      await qb.internal.wrap({ method: "setup" }, async () => {
+        for (const statement of args.statements.schema.sql) {
+          await sql.raw(statement).execute(qb.internal);
+        }
 
-            args.common.logger.debug({
-              service: "database",
-              msg: "Migrated previous app to v0.7",
-            });
-          }
-        }),
-      );
+        // Create "_ponder_meta" table if it doesn't exist
+        await qb.internal.schema
+          .createTable("_ponder_meta")
+          .addColumn("key", "text", (col) => col.primaryKey())
+          .addColumn("value", "jsonb")
+          .ifNotExists()
+          .execute();
+      });
 
       const attempt = async ({ isFirstAttempt }: { isFirstAttempt: boolean }) =>
         qb.internal.wrap({ method: "setup" }, () =>

diff --git a/packages/core/src/drizzle/kit/index.ts b/packages/core/src/drizzle/kit/index.ts
@@ -62,8 +62,7 @@ export const getSql = (schema: Schema, instanceId: string): SqlStatements => {
     }) ?? [];
 
   const jsonCreateSchemas = prepareCreateSchemasJson(
-    // @ts-ignore
-    Object.values(squashed.schemas).map((it: { name: any }) => it.name),
+    Object.values(squashed.schemas),
   );
 
   const jsonCreateTables = Object.values(squashed.tables).map((it: any) => {
@@ -589,7 +588,7 @@ class PgCreateSchemaConvertor extends Convertor {
 
   convert(statement: JsonCreateSchema) {
     const { name } = statement;
-    return `CREATE SCHEMA "${name}";\n`;
+    return `CREATE SCHEMA IF NOT EXISTS"${name}";\n`;
   }
 }