envio 2.25.1 → 2.25.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v2.25.1",
+  "version": "v2.25.2",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.js",
   "main": "./index.js",
@@ -25,10 +25,10 @@
   },
   "homepage": "https://envio.dev",
   "optionalDependencies": {
-    "envio-linux-x64": "v2.25.1",
-    "envio-linux-arm64": "v2.25.1",
-    "envio-darwin-x64": "v2.25.1",
-    "envio-darwin-arm64": "v2.25.1"
+    "envio-linux-x64": "v2.25.2",
+    "envio-linux-arm64": "v2.25.2",
+    "envio-darwin-x64": "v2.25.2",
+    "envio-darwin-arm64": "v2.25.2"
   },
   "dependencies": {
     "@envio-dev/hypersync-client": "0.6.5",

package/src/PgStorage.res

@@ -58,6 +58,7 @@ let makeInitializeTransaction = (
   ~generalTables=[],
   ~entities=[],
   ~enums=[],
+  ~reuseExistingPgSchema=false,
 ) => {
   let allTables = generalTables->Array.copy
   let allEntityTables = []
@@ -69,9 +70,16 @@ let makeInitializeTransaction = (
   let derivedSchema = Schema.make(allEntityTables)
 
   let query = ref(
-    `DROP SCHEMA IF EXISTS "${pgSchema}" CASCADE;
-CREATE SCHEMA "${pgSchema}";
-GRANT ALL ON SCHEMA "${pgSchema}" TO "${pgUser}";
+    (
+      reuseExistingPgSchema
+      // Hosted Service already have a DB with the created public schema
+      // It also doesn't allow to simply drop it,
+      // so we reuse an existing schema when it's empty (our case)
+        ? ""
+        : `DROP SCHEMA IF EXISTS "${pgSchema}" CASCADE;
+CREATE SCHEMA "${pgSchema}";\n`
+    ) ++
+    `GRANT ALL ON SCHEMA "${pgSchema}" TO "${pgUser}";
 GRANT ALL ON SCHEMA "${pgSchema}" TO public;`,
   )
 
@@ -439,7 +447,14 @@ let make = (~sql: Postgres.sql, ~pgSchema, ~pgUser): Persistence.storage => {
       )
     }
 
-    let queries = makeInitializeTransaction(~pgSchema, ~pgUser, ~generalTables, ~entities, ~enums)
+    let queries = makeInitializeTransaction(
+      ~pgSchema,
+      ~pgUser,
+      ~generalTables,
+      ~entities,
+      ~enums,
+      ~reuseExistingPgSchema=schemaTableNames->Utils.Array.isEmpty,
+    )
     // Execute all queries within a single transaction for integrity
     let _ = await sql->Postgres.beginSql(sql => {
       queries->Js.Array2.map(query => sql->Postgres.unsafe(query))

package/src/PgStorage.res.js

@@ -59,10 +59,11 @@ function makeCreateTableQuery(table, pgSchema) {
         ) + ");";
 }
 
-function makeInitializeTransaction(pgSchema, pgUser, generalTablesOpt, entitiesOpt, enumsOpt) {
+function makeInitializeTransaction(pgSchema, pgUser, generalTablesOpt, entitiesOpt, enumsOpt, reuseExistingPgSchemaOpt) {
   var generalTables = generalTablesOpt !== undefined ? generalTablesOpt : [];
   var entities = entitiesOpt !== undefined ? entitiesOpt : [];
   var enums = enumsOpt !== undefined ? enumsOpt : [];
+  var reuseExistingPgSchema = reuseExistingPgSchemaOpt !== undefined ? reuseExistingPgSchemaOpt : false;
   var allTables = $$Array.copy(generalTables);
   var allEntityTables = [];
   entities.forEach(function (entity) {
@@ -72,7 +73,9 @@ function makeInitializeTransaction(pgSchema, pgUser, generalTablesOpt, entitiesO
       });
   var derivedSchema = Schema.make(allEntityTables);
   var query = {
-    contents: "DROP SCHEMA IF EXISTS \"" + pgSchema + "\" CASCADE;\nCREATE SCHEMA \"" + pgSchema + "\";\nGRANT ALL ON SCHEMA \"" + pgSchema + "\" TO \"" + pgUser + "\";\nGRANT ALL ON SCHEMA \"" + pgSchema + "\" TO public;"
+    contents: (
+      reuseExistingPgSchema ? "" : "DROP SCHEMA IF EXISTS \"" + pgSchema + "\" CASCADE;\nCREATE SCHEMA \"" + pgSchema + "\";\n"
+    ) + ("GRANT ALL ON SCHEMA \"" + pgSchema + "\" TO \"" + pgUser + "\";\nGRANT ALL ON SCHEMA \"" + pgSchema + "\" TO public;")
   };
   enums.forEach(function (enumConfig) {
         var enumCreateQuery = "CREATE TYPE \"" + pgSchema + "\"." + enumConfig.name + " AS ENUM(" + enumConfig.variants.map(function (v) {
@@ -300,7 +303,7 @@ function make(sql, pgSchema, pgUser) {
           })) {
       Js_exn.raiseError("Cannot run Envio migrations on PostgreSQL schema \"" + pgSchema + "\" because it contains non-Envio tables. Running migrations would delete all data in this schema.\n\nTo resolve this:\n1. If you want to use this schema, first backup any important data, then drop it with: \"pnpm envio local db-migrate down\"\n2. Or specify a different schema name by setting the \"ENVIO_PG_PUBLIC_SCHEMA\" environment variable\n3. Or manually drop the schema in your database if you're certain the data is not needed.");
     }
-    var queries = makeInitializeTransaction(pgSchema, pgUser, generalTables, entities, enums);
+    var queries = makeInitializeTransaction(pgSchema, pgUser, generalTables, entities, enums, Utils.$$Array.isEmpty(schemaTableNames));
     await sql.begin(function (sql) {
           return queries.map(function (query) {
                       return sql.unsafe(query);