rake-db 2.3.22 → 2.3.24

package/.env.local

@@ -1,2 +1,2 @@
-DATABASE_URL=postgres://postgres:@localhost:5432/porm
-#DATABASE_URL_TEST=postgres://postgres:@localhost:5432/porm_test
+#DATABASE_URL=postgres://postgres:@localhost:5432/porm
+DATABASE_URL=postgres://romeerez:e2Y6ovIJruas@ep-autumn-tooth-279704.eu-central-1.aws.neon.tech/neondb?ssl=true

package/.turbo/turbo-test.log

@@ -1,22 +1,22 @@
 
-> rake-db@2.3.17 test /home/romeo/dev/my/orchid-orm/packages/rake-db
+> rake-db@2.3.22 test /home/romeo/dev/my/orchid-orm/packages/rake-db
 > jest "--coverage" "--coverageReporters" "json-summary"
 
-PASS src/commands/generate.test.ts
-PASS src/commands/migrateOrRollback.test.ts
+PASS src/migration/migration.test.ts
 PASS src/commands/createOrDrop.test.ts
-PASS src/migration/createTable.test.ts
+PASS src/commands/migrateOrRollback.test.ts
 PASS src/migration/changeTable.test.ts
 PASS src/common.test.ts
-PASS src/migration/migration.test.ts
+PASS src/pull/dbStructure.test.ts
 PASS src/rakeDb.test.ts
+PASS src/pull/structureToAst.test.ts
+PASS src/commands/generate.test.ts
 PASS src/pull/astToMigration.test.ts
+PASS src/migration/createTable.test.ts
 PASS src/pull/pull.test.ts
-PASS src/pull/dbStructure.test.ts
-PASS src/pull/structureToAst.test.ts
 
 Test Suites: 12 passed, 12 total
 Tests:       182 passed, 182 total
 Snapshots:   0 total
-Time:        8.267 s, estimated 10 s
+Time:        3.951 s
 Ran all test suites.

package/.turbo/turbo-test:ci.log

@@ -0,0 +1,22 @@
+
+> rake-db@2.3.24 test:ci /home/romeo/dev/my/orchid-orm/packages/rake-db
+> jest --coverage --coverageReporters json-summary
+
+PASS src/migration/changeTable.test.ts
+PASS src/migration/createTable.test.ts
+PASS src/commands/createOrDrop.test.ts
+PASS src/pull/structureToAst.test.ts
+PASS src/common.test.ts
+PASS src/migration/migration.test.ts
+PASS src/commands/migrateOrRollback.test.ts
+PASS src/commands/generate.test.ts
+PASS src/rakeDb.test.ts
+PASS src/pull/pull.test.ts
+PASS src/pull/dbStructure.test.ts
+PASS src/pull/astToMigration.test.ts
+
+Test Suites: 12 passed, 12 total
+Tests:       184 passed, 184 total
+Snapshots:   0 total
+Time:        4.744 s
+Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # rake-db
 
+## 2.3.24
+
+### Patch Changes
+
+- Handle ssl required case in db create; Confirm db creation before asking for creds
+
+## 2.3.23
+
+### Patch Changes
+
+- Updated dependencies
+  - pqb@0.9.13
+
 ## 2.3.22
 
 ### Patch Changes

package/dist/index.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var pqb = require('pqb');
-var Enquirer = require('enquirer');
 var path = require('path');
 var promises = require('fs/promises');
+var prompts = require('prompts');
 var url = require('url');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -28,8 +28,8 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var Enquirer__default = /*#__PURE__*/_interopDefaultLegacy(Enquirer);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
+var prompts__default = /*#__PURE__*/_interopDefaultLegacy(prompts);
 
 var __defProp$6 = Object.defineProperty;
 var __defProps$5 = Object.defineProperties;
@@ -131,32 +131,35 @@ const setAdapterOptions = (options, set) => {
     return __spreadValues$6(__spreadValues$6({}, options), set);
   }
 };
-const askAdminCredentials = async () => {
-  const prompt = new Enquirer__default["default"].Snippet({
-    message: `What are postgres admin login and password?`,
-    fields: [
-      {
-        name: "user",
-        required: true
-      },
-      {
-        name: "password"
-      }
-    ],
-    values: {
-      user: "postgres",
-      password: ""
+const setAdminCredentialsToOptions = async (options, create) => {
+  const confirm = await prompts__default["default"]([
+    {
+      message: `Would you like to share admin credentials to ${create ? "create" : "drop"} a database`,
+      type: "confirm",
+      name: "confirm",
+      initial: true
+    }
+  ]);
+  if (!confirm.confirm) {
+    return;
+  }
+  const values = await prompts__default["default"]([
+    {
+      message: "Enter admin user:",
+      type: "text",
+      name: "user",
+      initial: "postgres",
+      min: 1
     },
-    template: "Admin user: {{user}}\nAdmin password: {{password}}"
-  });
-  const { values } = await prompt.run();
-  if (!values.password)
-    values.password = "";
-  return values;
-};
-const setAdminCredentialsToOptions = async (options) => {
-  const values = await askAdminCredentials();
-  return setAdapterOptions(options, values);
+    {
+      message: "Enter admin password:",
+      type: "password",
+      name: "password"
+    }
+  ]);
+  return setAdapterOptions(options, __spreadProps$5(__spreadValues$6({}, values), {
+    password: values.password || void 0
+  }));
 };
 const createSchemaMigrations = async (db, config) => {
   try {
@@ -1299,9 +1302,12 @@ const execute = async (options, sql) => {
     return "ok";
   } catch (error) {
     const err = error;
+    if (typeof err.message === "string" && err.message.includes("sslmode=require")) {
+      return "ssl required";
+    }
     if (err.code === "42P04" || err.code === "3D000") {
       return "already";
-    } else if (err.code === "42501") {
+    } else if (err.code === "42501" || typeof err.message === "string" && err.message.includes("password authentication failed")) {
       return "forbidden";
     } else {
       return { error };
@@ -1320,18 +1326,30 @@ const createOrDrop = async (options, adminOptions, config, args) => {
     console.log(args.successMessage(params));
   } else if (result === "already") {
     console.log(args.alreadyMessage(params));
+  } else if (result === "ssl required") {
+    console.log("SSL is required: append ?ssl=true to the database url string");
+    return;
   } else if (result === "forbidden") {
-    await createOrDrop(
+    let message = `Permission denied to ${args.create ? "create" : "drop"} database.`;
+    const host = adminOptions.databaseURL ? new URL(adminOptions.databaseURL).hostname : adminOptions.host;
+    const isLocal = host === "localhost";
+    if (!isLocal) {
+      message += `
+Don't use this command for database service providers, only for a local db.`;
+    }
+    console.log(message);
+    const updatedOptions = await setAdminCredentialsToOptions(
       options,
-      await setAdminCredentialsToOptions(options),
-      config,
-      args
+      args.create
     );
+    if (!updatedOptions)
+      return;
+    await createOrDrop(options, updatedOptions, config, args);
     return;
   } else {
     throw result.error;
   }
-  if (!args.createVersionsTable)
+  if (!args.create)
     return;
   const db = new pqb.Adapter(options);
   await createSchemaMigrations(db, config);
@@ -1349,7 +1367,7 @@ const createDb = async (arg, config) => {
       alreadyMessage({ database }) {
         return `Database ${database} already exists`;
       },
-      createVersionsTable: true
+      create: true
     });
   }
 };