rake-db 2.3.44 → 2.4.0

package/dist/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var pqb = require('pqb');
+var orchidCore = require('orchid-core');
 var path = require('path');
 var promises = require('fs/promises');
 var prompts = require('prompts');
@@ -251,7 +252,7 @@ const quoteSchemaTable = ({
   schema,
   name
 }) => {
-  return pqb.singleQuote(schema ? `${schema}.${name}` : name);
+  return orchidCore.singleQuote(schema ? `${schema}.${name}` : name);
 };
 const makePopulateEnumQuery = (item) => {
   const [schema, name] = getSchemaAndTableFromName(item.enumName);
@@ -308,7 +309,7 @@ const columnToSql = (key, item, values, hasMultiplePrimaryKeys) => {
     line.push("NOT NULL");
   }
   if (item.data.default !== void 0) {
-    if (typeof item.data.default === "object" && item.data.default && pqb.isRaw(item.data.default)) {
+    if (typeof item.data.default === "object" && item.data.default && orchidCore.isRaw(item.data.default)) {
       line.push(`DEFAULT ${pqb.getRaw(item.data.default, values)}`);
     } else {
       line.push(`DEFAULT ${pqb.quote(item.data.default)}`);
@@ -431,7 +432,7 @@ const indexesToQuery = (up, { schema, name }, indexes) => {
     sql.push(`(${columnsSql.join(", ")})`);
     if (options.include) {
       sql.push(
-        `INCLUDE (${pqb.toArray(options.include).map((column) => `"${column}"`).join(", ")})`
+        `INCLUDE (${orchidCore.toArray(options.include).map((column) => `"${column}"`).join(", ")})`
       );
     }
     if (options.with) {
@@ -442,7 +443,7 @@ const indexesToQuery = (up, { schema, name }, indexes) => {
     }
     if (options.where) {
       sql.push(
-        `WHERE ${typeof options.where === "object" && options.where && pqb.isRaw(options.where) ? pqb.getRaw(options.where, values) : options.where}`
+        `WHERE ${typeof options.where === "object" && options.where && orchidCore.isRaw(options.where) ? pqb.getRaw(options.where, values) : options.where}`
       );
     }
     return { text: sql.join(" "), values };
@@ -668,10 +669,10 @@ const mergeTableData = (a, b) => {
 function add(item, options) {
   if (item instanceof pqb.ColumnType) {
     return { type: "add", item, dropMode: options == null ? void 0 : options.dropMode };
-  } else if (item === pqb.emptyObject) {
+  } else if (item === orchidCore.emptyObject) {
     mergeTableData(changeTableData.add, pqb.getTableData());
     pqb.resetTableData();
-    return pqb.emptyObject;
+    return orchidCore.emptyObject;
   } else {
     const result = {};
     for (const key in item) {
@@ -687,10 +688,10 @@ function add(item, options) {
 const drop = (item, options) => {
   if (item instanceof pqb.ColumnType) {
     return { type: "drop", item, dropMode: options == null ? void 0 : options.dropMode };
-  } else if (item === pqb.emptyObject) {
+  } else if (item === orchidCore.emptyObject) {
     mergeTableData(changeTableData.drop, pqb.getTableData());
     pqb.resetTableData();
-    return pqb.emptyObject;
+    return orchidCore.emptyObject;
   } else {
     const result = {};
     for (const key in item) {
@@ -875,7 +876,7 @@ const astToQueries = (ast) => {
         );
       }
       if (from.default !== to.default) {
-        const value = typeof to.default === "object" && to.default && pqb.isRaw(to.default) ? pqb.getRaw(to.default, values) : pqb.quote(to.default);
+        const value = typeof to.default === "object" && to.default && orchidCore.isRaw(to.default) ? pqb.getRaw(to.default, values) : pqb.quote(to.default);
         const expr = value === void 0 ? "DROP DEFAULT" : `SET DEFAULT ${value}`;
         alterTable.push(`ALTER COLUMN "${key}" ${expr}`);
       }
@@ -1270,7 +1271,7 @@ const migrateOrRollback = async (options, config, args, up) => {
   if (!config.useCodeUpdater)
     delete config.appCodeUpdater;
   const appCodeUpdaterCache = {};
-  for (const opts of pqb.toArray(options)) {
+  for (const opts of orchidCore.toArray(options)) {
     const adapter = new pqb.Adapter(opts);
     let db;
     if (up) {
@@ -1323,7 +1324,7 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
       try {
         await config.import(file.path);
       } catch (err) {
-        if (err.code === "ERR_UNSUPPORTED_ESM_URL_SCHEME")
+        if (err.code !== "ERR_UNSUPPORTED_ESM_URL_SCHEME")
           throw err;
         await config.import(url__namespace.pathToFileURL(file.path).pathname);
       }
@@ -1432,7 +1433,7 @@ Don't use this command for database service providers, only for a local db.`;
   await db.close();
 };
 const createDb = async (arg, config) => {
-  for (const options of pqb.toArray(arg)) {
+  for (const options of orchidCore.toArray(arg)) {
     await createOrDrop(options, options, config, {
       sql({ database, user }) {
         return `CREATE DATABASE "${database}" OWNER "${user}"`;
@@ -1448,7 +1449,7 @@ const createDb = async (arg, config) => {
   }
 };
 const dropDb = async (arg) => {
-  for (const options of pqb.toArray(arg)) {
+  for (const options of orchidCore.toArray(arg)) {
     await createOrDrop(options, options, migrationConfigDefaults, {
       sql({ database }) {
         return `DROP DATABASE "${database}"`;
@@ -1976,7 +1977,7 @@ const getIsSerial = (item) => {
   if (item.type === "int2" || item.type === "int4" || item.type === "int8") {
     const { default: def, schemaName, tableName, name } = item;
     const seq = `${tableName}_${name}_seq`;
-    if (def && (def === `nextval(${pqb.singleQuote(`${seq}`)}::regclass)` || def === `nextval(${pqb.singleQuote(`"${seq}"`)}::regclass)` || def === `nextval(${pqb.singleQuote(`${schemaName}.${seq}`)}::regclass)` || def === `nextval(${pqb.singleQuote(`"${schemaName}".${seq}`)}::regclass)` || def === `nextval(${pqb.singleQuote(`${schemaName}."${seq}"`)}::regclass)` || def === `nextval(${pqb.singleQuote(`"${schemaName}"."${seq}"`)}::regclass)`)) {
+    if (def && (def === `nextval(${orchidCore.singleQuote(`${seq}`)}::regclass)` || def === `nextval(${orchidCore.singleQuote(`"${seq}"`)}::regclass)` || def === `nextval(${orchidCore.singleQuote(`${schemaName}.${seq}`)}::regclass)` || def === `nextval(${orchidCore.singleQuote(`"${schemaName}".${seq}`)}::regclass)` || def === `nextval(${orchidCore.singleQuote(`${schemaName}."${seq}"`)}::regclass)` || def === `nextval(${orchidCore.singleQuote(`"${schemaName}"."${seq}"`)}::regclass)`)) {
       return true;
     }
   }
@@ -2152,47 +2153,47 @@ ${pqb.codeToString(foreignKeys, "  ", "  ")}
   return code;
 };
 const createSchema = (ast) => {
-  return `await db.createSchema(${pqb.singleQuote(ast.name)});`;
+  return `await db.createSchema(${orchidCore.singleQuote(ast.name)});`;
 };
 const createExtension = (ast) => {
-  const code = [`await db.createExtension(${pqb.singleQuote(ast.name)}`];
+  const code = [`await db.createExtension(${orchidCore.singleQuote(ast.name)}`];
   if (ast.schema || ast.version) {
-    pqb.addCode(code, ", {");
+    orchidCore.addCode(code, ", {");
     if (ast.schema) {
-      code.push([`schema: ${pqb.singleQuote(ast.schema)},`]);
+      code.push([`schema: ${orchidCore.singleQuote(ast.schema)},`]);
     }
     if (ast.version) {
-      code.push([`version: ${pqb.singleQuote(ast.version)},`]);
+      code.push([`version: ${orchidCore.singleQuote(ast.version)},`]);
     }
-    pqb.addCode(code, "}");
+    orchidCore.addCode(code, "}");
   }
-  pqb.addCode(code, ");");
+  orchidCore.addCode(code, ");");
   return code;
 };
 const createEnum = (ast) => {
   const code = [
-    `await db.createEnum(${pqb.singleQuote(ast.name)}, [${ast.values.map(pqb.singleQuote).join(", ")}]`
+    `await db.createEnum(${orchidCore.singleQuote(ast.name)}, [${ast.values.map(orchidCore.singleQuote).join(", ")}]`
   ];
   if (ast.schema) {
-    pqb.addCode(code, ", {");
-    code.push([`schema: ${pqb.singleQuote(ast.schema)},`]);
-    pqb.addCode(code, "}");
+    orchidCore.addCode(code, ", {");
+    code.push([`schema: ${orchidCore.singleQuote(ast.schema)},`]);
+    orchidCore.addCode(code, "}");
   }
-  pqb.addCode(code, ");");
+  orchidCore.addCode(code, ");");
   return code;
 };
 const createTable = (ast) => {
   const code = [];
-  pqb.addCode(code, `await db.createTable(${quoteSchemaTable(ast)}, (t) => ({`);
+  orchidCore.addCode(code, `await db.createTable(${quoteSchemaTable(ast)}, (t) => ({`);
   const hasTimestamps = isTimestamp(ast.shape.createdAt) && isTimestamp(ast.shape.updatedAt);
   for (const key in ast.shape) {
     if (hasTimestamps && (key === "createdAt" || key === "updatedAt"))
       continue;
-    const line = [`${pqb.quoteObjectKey(key)}: `];
+    const line = [`${orchidCore.quoteObjectKey(key)}: `];
     for (const part of ast.shape[key].toCode("t")) {
-      pqb.addCode(line, part);
+      orchidCore.addCode(line, part);
     }
-    pqb.addCode(line, ",");
+    orchidCore.addCode(line, ",");
     code.push(line);
   }
   if (hasTimestamps) {
@@ -2207,14 +2208,14 @@ const createTable = (ast) => {
   for (const foreignKey of ast.foreignKeys) {
     code.push(pqb.foreignKeyToCode(foreignKey, "t"));
   }
-  pqb.addCode(code, "}));");
+  orchidCore.addCode(code, "}));");
   return code;
 };
 const isTimestamp = (column) => {
   if (!column)
     return false;
   const { default: def } = column.data;
-  return column instanceof pqb.TimestampColumn && !column.data.isNullable && def && typeof def === "object" && pqb.isRaw(def) && def.__raw === "now()";
+  return column instanceof pqb.TimestampColumn && !column.data.isNullable && def && typeof def === "object" && orchidCore.isRaw(def) && def.__raw === "now()";
 };
 const createForeignKey = (item) => {
   return [
@@ -2259,9 +2260,9 @@ const rakeDb = async (options, partialConfig = {}, args = process.argv.slice(2))
     } else if (command === "g" || command === "generate") {
       await generate(config, args.slice(1));
     } else if (command === "pull") {
-      await pullDbStructure(pqb.toArray(options)[0], config);
+      await pullDbStructure(orchidCore.toArray(options)[0], config);
     } else if (config.commands[command]) {
-      await config.commands[command](pqb.toArray(options), config, args.slice(1));
+      await config.commands[command](orchidCore.toArray(options), config, args.slice(1));
     } else {
       printHelp();
     }