rake-db 2.8.50 → 2.9.0

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { columnTypes, getRaw, quote, EnumColumn, getColumnTypes, getTableData, ColumnType, resetTableData, UnknownColumn, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, simplifyColumnDefault, columnsByType, instantiateColumn, DomainColumn, CustomTypeColumn, ArrayColumn, getConstraintKind, primaryKeyToCode, indexToCode, constraintToCode, referencesArgsToCode, constraintPropsToCode, TimestampTZColumn } from 'pqb';
-import { getCallerFilePath, singleQuote, toSnakeCase, isRaw, toArray, snakeCaseKey, emptyObject, consumeColumnName, deepCompare, raw, pathToLog, emptyArray, getImportPath, toCamelCase, codeToString, addCode, rawToCode, quoteObjectKey, backtickQuote } from 'orchid-core';
+import { columnTypes, quote, EnumColumn, getColumnTypes, getTableData, ColumnType, resetTableData, UnknownColumn, raw, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, simplifyColumnDefault, columnsByType, instantiateColumn, DomainColumn, CustomTypeColumn, ArrayColumn, getConstraintKind, primaryKeyToCode, indexToCode, constraintToCode, referencesArgsToCode, constraintPropsToCode, TimestampTZColumn } from 'pqb';
+import { getCallerFilePath, singleQuote, toSnakeCase, isRawSQL, toArray, snakeCaseKey, emptyObject, consumeColumnName, deepCompare, pathToLog, emptyArray, getImportPath, toCamelCase, codeToString, addCode, quoteObjectKey, backtickQuote } from 'orchid-core';
 import path, { join } from 'path';
 import { readdir, mkdir, writeFile, stat, readFile } from 'fs/promises';
 import prompts from 'prompts';
