rake-db 2.1.0 → 2.1.2

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as pqb from 'pqb';
-import { QueryLogOptions, MaybeArray, AdapterOptions, ColumnTypes, EmptyObject, RawExpression, ColumnType, raw, ColumnsShape, IndexColumnOptions, IndexOptions, TransactionAdapter, QueryLogObject, QueryResultRow, QueryInput, TypeParsers, QueryResult, QueryArraysResult, ForeignKeyOptions } from 'pqb';
+import { QueryLogOptions, MaybeArray, AdapterOptions, ColumnTypes, EmptyObject, RawExpression, ColumnType, ForeignKey, SingleColumnIndexOptions, raw, ColumnsShape, IndexColumnOptions, IndexOptions, TransactionAdapter, QueryLogObject, QueryResultRow, QueryInput, TypeParsers, QueryResult, QueryArraysResult, ForeignKeyOptions } from 'pqb';
 
 declare type MigrationConfig = {
     migrationsPath: string;
@@ -27,7 +27,7 @@ declare type ChangeOptions = {
     usingUp?: RawExpression;
     usingDown?: RawExpression;
 };
-declare type ChangeArg = ColumnType | ['default', unknown | RawExpression] | ['nullable', boolean] | ['comment', string | null];
+declare type ChangeArg = ColumnType | ['default', unknown | RawExpression] | ['nullable', boolean] | ['comment', string | null] | ['compression', string] | ['foreignKey', ForeignKey<string, string[]>] | ['index', Omit<SingleColumnIndexOptions, 'column'>];
 declare type TableChangeMethods = typeof tableChangeMethods;
 declare const tableChangeMethods: {
     raw: (sql: string, ...values: unknown[]) => RawExpression<ColumnType<unknown, pqb.Operators, unknown>>;

package/dist/index.esm.js

@@ -1,24 +1,24 @@
-import { quote, isRaw, getRaw, toArray, columnTypes, raw, getColumnTypes, getTableData, ColumnType, Operators, resetTableData, emptyObject, TransactionAdapter, logParamToLogObject, Adapter } from 'pqb';
+import { quote, isRaw, getRaw, toArray, columnTypes, raw, getColumnTypes, getTableData, ColumnType, Operators, resetTableData, newTableData, emptyObject, TransactionAdapter, logParamToLogObject, Adapter } from 'pqb';
 import Enquirer from 'enquirer';
 import path from 'path';
 import { readdir, mkdir, writeFile } from 'fs/promises';
 import { singular } from 'pluralize';
 
-var __defProp$3 = Object.defineProperty;
+var __defProp$4 = Object.defineProperty;
 var __defProps$3 = Object.defineProperties;
 var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
+var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$4 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
+    if (__hasOwnProp$4.call(b, prop))
+      __defNormalProp$4(a, prop, b[prop]);
+  if (__getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(b)) {
+      if (__propIsEnum$4.call(b, prop))
+        __defNormalProp$4(a, prop, b[prop]);
     }
   return a;
 };
@@ -31,7 +31,7 @@ const migrationConfigDefaults = {
   logger: console
 };
 const getMigrationConfigWithDefaults = (config) => {
-  return __spreadValues$3(__spreadValues$3({}, migrationConfigDefaults), config);
+  return __spreadValues$4(__spreadValues$4({}, migrationConfigDefaults), config);
 };
 const getDatabaseAndUserFromOptions = (options) => {
   if (options.connectionString) {
@@ -59,9 +59,9 @@ const setAdapterOptions = (options, set) => {
     if (set.password !== void 0) {
       url.password = set.password;
     }
-    return __spreadProps$3(__spreadValues$3({}, options), { connectionString: url.toString() });
+    return __spreadProps$3(__spreadValues$4({}, options), { connectionString: url.toString() });
   } else {
-    return __spreadValues$3(__spreadValues$3({}, options), set);
+    return __spreadValues$4(__spreadValues$4({}, options), set);
   }
 };
 const askAdminCredentials = async () => {
@@ -200,21 +200,21 @@ const setCurrentMigrationUp = (up) => {
 const getCurrentPromise = () => currentPromise;
 const getCurrentChangeCallback = () => currentChangeCallback;
 
-var __defProp$2 = Object.defineProperty;
+var __defProp$3 = Object.defineProperty;
 var __defProps$2 = Object.defineProperties;
 var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$2 = (a, b) => {
+var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
+var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
+var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$3 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$2.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
-  if (__getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(b)) {
-      if (__propIsEnum$2.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
+    if (__hasOwnProp$3.call(b, prop))
+      __defNormalProp$3(a, prop, b[prop]);
+  if (__getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(b)) {
+      if (__propIsEnum$3.call(b, prop))
+        __defNormalProp$3(a, prop, b[prop]);
     }
   return a;
 };
@@ -255,7 +255,7 @@ const addColumnIndex = (indexes, key, item) => {
   if (item.data) {
     if (item.data.index) {
       indexes.push({
-        columns: [__spreadProps$2(__spreadValues$2({}, item.data.index), { column: key })],
+        columns: [__spreadProps$2(__spreadValues$3({}, item.data.index), { column: key })],
         options: item.data.index
       });
     }
@@ -274,12 +274,12 @@ const getForeignKeyTable = (fnOrTable) => {
   return new klass().table;
 };
 const constraintToSql = (tableName, up, foreignKey) => {
-  const table = getForeignKeyTable(foreignKey.fnOrTable);
-  const constraintName = foreignKey.options.name || joinWords(tableName, "to", table);
+  const constraintName = foreignKey.options.name || `${tableName}_${foreignKey.columns.join("_")}_fkey`;
   if (!up) {
     const { dropMode } = foreignKey.options;
     return `CONSTRAINT "${constraintName}"${dropMode ? ` ${dropMode}` : ""}`;
   }
+  const table = getForeignKeyTable(foreignKey.fnOrTable);
   return `CONSTRAINT "${constraintName}" FOREIGN KEY (${joinColumns(
     foreignKey.columns
   )}) ${referencesToSql(table, foreignKey.foreignColumns, foreignKey.options)}`;
@@ -394,21 +394,21 @@ WHERE
   return rows;
 };
 
-var __defProp$1 = Object.defineProperty;
+var __defProp$2 = Object.defineProperty;
 var __defProps$1 = Object.defineProperties;
 var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$1 = (a, b) => {
+var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
+var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
+var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$2 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop))
-      __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop))
-        __defNormalProp$1(a, prop, b[prop]);
+    if (__hasOwnProp$2.call(b, prop))
+      __defNormalProp$2(a, prop, b[prop]);
+  if (__getOwnPropSymbols$2)
+    for (var prop of __getOwnPropSymbols$2(b)) {
+      if (__propIsEnum$2.call(b, prop))
+        __defNormalProp$2(a, prop, b[prop]);
     }
   return a;
 };
@@ -428,7 +428,7 @@ const createJoinTable = async (migration, up, tables, options, fn) => {
   const tablesWithPrimaryKeys = await Promise.all(
     tables.map(async (table) => {
       const primaryKeys = await getPrimaryKeysOfTable(migration, table).then(
-        (items) => items.map((item) => __spreadProps$1(__spreadValues$1({}, item), {
+        (items) => items.map((item) => __spreadProps$1(__spreadValues$2({}, item), {
           joinedName: joinWords(singular(table), item.name)
         }))
       );
@@ -520,6 +520,22 @@ const createTable = async (migration, up, tableName, options, fn) => {
   }
 };
 
+var __defProp$1 = Object.defineProperty;
+var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
+var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
+var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$1 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$1.call(b, prop))
+      __defNormalProp$1(a, prop, b[prop]);
+  if (__getOwnPropSymbols$1)
+    for (var prop of __getOwnPropSymbols$1(b)) {
+      if (__propIsEnum$1.call(b, prop))
+        __defNormalProp$1(a, prop, b[prop]);
+    }
+  return a;
+};
 const newChangeTableData = () => ({
   add: [],
   drop: []
@@ -620,11 +636,11 @@ const changeTable = async (migration, up, tableName, options, fn) => {
       }
     }
   }
-  changeTableData.add.forEach((tableData) => {
-    handleTableData(state, up, tableName, tableData);
+  changeTableData[up ? "drop" : "add"].forEach((tableData) => {
+    handleTableData(state, false, tableName, tableData);
   });
-  changeTableData.drop.forEach((tableData) => {
-    handleTableData(state, !up, tableName, tableData);
+  changeTableData[up ? "add" : "drop"].forEach((tableData) => {
+    handleTableData(state, true, tableName, tableData);
   });
   if (state.alterTable.length) {
     await migration.query(
@@ -632,10 +648,8 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   ${state.alterTable.join(",\n  ")}`
     );
   }
-  const createIndexes = up ? state.indexes : state.dropIndexes;
-  const dropIndexes = up ? state.dropIndexes : state.indexes;
-  await migrateIndexes(state, createIndexes, up);
-  await migrateIndexes(state, dropIndexes, !up);
+  await migrateIndexes(state, state.dropIndexes, false);
+  await migrateIndexes(state, state.indexes, true);
   await migrateComments(state, state.comments);
 };
 const changeActions = {
@@ -686,6 +700,68 @@ const changeActions = {
         `ALTER COLUMN "${key}" ${to.nullable ? "DROP" : "SET"} NOT NULL`
       );
     }
+    if (from.compression !== to.compression) {
+      state.alterTable.push(
+        `ALTER COLUMN "${key}" SET COMPRESSION ${to.compression || "DEFAULT"}`
+      );
+    }
+    const fromFkey = from.foreignKey;
+    const toFkey = to.foreignKey;
+    if (fromFkey || toFkey) {
+      if (fromFkey && "fn" in fromFkey || toFkey && "fn" in toFkey) {
+        throw new Error("Callback in foreignKey is not allowed in migration");
+      }
+      if (checkIfForeignKeysAreDifferent(fromFkey, toFkey)) {
+        if (fromFkey) {
+          const data = newTableData();
+          data.foreignKeys.push({
+            columns: [key],
+            fnOrTable: fromFkey.table,
+            foreignColumns: fromFkey.columns,
+            options: fromFkey
+          });
+          changeTableData[up ? "drop" : "add"].push(data);
+        }
+        if (toFkey) {
+          const data = newTableData();
+          data.foreignKeys.push({
+            columns: [key],
+            fnOrTable: toFkey.table,
+            foreignColumns: toFkey.columns,
+            options: toFkey
+          });
+          changeTableData[up ? "add" : "drop"].push(data);
+        }
+      }
+    }
+    const fromIndex = from.index;
+    const toIndex = to.index;
+    if ((fromIndex || toIndex) && checkIfIndexesAreDifferent(fromIndex, toIndex)) {
+      if (fromIndex) {
+        const data = newTableData();
+        data.indexes.push({
+          columns: [
+            __spreadValues$1({
+              column: key
+            }, fromIndex)
+          ],
+          options: fromIndex
+        });
+        changeTableData[up ? "drop" : "add"].push(data);
+      }
+      if (toIndex) {
+        const data = newTableData();
+        data.indexes.push({
+          columns: [
+            __spreadValues$1({
+              column: key
+            }, toIndex)
+          ],
+          options: toIndex
+        });
+        changeTableData[up ? "add" : "drop"].push(data);
+      }
+    }
     if (from.comment !== to.comment) {
       state.comments.push({ column: key, comment: to.comment || null });
     }
@@ -695,6 +771,12 @@ const changeActions = {
     state.alterTable.push(`RENAME COLUMN "${from}" TO "${to}"`);
   }
 };
+const checkIfForeignKeysAreDifferent = (from, to) => {
+  return !from || !to || from.name !== to.name || from.match !== to.match || from.onUpdate !== to.onUpdate || from.onDelete !== to.onDelete || from.dropMode !== to.dropMode || from.table !== to.table || from.columns.join(",") !== to.columns.join(",");
+};
+const checkIfIndexesAreDifferent = (from, to) => {
+  return !from || !to || from.expression !== to.expression || from.collate !== to.collate || from.operator !== to.operator || from.order !== to.order || from.name !== to.name || from.unique !== to.unique || from.using !== to.using || from.include !== to.include || Array.isArray(from.include) && Array.isArray(to.include) && from.include.join(",") !== to.include.join(",") || from.with !== to.with || from.tablespace !== to.tablespace || from.where !== to.where || from.dropMode !== to.dropMode;
+};
 const getChangeProperties = (item) => {
   if (item instanceof ColumnType) {
     return {
@@ -702,7 +784,10 @@ const getChangeProperties = (item) => {
       collate: item.data.collate,
       default: item.data.default,
       nullable: item.isNullable,
-      comment: item.data.comment
+      comment: item.data.comment,
+      compression: item.data.compression,
+      foreignKey: item.data.foreignKey,
+      index: item.data.index
     };
   } else {
     return {
@@ -710,7 +795,10 @@ const getChangeProperties = (item) => {
       collate: void 0,
       default: item[0] === "default" ? item[1] : void 0,
       nullable: item[0] === "nullable" ? item[1] : void 0,
-      comment: item[0] === "comment" ? item[1] : void 0
+      comment: item[0] === "comment" ? item[1] : void 0,
+      compression: item[0] === "compression" ? item[1] : void 0,
+      foreignKey: item[0] === "foreignKey" ? item[1] : void 0,
+      index: item[0] === "index" ? item[1] : void 0
     };
   }
 };