rake-db 2.8.50 → 2.9.1

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as orchid_core from 'orchid-core';
-import { ColumnTypesBase, EmptyObject, RawExpression, raw, MaybeArray } from 'orchid-core';
+import { ColumnTypesBase, EmptyObject, RawSQLBase, MaybeArray } from 'orchid-core';
 import * as pqb from 'pqb';
-import { ColumnsShape, Db as Db$1, ColumnType, EnumColumn, Adapter, DefaultColumnTypes, DbResult, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions } from 'pqb';
+import { ColumnsShape, Db as Db$1, ColumnType, EnumColumn, raw, Adapter, DefaultColumnTypes, DbResult, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions } from 'pqb';
 
 type CreateTableResult<Table extends string, Shape extends ColumnsShape> = {
     table: Db$1<Table, Shape>;
@@ -16,8 +16,8 @@ declare function add(items: Record<string, ColumnType>, options?: {
 }): Record<string, RakeDbAst.ChangeTableItem.Column>;
 type Change = RakeDbAst.ChangeTableItem.Change & ChangeOptions;
 type ChangeOptions = {
-    usingUp?: RawExpression;
-    usingDown?: RawExpression;
+    usingUp?: RawSQLBase;
+    usingDown?: RawSQLBase;
 };
 type TableChangeMethods = typeof tableChangeMethods;
 declare const tableChangeMethods: {
@@ -25,7 +25,7 @@ declare const tableChangeMethods: {
     add: typeof add;
     drop: typeof add;
     change(this: ColumnTypesBase, from: ColumnType | Change, to: ColumnType | Change, options?: ChangeOptions): Change;
-    default(value: unknown | RawExpression): Change;
+    default(value: unknown | RawSQLBase): Change;
     nullable(): Change;
     nonNullable(): Change;
     comment(comment: string | null): Change;
@@ -76,7 +76,7 @@ type ConstraintArg = {
         foreignColumn: [string, ...string[]],
         options: Omit<ForeignKeyOptions, 'name' | 'dropMode'>
     ];
-    check?: RawExpression;
+    check?: RawSQLBase;
     dropMode?: DropMode;
 };
 /**
@@ -400,14 +400,14 @@ declare class Migration<CT extends ColumnTypesBase> {
      * @param tableName - name of the table to add the check into
      * @param check - raw SQL for the check
      */
-    addCheck(tableName: string, check: RawExpression): Promise<void>;
+    addCheck(tableName: string, check: RawSQLBase): Promise<void>;
     /**
      * Drop the schema, create it on rollback. See {@link addConstraint}.
      *
      * @param tableName - name of the table to add the check into
      * @param check - raw SQL for the check
      */
-    dropCheck(tableName: string, check: RawExpression): Promise<void>;
+    dropCheck(tableName: string, check: RawSQLBase): Promise<void>;
     /**
      * Add or drop a constraint with check and a foreign key references.
      *
@@ -707,14 +707,14 @@ declare class Migration<CT extends ColumnTypesBase> {
      * @param options - view options
      * @param sql - SQL to create the view with
      */
-    createView(name: string, options: RakeDbAst.ViewOptions, sql: string | RawExpression): Promise<void>;
+    createView(name: string, options: RakeDbAst.ViewOptions, sql: string | RawSQLBase): Promise<void>;
     /**
      * See {@link createView}
      *
      * @param name - name of the view
      * @param sql - SQL to create the view with
      */
-    createView(name: string, sql: string | RawExpression): Promise<void>;
+    createView(name: string, sql: string | RawSQLBase): Promise<void>;
     /**
      * Drop the view, create it on rollback. See {@link createView}.
      *
@@ -722,14 +722,14 @@ declare class Migration<CT extends ColumnTypesBase> {
      * @param options - view options
      * @param sql - SQL to create the view with
      */
-    dropView(name: string, options: RakeDbAst.ViewOptions, sql: string | RawExpression): Promise<void>;
+    dropView(name: string, options: RakeDbAst.ViewOptions, sql: string | RawSQLBase): Promise<void>;
     /**
      * Drop the view, create it on rollback. See {@link createView}.
      *
      * @param name - name of the view
      * @param sql - SQL to create the view with
      */
-    dropView(name: string, sql: string | RawExpression): Promise<void>;
+    dropView(name: string, sql: string | RawSQLBase): Promise<void>;
     /**
      * Returns boolean to know if table exists:
      *
@@ -816,7 +816,7 @@ declare namespace RakeDbAst {
             name?: string;
             from: ColumnChange;
             to: ColumnChange;
-            using?: RawExpression;
+            using?: RawSQLBase;
         };
         type Rename = {
             type: 'rename';
@@ -827,12 +827,12 @@ declare namespace RakeDbAst {
         column?: ColumnType;
         type?: string;
         collate?: string;
-        default?: unknown | RawExpression;
+        default?: unknown | RawSQLBase;
         nullable?: boolean;
         comment?: string | null;
         compression?: string;
         primaryKey?: boolean;
-        check?: RawExpression;
+        check?: RawSQLBase;
         foreignKeys?: ({
             table: string;
             columns: string[];
@@ -879,8 +879,8 @@ declare namespace RakeDbAst {
         baseType: ColumnType;
         notNull?: boolean;
         collation?: string;
-        default?: RawExpression;
-        check?: RawExpression;
+        default?: RawSQLBase;
+        check?: RawSQLBase;
         cascade?: boolean;
     };
     type Collation = {
@@ -915,7 +915,7 @@ declare namespace RakeDbAst {
         schema?: string;
         name: string;
         shape: ColumnsShape;
-        sql: RawExpression;
+        sql: RawSQLBase;
         options: ViewOptions;
     };
     type ViewOptions = {
@@ -1008,12 +1008,12 @@ declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreato
         };
         timestamp(): T;
         timestampsSnakeCase(): {
-            createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
-            updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
+            createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
+            updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
         };
     }): {
-        createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
-        updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
+        createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
+        updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
     };
     timestampsSnakeCase<T_1 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
         name(name: string): {
@@ -1021,8 +1021,8 @@ declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreato
         };
         timestamp(): T_1;
     }): {
-        createdAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
-        updatedAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
+        createdAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
+        updatedAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
     };
     timestampsNoTZ<T_2 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
         name(name: string): {
@@ -1030,12 +1030,12 @@ declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreato
         };
         timestampNoTZ(): T_2;
         timestampsNoTZSnakeCase(): {
-            createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
-            updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
+            createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
+            updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
         };
     }): {
-        createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
-        updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
+        createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
+        updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
     };
     timestampsNoTZSnakeCase<T_3 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
         name(name: string): {
@@ -1043,15 +1043,15 @@ declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreato
         };
         timestampNoTZ(): T_3;
     }): {
-        createdAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
-        updatedAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
+        createdAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
+        updatedAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
     };
     name: typeof orchid_core.name;
     sql: {
-        (sql: TemplateStringsArray, ...values: unknown[]): orchid_core.RawExpression;
-        (sql: string): orchid_core.RawExpression;
-        (values: Record<string, unknown>, sql: string): orchid_core.RawExpression;
-        (values: Record<string, unknown>): (strings: TemplateStringsArray, ...values: unknown[]) => orchid_core.RawExpression;
+        (sql: TemplateStringsArray, ...values: unknown[]): orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
+        (sql: string): orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
+        (values: Record<string, unknown>, sql: string): orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
+        (values: Record<string, unknown>): (strings: TemplateStringsArray, ...values: unknown[]) => orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
     };
     smallint(): pqb.SmallIntColumn;
     integer(): pqb.IntegerColumn;
@@ -1140,14 +1140,14 @@ declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreato
     constraint<Table extends string | (() => orchid_core.ForeignKeyTable), Columns extends Table extends () => orchid_core.ForeignKeyTable ? [orchid_core.ColumnNameOfTable<ReturnType<Table>>, ...orchid_core.ColumnNameOfTable<ReturnType<Table>>[]] : [string, ...string[]]>({ name, references, check, dropMode, }: {
         name?: string | undefined;
         references?: [columns: string[], fnOrTable: Table, foreignColumns: Columns, options?: pqb.ForeignKeyOptions | undefined] | undefined;
-        check?: orchid_core.RawExpression | undefined;
+        check?: orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}> | undefined;
         dropMode?: pqb.DropMode | undefined;
     }): {};
     foreignKey<Table_1 extends string | (() => orchid_core.ForeignKeyTable), Columns_1 extends Table_1 extends () => orchid_core.ForeignKeyTable ? [orchid_core.ColumnNameOfTable<ReturnType<Table_1>>, ...orchid_core.ColumnNameOfTable<ReturnType<Table_1>>[]] : [string, ...string[]]>(columns: string[], fnOrTable: Table_1, foreignColumns: Columns_1, options?: (pqb.ForeignKeyOptions & {
         name?: string | undefined;
         dropMode?: pqb.DropMode | undefined;
     }) | undefined): {};
-    check(check: orchid_core.RawExpression): {};
+    check(check: orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>): {};
 }>(options: MaybeArray<AdapterOptions>, partialConfig?: InputRakeDbConfig<CT>, args?: string[]) => ((fn: ChangeCallback<CT>) => void) & {
     promise: Promise<void>;
 };

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.isRaw(item.data.default)) {
-      line.push(`DEFAULT ${pqb.getRaw(item.data.default, values)}`);
+    if (typeof item.data.default === "object" && item.data.default && 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 (${pqb.getRaw(check, 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 ${typeof options.where === "object" && options.where && orchidCore.isRaw(options.where) ? pqb.getRaw(options.where, 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 ${pqb.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 || !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.isRaw(to.default) ? pqb.getRaw(to.default, 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,8 +1088,7 @@ const astToQueries = (ast, snakeCase) => {
         if (to.check) {
           alterTable.push(
             `ADD CONSTRAINT "${checkName}"
-    CHECK (${pqb.getRaw(
-              to.check,
+    CHECK (${to.check.toSQL(
               values
             )})`
           );
@@ -1235,7 +1234,7 @@ const createView$1 = async (migration, up, name, options, sql) => {
 };
 const makeAst = (up, name, options, sql) => {
   if (typeof sql === "string") {
-    sql = orchidCore.raw(sql);
+    sql = pqb.raw({ raw: sql });
   }
   return {
     type: "view",
@@ -1274,7 +1273,7 @@ const astToQuery = (ast) => {
         list.push(`security_invoker = true`);
       sql.push(`WITH ( ${list.join(", ")} )`);
     }
-    sql.push(`AS (${pqb.getRaw(ast.sql, values)})`);
+    sql.push(`AS (${ast.sql.toSQL(values)})`);
   } else {
     sql.push("DROP VIEW");
     if (options == null ? void 0 : options.dropIfExists)
@@ -2038,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 ${pqb.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 ${pqb.getRaw(ast.check, values)}`
+      ast.check && `CHECK ${ast.check.toSQL(values)}`
     ].filter(Boolean).join(" ")}`;
   } else {
     query = `DROP DOMAIN ${quotedName}${ast.cascade ? " CASCADE" : ""}`;
@@ -2954,7 +2953,7 @@ const structureToAst = async (ctx, db) => {
       notNull: it.notNull,
       collation: it.collation,
       default: pqb.simplifyColumnDefault(it.default),
-      check: it.check ? orchidCore.raw(it.check) : void 0
+      check: it.check ? pqb.raw({ raw: it.check }) : void 0
     });
   }
   for (const key in pendingTables) {
@@ -3111,7 +3110,7 @@ const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstr
               onDelete: fkeyActionMap[references.onDelete]
             }
           } : void 0,
-          check: check ? orchidCore.raw(check.expression) : void 0
+          check: check ? pqb.raw({ raw: check.expression }) : void 0
         };
         const name = item.name && item.name !== getConstraintName(tableName, constraint) ? item.name : void 0;
         if (name) {
@@ -3211,7 +3210,7 @@ const constraintToAst = (ctx, item) => {
       options.onDelete = onDelete;
   }
   if (check) {
-    result.check = orchidCore.raw(check.expression);
+    result.check = pqb.raw({ raw: check.expression });
   }
   if (item.name && item.name !== getConstraintName(item.tableName, result)) {
     result.name = item.name;
@@ -3251,7 +3250,7 @@ const viewToAst = (ctx, data, domains, view) => {
     schema: view.schemaName === ctx.currentSchema ? void 0 : view.schemaName,
     name: view.name,
     shape,
-    sql: orchidCore.raw(view.sql),
+    sql: pqb.raw({ raw: view.sql }),
     options
   };
 };
@@ -3310,7 +3309,7 @@ const makeColumnsShape = (ctx, data, domains, tableName, columns, primaryKey, in
     }
     const check = checks == null ? void 0 : checks[item.name];
     if (check) {
-      column.data.check = orchidCore.raw(check);
+      column.data.check = pqb.raw({ raw: check });
     }
     const camelCaseName = orchidCore.toCamelCase(item.name);
     if (ctx.snakeCase) {
@@ -3421,9 +3420,9 @@ const createDomain = (ast) => {
     if (ast.collation)
       props.push(`collation: ${orchidCore.singleQuote(ast.collation)},`);
     if (ast.default)
-      props.push(`default: ${orchidCore.rawToCode("db", ast.default)},`);
+      props.push(`default: ${ast.default.toCode("db")},`);
     if (ast.check)
-      props.push(`check: ${orchidCore.rawToCode("db", ast.check)},`);
+      props.push(`check: ${ast.check.toCode("db")},`);
     orchidCore.addCode(code, ", {");
     code.push(props);
     orchidCore.addCode(code, "}");
@@ -3494,7 +3493,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" && orchidCore.isRaw(def) && def.__raw === "now()";
+  return column instanceof type && !column.data.isNullable && def && typeof def === "object" && orchidCore.isRawSQL(def) && def._sql === "now()";
 };
 const getTimestampsInfo = (config, ast, type) => {
   var _a, _b, _c, _d, _e, _f;
@@ -3524,7 +3523,7 @@ const createConstraint = (item) => {
     ];
   }
   if (kind === "check" && item.check) {
-    return [`await db.addCheck(${table}, ${orchidCore.rawToCode("t", item.check)});`];
+    return [`await db.addCheck(${table}, ${item.check.toCode("t")});`];
   }
   return [
     `await db.addConstraint(${table}, {`,
@@ -3549,8 +3548,8 @@ const createView = (ast) => {
     code.push(options, "}");
   }
   orchidCore.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;
@@ -3565,7 +3564,7 @@ const createView = (ast) => {
     }
     orchidCore.addCode(code, orchidCore.backtickQuote(sql));
   } else {
-    orchidCore.addCode(code, orchidCore.rawToCode("db", ast.sql));
+    orchidCore.addCode(code, ast.sql.toCode("db"));
   }
   orchidCore.addCode(code, ");");
   return code;