rake-db 2.27.26 → 2.27.28

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as pqb from 'pqb';
-import { ColumnsShape, Db, TableData, NoPrimaryKeyOption, MaybeArray, Column, RawSQLBase, RecordString, EnumColumn, EmptyObject, ColumnSchemaConfig, DefaultColumnTypes, DefaultSchemaConfig, QueryLogOptions, AdapterBase, DbResult, MaybePromise, QueryLogObject, TableDataFn, TableDataItem, DbDomainArg, raw, SearchWeight, ColumnsByType, DbStructureDomainsMap, QueryBase } from 'pqb';
+import { ColumnsShape, Db, TableData, NoPrimaryKeyOption, MaybeArray, Column, RawSqlBase, RecordString, EnumColumn, EmptyObject, ColumnSchemaConfig, DefaultColumnTypes, DefaultSchemaConfig, QueryLogOptions, AdapterBase, DbResult, MaybePromise, QueryLogObject, TableDataFn, TableDataItem, DbDomainArg, raw, SearchWeight, ColumnsByType, DbStructureDomainsMap, Query } from 'pqb';
 
 interface CreateTableResult<Table extends string, Shape extends ColumnsShape> {
     table: Db<Table, Shape>;
@@ -44,8 +44,8 @@ declare namespace RakeDbAst {
             using?: ChangeUsing;
         }
         interface ChangeUsing {
-            usingUp?: RawSQLBase;
-            usingDown?: RawSQLBase;
+            usingUp?: RawSqlBase;
+            usingDown?: RawSqlBase;
         }
         interface Rename {
             type: 'rename';
@@ -56,7 +56,7 @@ declare namespace RakeDbAst {
         column?: Column;
         type?: string;
         collate?: string;
-        default?: unknown | RawSQLBase;
+        default?: unknown | RawSqlBase;
         nullable?: boolean;
         comment?: string | null;
         compression?: string;
@@ -176,7 +176,7 @@ declare namespace RakeDbAst {
         schema?: string;
         name: string;
         shape: ColumnsShape;
-        sql: RawSQLBase;
+        sql: RawSqlBase;
         options: ViewOptions;
         deps: {
             schemaName: string;
@@ -223,7 +223,7 @@ declare const tableChangeMethods: {
     add: typeof add;
     drop: typeof add;
     change(from: Column | OneWayChange, to: Column | OneWayChange, using?: ChangeOptions): Change;
-    default(value: unknown | RawSQLBase): OneWayChange;
+    default(value: unknown | RawSqlBase): OneWayChange;
     nullable(): OneWayChange;
     nonNullable(): OneWayChange;
     comment(comment: string | null): OneWayChange;
@@ -266,7 +266,7 @@ declare const tableChangeMethods: {
         };
     }, foreignColumns: [keyof Shape, ...(keyof Shape)[]], options?: TableData.References.Options | undefined): pqb.NonUniqDataItem;
     foreignKey(columns: [string, ...string[]], fnOrTable: string, foreignColumns: [string, ...string[]], options?: TableData.References.Options | undefined): pqb.NonUniqDataItem;
-    check(check: RawSQLBase<Column.Pick.QueryColumn, unknown>, name?: string | undefined): pqb.NonUniqDataItem;
+    check(check: RawSqlBase, name?: string | undefined): pqb.NonUniqDataItem;
     sql: pqb.SqlFn;
     enum(name: string): EnumColumn<pqb.DefaultSchemaConfig, undefined, [string, ...string[]]>;
 };
@@ -905,14 +905,14 @@ declare class Migration<CT> {
      * @param tableName - name of the table to add the check into
      * @param check - raw SQL for the check
      */
-    addCheck(tableName: string, check: RawSQLBase): Promise<void>;
+    addCheck(tableName: string, check: RawSqlBase): Promise<void>;
     /**
      * Drop the schema, create it on rollback. See {@link addCheck}.
      *
      * @param tableName - name of the table to add the check into
      * @param check - raw SQL for the check
      */
-    dropCheck(tableName: string, check: RawSQLBase): Promise<void>;
+    dropCheck(tableName: string, check: RawSqlBase): Promise<void>;
     /**
      * Rename a table constraint such as a primary key or a database check.
      *
@@ -1371,14 +1371,14 @@ declare class Migration<CT> {
      * @param options - view options
      * @param sql - SQL to create the view with
      */
-    createView(name: string, options: RakeDbAst.ViewOptions, sql: string | RawSQLBase): 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 | RawSQLBase): Promise<void>;
+    createView(name: string, sql: string | RawSqlBase): Promise<void>;
     /**
      * Drop the view, create it on rollback. See {@link createView}.
      *
@@ -1386,14 +1386,14 @@ declare class Migration<CT> {
      * @param options - view options
      * @param sql - SQL to create the view with
      */
-    dropView(name: string, options: RakeDbAst.ViewOptions, sql: string | RawSQLBase): 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 | RawSQLBase): Promise<void>;
+    dropView(name: string, sql: string | RawSqlBase): Promise<void>;
     /**
      * Returns boolean to know if table exists:
      *
@@ -1748,7 +1748,7 @@ declare const writeMigrationFile: (config: AnyRakeDbConfig, version: string, nam
 declare const makeFileVersion: (ctx: RakeDbCtx, config: AnyRakeDbConfig) => Promise<string>;
 
 interface OrmParam {
-    $qb: QueryBase;
+    $qb: Query;
 }
 type UnknownPromiseFns = (() => Promise<unknown>)[];
 declare const migrateFiles: (db: OrmParam, files: UnknownPromiseFns) => Promise<void>;

package/dist/index.js

@@ -975,6 +975,12 @@ const astToQueries = (ast, snakeCase, language) => {
     }
   }
   const prependAlterTable = [];
+  if (dropPrimaryKeys.change && addPrimaryKeys.change && dropPrimaryKeys.name === addPrimaryKeys.name && dropPrimaryKeys.columns.length === addPrimaryKeys.columns.length && dropPrimaryKeys.columns.every(
+    (column, i) => column === addPrimaryKeys.columns[i]
+  )) {
+    dropPrimaryKeys.change = addPrimaryKeys.change = void 0;
+    dropPrimaryKeys.columns.length = addPrimaryKeys.columns.length = 0;
+  }
   if (ast.drop.primaryKey || dropPrimaryKeys.change || dropPrimaryKeys.columns.length > 1) {
     const name = dropPrimaryKeys.name || `${ast.name}_pkey`;
     prependAlterTable.push(`DROP CONSTRAINT "${name}"`);
@@ -4274,7 +4280,7 @@ const makeDomainsMap = (ctx, data) => {
     });
     if (it.checks) {
       column.data.checks = it.checks.map((check) => ({
-        sql: new pqb.RawSQL([[check]])
+        sql: new pqb.RawSql([[check]])
       }));
     }
     domains[`${it.schemaName}.${it.name}`] = column;
@@ -4542,7 +4548,7 @@ const dbColumnToAst = (ctx, data, domains, tableName, item, table, tableData, ch
   const columnChecks = checks?.[item.name];
   if (columnChecks) {
     column.data.checks = columnChecks.map((check) => ({
-      sql: new pqb.RawSQL([[check]])
+      sql: new pqb.RawSql([[check]])
     }));
   }
   const camelCaseName = pqb.toCamelCase(item.name);
@@ -5149,10 +5155,12 @@ const astEncoders = {
             pqb.addCode(line, ", {");
             const u = [];
             if (change.using.usingUp) {
-              u.push(`usingUp: ${change.using.usingUp.toCode("t")},`);
+              u.push(`usingUp: ${pqb.rawSqlToCode(change.using.usingUp, "t")},`);
             }
             if (change.using.usingDown) {
-              u.push(`usingDown: ${change.using.usingDown.toCode("t")},`);
+              u.push(
+                `usingDown: ${pqb.rawSqlToCode(change.using.usingDown, "t")},`
+              );
             }
             pqb.addCode(line, u);
             pqb.addCode(line, "}");
@@ -5311,7 +5319,7 @@ const astEncoders = {
     }
     const check = ast.check;
     return [
-      `await db.addCheck(${table}, ${check.toCode("t")}${ast.name ? `, ${pqb.singleQuote(ast.name)}` : ""});`
+      `await db.addCheck(${table}, ${pqb.rawSqlToCode(check, "t")}${ast.name ? `, ${pqb.singleQuote(ast.name)}` : ""});`
     ];
   },
   renameTableItem(ast) {
@@ -5353,7 +5361,7 @@ const astEncoders = {
       }
       pqb.addCode(code, pqb.backtickQuote(sql));
     } else {
-      pqb.addCode(code, ast.sql.toCode("db"));
+      pqb.addCode(code, pqb.rawSqlToCode(ast.sql, "db"));
     }
     pqb.addCode(code, ");");
     return code;