rake-db 2.10.23 → 2.10.25

package/dist/index.js

@@ -169,17 +169,28 @@ const setAdminCredentialsToOptions = async (options, create) => {
   }));
 };
 const createSchemaMigrations = async (db, config) => {
-  var _a, _b;
+  var _a, _b, _c;
+  const { schema } = db;
+  if (schema && schema !== "public") {
+    try {
+      await db.query(`CREATE SCHEMA "${schema}"`);
+      (_a = config.logger) == null ? void 0 : _a.log(`Created schema ${schema}`);
+    } catch (err) {
+      if (err.code !== "42P06") {
+        throw err;
+      }
+    }
+  }
   try {
     await db.query(
       `CREATE TABLE ${quoteWithSchema({
         name: config.migrationsTable
       })} ( version TEXT NOT NULL )`
     );
-    (_a = config.logger) == null ? void 0 : _a.log("Created versions table");
+    (_b = config.logger) == null ? void 0 : _b.log("Created versions table");
   } catch (err) {
     if (err.code === "42P07") {
-      (_b = config.logger) == null ? void 0 : _b.log("Versions table exists");
+      (_c = config.logger) == null ? void 0 : _c.log("Versions table exists");
     } else {
       throw err;
     }
@@ -2315,7 +2326,7 @@ const execute = async (options, sql) => {
   }
 };
 const createOrDrop = async (options, adminOptions, config, args) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d;
   const params = getDatabaseAndUserFromOptions(options);
   const result = await execute(
     setAdapterOptions(adminOptions, { database: "postgres" }),
@@ -2353,21 +2364,6 @@ Don't use this command for database service providers, only for a local db.`;
   if (!args.create)
     return;
   const db = new pqb.Adapter(options);
-  const { schema } = db;
-  if (schema) {
-    db.schema = void 0;
-    try {
-      await db.query(`CREATE SCHEMA "${schema}"`);
-      (_e = config.logger) == null ? void 0 : _e.log(`Created schema ${schema}`);
-    } catch (err) {
-      if (err.code === "42P06") {
-        (_f = config.logger) == null ? void 0 : _f.log(`Schema ${schema} already exists`);
-      } else {
-        throw err;
-      }
-    }
-    db.schema = schema;
-  }
   await createSchemaMigrations(db, config);
   await db.close();
 };