rake-db 2.3.2 → 2.3.4

package/dist/index.js

@@ -6,32 +6,31 @@ var pqb = require('pqb');
 var Enquirer = require('enquirer');
 var path = require('path');
 var promises = require('fs/promises');
-var pluralize = require('pluralize');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var Enquirer__default = /*#__PURE__*/_interopDefaultLegacy(Enquirer);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
-var __defProp$7 = Object.defineProperty;
-var __defProps$6 = Object.defineProperties;
-var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
-var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
-var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$7 = (a, b) => {
+var __defProp$6 = Object.defineProperty;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
+var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
+var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$6 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$7.call(b, prop))
-      __defNormalProp$7(a, prop, b[prop]);
-  if (__getOwnPropSymbols$7)
-    for (var prop of __getOwnPropSymbols$7(b)) {
-      if (__propIsEnum$7.call(b, prop))
-        __defNormalProp$7(a, prop, b[prop]);
+    if (__hasOwnProp$6.call(b, prop))
+      __defNormalProp$6(a, prop, b[prop]);
+  if (__getOwnPropSymbols$6)
+    for (var prop of __getOwnPropSymbols$6(b)) {
+      if (__propIsEnum$6.call(b, prop))
+        __defNormalProp$6(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const migrationConfigDefaults = {
   migrationsPath: path__default["default"].resolve("src", "migrations"),
   migrationsTable: "schemaMigrations",
@@ -41,7 +40,7 @@ const migrationConfigDefaults = {
   useCodeUpdater: true
 };
 const getMigrationConfigWithDefaults = (config) => {
-  return __spreadValues$7(__spreadValues$7({}, migrationConfigDefaults), config);
+  return __spreadValues$6(__spreadValues$6({}, migrationConfigDefaults), config);
 };
 const getDatabaseAndUserFromOptions = (options) => {
   if (options.databaseURL) {
@@ -69,9 +68,9 @@ const setAdapterOptions = (options, set) => {
     if (set.password !== void 0) {
       url.password = set.password;
     }
-    return __spreadProps$6(__spreadValues$7({}, options), { databaseURL: url.toString() });
+    return __spreadProps$5(__spreadValues$6({}, options), { databaseURL: url.toString() });
   } else {
-    return __spreadValues$7(__spreadValues$7({}, options), set);
+    return __spreadValues$6(__spreadValues$6({}, options), set);
   }
 };
 const askAdminCredentials = async () => {
@@ -173,12 +172,6 @@ const getMigrationFiles = async (config, up) => {
 };
 const sortAsc = (arr) => arr.sort();
 const sortDesc = (arr) => arr.sort((a, b) => a > b ? -1 : 1);
-const joinWords = (...words) => {
-  return words.slice(1).reduce(
-    (acc, word) => acc + word[0].toUpperCase() + word.slice(1),
-    words[0]
-  );
-};
 const joinColumns = (columns) => {
   return columns.map((column) => `"${column}"`).join(", ");
 };
@@ -218,25 +211,25 @@ const setCurrentMigrationUp = (up) => {
 const getCurrentPromise = () => currentPromise;
 const getCurrentChangeCallback = () => currentChangeCallback;
 
-var __defProp$6 = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
-var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
-var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$6 = (a, b) => {
+var __defProp$5 = Object.defineProperty;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$5 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$6.call(b, prop))
-      __defNormalProp$6(a, prop, b[prop]);
-  if (__getOwnPropSymbols$6)
-    for (var prop of __getOwnPropSymbols$6(b)) {
-      if (__propIsEnum$6.call(b, prop))
-        __defNormalProp$6(a, prop, b[prop]);
+    if (__hasOwnProp$5.call(b, prop))
+      __defNormalProp$5(a, prop, b[prop]);
+  if (__getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(b)) {
+      if (__propIsEnum$5.call(b, prop))
+        __defNormalProp$5(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const columnToSql = (key, item, values, hasMultiplePrimaryKeys) => {
   const line = [`"${key}" ${item.toSQL()}`];
   if (item.data.compression) {
@@ -275,7 +268,7 @@ const addColumnIndex = (indexes, key, item) => {
   if (item.data.indexes) {
     indexes.push(
       ...item.data.indexes.map((index) => ({
-        columns: [__spreadProps$5(__spreadValues$6({}, index), { column: key })],
+        columns: [__spreadProps$4(__spreadValues$5({}, index), { column: key })],
         options: index
       }))
     );
@@ -293,8 +286,11 @@ const getForeignKeyTable = (fnOrTable) => {
   const item = new (fnOrTable())();
   return [item.schema, item.table];
 };
+const getForeignKeyName = (table, columns) => {
+  return `${table}_${columns.join("_")}_fkey`;
+};
 const constraintToSql = ({ name }, up, foreignKey) => {
-  const constraintName = foreignKey.options.name || `${name}_${foreignKey.columns.join("_")}_fkey`;
+  const constraintName = foreignKey.options.name || getForeignKeyName(name, foreignKey.columns);
   if (!up) {
     const { dropMode } = foreignKey.options;
     return `CONSTRAINT "${constraintName}"${dropMode ? ` ${dropMode}` : ""}`;
@@ -326,13 +322,17 @@ const referencesToSql = (schema, table, columns, foreignKey) => {
   }
   return sql.join(" ");
 };
+const getIndexName = (table, columns) => {
+  return `${table}_${columns.map(
+    (it) => {
+      var _a;
+      return "column" in it ? it.column : ((_a = it.expression.match(/\w+/g)) == null ? void 0 : _a.join("_")) || "expression";
+    }
+  ).join("_")}_idx`;
+};
 const indexesToQuery = (up, { schema, name }, indexes) => {
   return indexes.map(({ columns, options }) => {
-    const indexName = options.name || joinWords(
-      name,
-      ...columns.filter((it) => "column" in it).map((it) => it.column),
-      "index"
-    );
+    const indexName = options.name || getIndexName(name, columns);
     if (!up) {
       return {
         text: `DROP INDEX "${indexName}"${options.dropMode ? ` ${options.dropMode}` : ""}`,
@@ -399,48 +399,26 @@ const primaryKeyToSql = (primaryKey) => {
     primaryKey.columns
   )})`;
 };
-const getPrimaryKeysOfTable = async (db, tableName) => {
-  const { rows } = await db.query(
-    {
-      text: `SELECT
-  pg_attribute.attname AS name,
-  format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS type
-FROM pg_index, pg_class, pg_attribute, pg_namespace
-WHERE
-  pg_class.oid = $1::regclass AND
-  indrelid = pg_class.oid AND
-  nspname = 'public' AND
-  pg_class.relnamespace = pg_namespace.oid AND
-  pg_attribute.attrelid = pg_class.oid AND
-  pg_attribute.attnum = any(pg_index.indkey) AND
-  indisprimary`,
-      values: [tableName]
-    },
-    db.types,
-    void 0
-  );
-  return rows;
-};
 
-var __defProp$5 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
+var __defProp$4 = Object.defineProperty;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+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$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(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;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 const types = Object.assign(Object.create(pqb.columnTypes), {
   raw: pqb.raw
 });
@@ -471,14 +449,14 @@ const makeAst$1 = (up, tableName, shape, tableData, options, noPrimaryKey) => {
   }
   const primaryKey = tableData.primaryKey;
   const [schema, table] = getSchemaAndTableFromName(tableName);
-  return __spreadProps$4(__spreadValues$5(__spreadProps$4(__spreadValues$5({
+  return __spreadProps$3(__spreadValues$4(__spreadProps$3(__spreadValues$4({
     type: "table",
     action: up ? "create" : "drop",
     schema,
     name: table,
     shape
   }, tableData), {
-    primaryKey: shapePKeys.length <= 1 ? primaryKey : primaryKey ? __spreadProps$4(__spreadValues$5({}, primaryKey), { columns: [...shapePKeys, ...primaryKey.columns] }) : { columns: shapePKeys }
+    primaryKey: shapePKeys.length <= 1 ? primaryKey : primaryKey ? __spreadProps$3(__spreadValues$4({}, primaryKey), { columns: [...shapePKeys, ...primaryKey.columns] }) : { columns: shapePKeys }
   }), options), {
     noPrimaryKey: options.noPrimaryKey ? "ignore" : noPrimaryKey || "error"
   });
@@ -552,25 +530,25 @@ const astToQueries$1 = (ast) => {
   return result;
 };
 
-var __defProp$4 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-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) => {
+var __defProp$3 = Object.defineProperty;
+var __defProps$2 = Object.defineProperties;
+var __getOwnPropDescs$2 = 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) => {
   for (var prop in b || (b = {}))
-    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]);
+    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;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 const newChangeTableData = () => ({
   add: { indexes: [], foreignKeys: [] },
   drop: { indexes: [], foreignKeys: [] }
@@ -586,7 +564,7 @@ const mergeTableData = (a, b) => {
     } else {
       a.primaryKey = {
         columns: [...a.primaryKey.columns, ...b.primaryKey.columns],
-        options: __spreadValues$4(__spreadValues$4({}, a.primaryKey.options), b.primaryKey.options)
+        options: __spreadValues$3(__spreadValues$3({}, a.primaryKey.options), b.primaryKey.options)
       };
     }
   }
@@ -637,7 +615,7 @@ const columnTypeToColumnChange = (item) => {
     if (foreignKeys == null ? void 0 : foreignKeys.some((it) => "fn" in it)) {
       throw new Error("Callback in foreignKey is not allowed in migration");
     }
-    return __spreadProps$3(__spreadValues$4({
+    return __spreadProps$2(__spreadValues$3({
       column: item,
       type: item.toSQL(),
       nullable: item.data.isNullable,
@@ -653,7 +631,7 @@ const tableChangeMethods = {
   add,
   drop,
   change(from, to, options) {
-    return __spreadValues$4({
+    return __spreadValues$3({
       type: "change",
       from: columnTypeToColumnChange(from),
       to: columnTypeToColumnChange(to)
@@ -703,18 +681,18 @@ const makeAst = (up, name, changeData, changeTableData2, options) => {
     const item = changeData[key];
     if ("type" in item) {
       if (up) {
-        shape[key] = item.type === "change" && item.usingUp ? __spreadProps$3(__spreadValues$4({}, item), { using: item.usingUp }) : item;
+        shape[key] = item.type === "change" && item.usingUp ? __spreadProps$2(__spreadValues$3({}, item), { using: item.usingUp }) : item;
       } else {
         if (item.type === "rename") {
-          shape[item.name] = __spreadProps$3(__spreadValues$4({}, item), { name: key });
+          shape[item.name] = __spreadProps$2(__spreadValues$3({}, item), { name: key });
         } else {
-          shape[key] = item.type === "add" ? __spreadProps$3(__spreadValues$4({}, item), { type: "drop" }) : item.type === "drop" ? __spreadProps$3(__spreadValues$4({}, item), { type: "add" }) : item.type === "change" ? __spreadProps$3(__spreadValues$4({}, item), { from: item.to, to: item.from, using: item.usingDown }) : item;
+          shape[key] = item.type === "add" ? __spreadProps$2(__spreadValues$3({}, item), { type: "drop" }) : item.type === "drop" ? __spreadProps$2(__spreadValues$3({}, item), { type: "add" }) : item.type === "change" ? __spreadProps$2(__spreadValues$3({}, item), { from: item.to, to: item.from, using: item.usingDown }) : item;
         }
       }
     }
   }
   const [schema, table] = getSchemaAndTableFromName(name);
-  return __spreadValues$4({
+  return __spreadValues$3({
     type: "changeTable",
     schema,
     name: table,
@@ -731,10 +709,10 @@ const astToQueries = (ast) => {
       values: []
     });
   }
-  const addPrimaryKeys = ast.add.primaryKey ? __spreadValues$4({}, ast.add.primaryKey) : {
+  const addPrimaryKeys = ast.add.primaryKey ? __spreadValues$3({}, ast.add.primaryKey) : {
     columns: []
   };
-  const dropPrimaryKeys = ast.drop.primaryKey ? __spreadValues$4({}, ast.drop.primaryKey) : {
+  const dropPrimaryKeys = ast.drop.primaryKey ? __spreadValues$3({}, ast.drop.primaryKey) : {
     columns: []
   };
   for (const key in ast.shape) {
@@ -842,7 +820,7 @@ const astToQueries = (ast) => {
           if (fromIndex) {
             dropIndexes.push({
               columns: [
-                __spreadValues$4({
+                __spreadValues$3({
                   column: key
                 }, fromIndex)
               ],
@@ -852,7 +830,7 @@ const astToQueries = (ast) => {
           if (toIndex) {
             addIndexes.push({
               columns: [
-                __spreadValues$4({
+                __spreadValues$3({
                   column: key
                 }, toIndex)
               ],
@@ -902,98 +880,6 @@ const astToQueries = (ast) => {
   return result;
 };
 
-var __defProp$3 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = 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) => {
-  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]);
-    }
-  return a;
-};
-var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
-class UnknownColumn extends pqb.ColumnType {
-  constructor(dataType) {
-    super();
-    this.dataType = dataType;
-    this.operators = pqb.Operators.any;
-  }
-  toCode() {
-    return "unknown";
-  }
-}
-const createJoinTable = async (migration, up, tables, options, fn) => {
-  const tableName = options.tableName || joinWords(...tables);
-  if (!up) {
-    return createTable$1(
-      migration,
-      up,
-      tableName,
-      __spreadProps$2(__spreadValues$3({}, options), { noPrimaryKey: true }),
-      () => ({})
-    );
-  }
-  const tablesWithPrimaryKeys = await Promise.all(
-    tables.map(async (table) => {
-      const primaryKeys = await getPrimaryKeysOfTable(migration, table).then(
-        (items) => items.map((item) => __spreadProps$2(__spreadValues$3({}, item), {
-          joinedName: joinWords(pluralize.singular(table), item.name)
-        }))
-      );
-      const [schema, name] = getSchemaAndTableFromName(table);
-      if (!primaryKeys.length) {
-        throw new Error(
-          `Primary key for table ${quoteWithSchema({
-            schema,
-            name
-          })} is not defined`
-        );
-      }
-      return [schema, table, primaryKeys];
-    })
-  );
-  return createTable$1(migration, up, tableName, options, (t) => {
-    const result = {};
-    tablesWithPrimaryKeys.forEach(([schema, table, primaryKeys]) => {
-      if (primaryKeys.length === 1) {
-        const [{ type, joinedName, name }] = primaryKeys;
-        const column = new UnknownColumn(type);
-        result[joinedName] = column.foreignKey(
-          schema ? `${schema}.${table}` : table,
-          name
-        );
-        return;
-      }
-      primaryKeys.forEach(({ joinedName, type }) => {
-        result[joinedName] = new UnknownColumn(type);
-      });
-      t.foreignKey(
-        primaryKeys.map((key) => key.joinedName),
-        table,
-        primaryKeys.map((key) => key.name)
-      );
-    });
-    if (fn) {
-      Object.assign(result, fn(t));
-    }
-    t.primaryKey(
-      tablesWithPrimaryKeys.flatMap(
-        ([, , primaryKeys]) => primaryKeys.map((item) => item.joinedName)
-      )
-    );
-    return result;
-  });
-};
-
 var __defProp$2 = Object.defineProperty;
 var __defProps$1 = Object.defineProperties;
 var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
@@ -1038,16 +924,6 @@ class Migration extends pqb.TransactionAdapter {
     const fn = cb || cbOrOptions;
     return createTable$1(this, !this.up, tableName, options, fn);
   }
-  async createJoinTable(tables, cbOrOptions, cb) {
-    const options = typeof cbOrOptions === "function" ? {} : cbOrOptions || {};
-    const fn = cb || cbOrOptions;
-    return createJoinTable(this, this.up, tables, options, fn);
-  }
-  async dropJoinTable(tables, cbOrOptions, cb) {
-    const options = typeof cbOrOptions === "function" ? {} : cbOrOptions || {};
-    const fn = cb || cbOrOptions;
-    return createJoinTable(this, !this.up, tables, options, fn);
-  }
   changeTable(tableName, cbOrOptions, cb) {
     const [fn, options] = typeof cbOrOptions === "function" ? [cbOrOptions, {}] : [cb, cbOrOptions];
     return changeTable(this, this.up, tableName, options, fn);
@@ -1846,7 +1722,7 @@ const structureToAst = async (db) => {
           collate: options.collate,
           opclass: options.opclass,
           order: options.order,
-          name: index.name,
+          name: index.name !== getIndexName(name, index.columns) ? index.name : void 0,
           using: index.using === "btree" ? void 0 : index.using,
           unique: index.isUnique,
           include: index.include,
@@ -1863,7 +1739,7 @@ const structureToAst = async (db) => {
           foreignKey.foreignTableName,
           foreignKey.foreignColumnNames[0],
           {
-            name: foreignKey.name,
+            name: foreignKey.name && foreignKey.name !== getForeignKeyName(name, foreignKey.columnNames) ? foreignKey.name : void 0,
             match: matchMap[foreignKey.match],
             onUpdate: fkeyActionMap[foreignKey.onUpdate],
             onDelete: fkeyActionMap[foreignKey.onDelete]
@@ -1893,7 +1769,7 @@ const structureToAst = async (db) => {
           order: it.order
         })),
         options: {
-          name: index.name,
+          name: index.name !== getIndexName(name, index.columns) ? index.name : void 0,
           using: index.using === "btree" ? void 0 : index.using,
           unique: index.isUnique,
           include: index.include,
@@ -1907,7 +1783,7 @@ const structureToAst = async (db) => {
         fnOrTable: it.foreignTableName,
         foreignColumns: it.foreignColumnNames,
         options: {
-          name: it.name,
+          name: it.name && it.name !== getForeignKeyName(name, it.columnNames) ? it.name : void 0,
           match: matchMap[it.match],
           onUpdate: fkeyActionMap[it.onUpdate],
           onDelete: fkeyActionMap[it.onDelete]