rake-db 2.9.2 → 2.10.0

package/dist/index.d.ts

@@ -1129,7 +1129,7 @@ declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreato
         record: typeof orchid_core.record;
     }) => Type)): pqb.JSONColumn<Type>;
     jsonText(): pqb.JSONTextColumn;
-    array<Item extends pqb.ColumnType<unknown, orchid_core.BaseOperators, unknown>>(item: Item): pqb.ArrayColumn<Item>;
+    array<Item extends pqb.ColumnType<unknown, pqb.BaseOperators, unknown>>(item: Item): pqb.ArrayColumn<Item>;
     type(dataType: string): pqb.CustomTypeColumn;
     domain(dataType: string): pqb.DomainColumn;
     primaryKey(columns: string[], options?: {

package/dist/index.js

@@ -329,8 +329,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 && orchidCore.isRawSQL(item.data.default)) {
-      line.push(`DEFAULT ${item.data.default.toSQL(values)}`);
+    if (orchidCore.isRawSQL(item.data.default)) {
+      line.push(`DEFAULT ${item.data.default.toSQL({ values })}`);
     } else {
       line.push(`DEFAULT ${pqb.quote(item.data.default)}`);
     }
@@ -427,7 +427,7 @@ const constraintToSql = ({ name }, up, constraint, values, snakeCase) => {
   return sql.join(" ");
 };
 const checkToSql = (check, values) => {
-  return `CHECK (${check.toSQL(values)})`;
+  return `CHECK (${check.toSQL({ values })})`;
 };
 const foreignKeyToSql = (item, snakeCase) => {
   return `FOREIGN KEY (${joinColumns(item.columns)}) ${referencesToSql(
@@ -513,7 +513,7 @@ const indexesToQuery = (up, { schema, name }, indexes) => {
     }
     if (options.where) {
       sql.push(
-        `WHERE ${orchidCore.isRawSQL(options.where) ? options.where.toSQL(values) : options.where}`
+        `WHERE ${orchidCore.isRawSQL(options.where) ? options.where.toSQL({ values }) : options.where}`
       );
     }
     return { text: sql.join(" "), values };
@@ -1057,7 +1057,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 ${item.using.toSQL(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 || !orchidCore.deepCompare(from.identity, to.identity)) {
@@ -1066,7 +1066,7 @@ const astToQueries = (ast, snakeCase) => {
         );
       }
       if (from.default !== to.default) {
-        const value = typeof to.default === "object" && to.default && orchidCore.isRawSQL(to.default) ? to.default.toSQL(values) : pqb.quote(to.default);
+        const value = typeof to.default === "object" && to.default && orchidCore.isRawSQL(to.default) ? to.default.toSQL({ values }) : pqb.quote(to.default);
         const expr = value === void 0 ? "DROP DEFAULT" : `SET DEFAULT ${value}`;
         alterTable.push(`ALTER COLUMN "${name}" ${expr}`);
       }
@@ -1088,9 +1088,9 @@ const astToQueries = (ast, snakeCase) => {
         if (to.check) {
           alterTable.push(
             `ADD CONSTRAINT "${checkName}"
-    CHECK (${to.check.toSQL(
+    CHECK (${to.check.toSQL({
               values
-            )})`
+            })})`
           );
         }
       }
@@ -1273,7 +1273,7 @@ const astToQuery = (ast) => {
         list.push(`security_invoker = true`);
       sql.push(`WITH ( ${list.join(", ")} )`);
     }
-    sql.push(`AS (${ast.sql.toSQL(values)})`);
+    sql.push(`AS (${ast.sql.toSQL({ values })})`);
   } else {
     sql.push("DROP VIEW");
     if (options == null ? void 0 : options.dropIfExists)
@@ -2037,9 +2037,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 ${orchidCore.singleQuote(ast.collation)}` : ""}${ast.default ? `
-DEFAULT ${ast.default.toSQL(values)}` : ""}${ast.notNull || ast.check ? "\n" : ""}${[
+DEFAULT ${ast.default.toSQL({ values })}` : ""}${ast.notNull || ast.check ? "\n" : ""}${[
       ast.notNull && "NOT NULL",
-      ast.check && `CHECK ${ast.check.toSQL(values)}`
+      ast.check && `CHECK ${ast.check.toSQL({ values })}`
     ].filter(Boolean).join(" ")}`;
   } else {
     query = `DROP DOMAIN ${quotedName}${ast.cascade ? " CASCADE" : ""}`;