@@ -308,8 +308,8 @@ const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
     line.push(checkToSql(item.data.check, values));
   }
   if (item.data.default !== void 0) {
-    if (typeof item.data.default === "object" && item.data.default && isRaw(item.data.default)) {
-      line.push(`DEFAULT ${getRaw(item.data.default, values)}`);
+    if (typeof item.data.default === "object" && item.data.default && isRawSQL(item.data.default)) {
+      line.push(`DEFAULT ${item.data.default.toSQL(values)}`);
     } else {
       line.push(`DEFAULT ${quote(item.data.default)}`);
     }
@@ -406,7 +406,7 @@ const constraintToSql = ({ name }, up, constraint, values, snakeCase) => {
   return sql.join(" ");
 };
 const checkToSql = (check, values) => {
-  return `CHECK (${getRaw(check, values)})`;
+  return `CHECK (${check.toSQL(values)})`;
 };
 const foreignKeyToSql = (item, snakeCase) => {
   return `FOREIGN KEY (${joinColumns(item.columns)}) ${referencesToSql(
@@ -492,7 +492,7 @@ const indexesToQuery = (up, { schema, name }, indexes) => {
     }
     if (options.where) {
       sql.push(
-        `WHERE ${typeof options.where === "object" && options.where && isRaw(options.where) ? getRaw(options.where, values) : options.where}`
+        `WHERE ${isRawSQL(options.where) ? options.where.toSQL(values) : options.where}`
       );
     }
     return { text: sql.join(" "), values };
@@ -1036,7 +1036,7 @@ const astToQueries = (ast, snakeCase) => {
       if (to.type && (from.type !== to.type || from.collate !== to.collate)) {
         const type = !to.column || to.column.data.isOfCustomType ? `"${to.type}"` : to.type;
         alterTable.push(
-          `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${quoteNameFromString(to.collate)}` : ""}${item.using ? ` USING ${getRaw(item.using, values)}` : ""}`
+          `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${quoteNameFromString(to.collate)}` : ""}${item.using ? ` USING ${item.using.toSQL(values)}` : ""}`
         );
       }
       if (typeof from.identity !== typeof to.identity || !deepCompare(from.identity, to.identity)) {
@@ -1045,7 +1045,7 @@ const astToQueries = (ast, snakeCase) => {
         );
       }
       if (from.default !== to.default) {
-        const value = typeof to.default === "object" && to.default && isRaw(to.default) ? getRaw(to.default, values) : quote(to.default);
+        const value = typeof to.default === "object" && to.default && isRawSQL(to.default) ? to.default.toSQL(values) : quote(to.default);
         const expr = value === void 0 ? "DROP DEFAULT" : `SET DEFAULT ${value}`;
         alterTable.push(`ALTER COLUMN "${name}" ${expr}`);
       }
@@ -1067,8 +1067,7 @@ const astToQueries = (ast, snakeCase) => {
         if (to.check) {
           alterTable.push(
             `ADD CONSTRAINT "${checkName}"
-    CHECK (${getRaw(
-              to.check,
+    CHECK (${to.check.toSQL(
               values
             )})`
           );
@@ -1214,7 +1213,7 @@ const createView$1 = async (migration, up, name, options, sql) => {
 };
 const makeAst = (up, name, options, sql) => {
   if (typeof sql === "string") {
-    sql = raw(sql);
+    sql = raw({ raw: sql });
   }
   return {
     type: "view",
@@ -1253,7 +1252,7 @@ const astToQuery = (ast) => {
         list.push(`security_invoker = true`);
       sql.push(`WITH ( ${list.join(", ")} )`);
     }
-    sql.push(`AS (${getRaw(ast.sql, values)})`);
+    sql.push(`AS (${ast.sql.toSQL(values)})`);
   } else {
     sql.push("DROP VIEW");
     if (options == null ? void 0 : options.dropIfExists)
@@ -2017,9 +2016,9 @@ const createDomain$1 = async (migration, up, name, fn, options) => {
   if (ast.action === "create") {
     query = `CREATE DOMAIN ${quotedName} AS ${columnTypeToSql(ast.baseType)}${ast.collation ? `
 COLLATION ${singleQuote(ast.collation)}` : ""}${ast.default ? `
-DEFAULT ${getRaw(ast.default, values)}` : ""}${ast.notNull || ast.check ? "\n" : ""}${[
+DEFAULT ${ast.default.toSQL(values)}` : ""}${ast.notNull || ast.check ? "\n" : ""}${[
       ast.notNull && "NOT NULL",
-      ast.check && `CHECK ${getRaw(ast.check, values)}`
+      ast.check && `CHECK ${ast.check.toSQL(values)}`
     ].filter(Boolean).join(" ")}`;
   } else {
     query = `DROP DOMAIN ${quotedName}${ast.cascade ? " CASCADE" : ""}`;
@@ -2933,7 +2932,7 @@ const structureToAst = async (ctx, db) => {
       notNull: it.notNull,
       collation: it.collation,
       default: simplifyColumnDefault(it.default),
-      check: it.check ? raw(it.check) : void 0
+      check: it.check ? raw({ raw: it.check }) : void 0
     });
   }
   for (const key in pendingTables) {
@@ -3090,7 +3089,7 @@ const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstr
               onDelete: fkeyActionMap[references.onDelete]
             }
           } : void 0,
-          check: check ? raw(check.expression) : void 0
+          check: check ? raw({ raw: check.expression }) : void 0
         };
         const name = item.name && item.name !== getConstraintName(tableName, constraint) ? item.name : void 0;
         if (name) {
@@ -3190,7 +3189,7 @@ const constraintToAst = (ctx, item) => {
       options.onDelete = onDelete;
   }
   if (check) {
-    result.check = raw(check.expression);
+    result.check = raw({ raw: check.expression });
   }
   if (item.name && item.name !== getConstraintName(item.tableName, result)) {
     result.name = item.name;
@@ -3230,7 +3229,7 @@ const viewToAst = (ctx, data, domains, view) => {
     schema: view.schemaName === ctx.currentSchema ? void 0 : view.schemaName,
     name: view.name,
     shape,
-    sql: raw(view.sql),
+    sql: raw({ raw: view.sql }),
     options
   };
 };
@@ -3289,7 +3288,7 @@ const makeColumnsShape = (ctx, data, domains, tableName, columns, primaryKey, in
     }
     const check = checks == null ? void 0 : checks[item.name];
     if (check) {
-      column.data.check = raw(check);
+      column.data.check = raw({ raw: check });
     }
     const camelCaseName = toCamelCase(item.name);
     if (ctx.snakeCase) {
@@ -3400,9 +3399,9 @@ const createDomain = (ast) => {
     if (ast.collation)
       props.push(`collation: ${singleQuote(ast.collation)},`);
     if (ast.default)
-      props.push(`default: ${rawToCode("db", ast.default)},`);
+      props.push(`default: ${ast.default.toCode("db")},`);
     if (ast.check)
-      props.push(`check: ${rawToCode("db", ast.check)},`);
+      props.push(`check: ${ast.check.toCode("db")},`);
     addCode(code, ", {");
     code.push(props);
     addCode(code, "}");
@@ -3473,7 +3472,7 @@ const isTimestamp = (column, type) => {
   if (!column)
     return false;
   const { default: def } = column.data;
-  return column instanceof type && !column.data.isNullable && def && typeof def === "object" && isRaw(def) && def.__raw === "now()";
+  return column instanceof type && !column.data.isNullable && def && typeof def === "object" && isRawSQL(def) && def._sql === "now()";
 };
 const getTimestampsInfo = (config, ast, type) => {
   var _a, _b, _c, _d, _e, _f;
@@ -3503,7 +3502,7 @@ const createConstraint = (item) => {
     ];
   }
   if (kind === "check" && item.check) {
-    return [`await db.addCheck(${table}, ${rawToCode("t", item.check)});`];
+    return [`await db.addCheck(${table}, ${item.check.toCode("t")});`];
   }
   return [
     `await db.addConstraint(${table}, {`,
@@ -3528,8 +3527,8 @@ const createView = (ast) => {
     code.push(options, "}");
   }
   addCode(code, ", ");
-  if (!ast.sql.__values) {
-    const raw = ast.sql.__raw;
+  if (!ast.sql._values) {
+    const raw = ast.sql._sql;
     let sql;
     if (typeof raw === "string") {
       sql = raw;
@@ -3544,7 +3543,7 @@ const createView = (ast) => {
     }
     addCode(code, backtickQuote(sql));
   } else {
-    addCode(code, rawToCode("db", ast.sql));
+    addCode(code, ast.sql.toCode("db"));
   }
   addCode(code, ");");
   return code;