ponder 0.8.1 → 0.8.2

package/dist/bin/ponder.js

@@ -4369,12 +4369,7 @@ var createDatabase = ({
               (tableName) => tableName.sql
             )
           };
-          if (previousApp === void 0) {
-            await tx.insertInto("_ponder_meta").values({ key: "status", value: null }).execute();
-            await tx.insertInto("_ponder_meta").values({
-              key: "app",
-              value: newApp
-            }).execute();
+          const createEnums = async () => {
             for (let i = 0; i < schemaBuild.statements.enums.sql.length; i++) {
               await sql2.raw(schemaBuild.statements.enums.sql[i]).execute(tx).catch((_error) => {
                 const error = _error;
@@ -4387,6 +4382,8 @@ var createDatabase = ({
                 throw e;
               });
             }
+          };
+          const createTables = async () => {
             for (let i = 0; i < schemaBuild.statements.tables.sql.length; i++) {
               await sql2.raw(schemaBuild.statements.tables.sql[i]).execute(tx).catch((_error) => {
                 const error = _error;
@@ -4399,6 +4396,26 @@ var createDatabase = ({
                 throw e;
               });
             }
+          };
+          const dropTables = async () => {
+            for (const tableName of getTableNames(schemaBuild.schema)) {
+              await tx.schema.dropTable(tableName.sql).cascade().ifExists().execute();
+              await tx.schema.dropTable(tableName.reorg).cascade().ifExists().execute();
+            }
+          };
+          const dropEnums = async () => {
+            for (const enumName of schemaBuild.statements.enums.json) {
+              await tx.schema.dropType(enumName.name).ifExists().execute();
+            }
+          };
+          if (previousApp === void 0) {
+            await tx.insertInto("_ponder_meta").values({ key: "status", value: null }).execute();
+            await tx.insertInto("_ponder_meta").values({
+              key: "app",
+              value: newApp
+            }).execute();
+            await createEnums();
+            await createTables();
             common.logger.info({
               service: "database",
               msg: `Created tables [${newApp.table_names.join(", ")}]`
@@ -4410,37 +4427,11 @@ var createDatabase = ({
           }
           if (previousApp.is_dev === 1 || process.env.PONDER_EXPERIMENTAL_DB === "platform" && previousApp.build_id !== newApp.build_id || process.env.PONDER_EXPERIMENTAL_DB === "platform" && previousApp.checkpoint === encodeCheckpoint(zeroCheckpoint)) {
             await tx.updateTable("_ponder_meta").set({ value: null }).where("key", "=", "status").execute();
-            await tx.updateTable("_ponder_meta").set({
-              value: newApp
-            }).where("key", "=", "app").execute();
-            for (const tableName of getTableNames(schemaBuild.schema)) {
-              await tx.schema.dropTable(tableName.sql).cascade().ifExists().execute();
-              await tx.schema.dropTable(tableName.reorg).cascade().ifExists().execute();
-            }
-            for (let i = 0; i < schemaBuild.statements.enums.sql.length; i++) {
-              await sql2.raw(schemaBuild.statements.enums.sql[i]).execute(tx).catch((_error) => {
-                const error = _error;
-                if (!error.message.includes("already exists"))
-                  throw error;
-                const e = new NonRetryableError(
-                  `Unable to create enum '${preBuild.namespace}'.'${schemaBuild.statements.enums.json[i].name}' because an enum with that name already exists.`
-                );
-                e.stack = void 0;
-                throw e;
-              });
-            }
-            for (let i = 0; i < schemaBuild.statements.tables.sql.length; i++) {
-              await sql2.raw(schemaBuild.statements.tables.sql[i]).execute(tx).catch((_error) => {
-                const error = _error;
-                if (!error.message.includes("already exists"))
-                  throw error;
-                const e = new NonRetryableError(
-                  `Unable to create table '${preBuild.namespace}'.'${schemaBuild.statements.tables.json[i].tableName}' because a table with that name already exists.`
-                );
-                e.stack = void 0;
-                throw e;
-              });
-            }
+            await tx.updateTable("_ponder_meta").set({ value: newApp }).where("key", "=", "app").execute();
+            await dropTables();
+            await dropEnums();
+            await createEnums();
+            await createTables();
             common.logger.info({
               service: "database",
               msg: `Created tables [${newApp.table_names.join(", ")}]`
@@ -4450,7 +4441,7 @@ var createDatabase = ({
               checkpoint: encodeCheckpoint(zeroCheckpoint)
             };
           }
-          if (common.options.command === "dev" || previousApp.build_id !== newApp.build_id || previousApp.checkpoint === encodeCheckpoint(zeroCheckpoint)) {
+          if (common.options.command === "dev" || previousApp.build_id !== newApp.build_id) {
             const error = new NonRetryableError(
               `Schema '${preBuild.namespace}' was previously used by a different Ponder app. Drop the schema first, or use a different schema. Read more: https://ponder.sh/docs/getting-started/database#database-schema`
             );
@@ -4464,12 +4455,26 @@ var createDatabase = ({
               expiry: previousApp.heartbeat_at + common.options.databaseHeartbeatTimeout
             };
           }
+          if (previousApp.checkpoint === encodeCheckpoint(zeroCheckpoint)) {
+            await tx.updateTable("_ponder_meta").set({ value: null }).where("key", "=", "status").execute();
+            await tx.updateTable("_ponder_meta").set({ value: newApp }).where("key", "=", "app").execute();
+            await dropTables();
+            await dropEnums();
+            await createEnums();
+            await createTables();
+            common.logger.info({
+              service: "database",
+              msg: `Created tables [${newApp.table_names.join(", ")}]`
+            });
+            return {
+              status: "success",
+              checkpoint: encodeCheckpoint(zeroCheckpoint)
+            };
+          }
           const checkpoint = previousApp.checkpoint;
           newApp.checkpoint = checkpoint;
           await tx.updateTable("_ponder_meta").set({ value: null }).where("key", "=", "status").execute();
-          await tx.updateTable("_ponder_meta").set({
-            value: newApp
-          }).where("key", "=", "app").execute();
+          await tx.updateTable("_ponder_meta").set({ value: newApp }).where("key", "=", "app").execute();
           common.logger.info({
             service: "database",
             msg: `Detected crash recovery for build '${buildId}' in schema '${preBuild.namespace}' last active ${formatEta(Date.now() - previousApp.heartbeat_at)} ago`