rake-db 2.3.2 → 2.3.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # rake-db
 
+## 2.3.3
+
+### Patch Changes
+
+- Improve pullindg db structure
+
 ## 2.3.2
 
 ### Patch Changes

package/dist/index.esm.js

@@ -284,8 +284,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}` : ""}`;
@@ -317,13 +320,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}` : ""}`,
@@ -1837,7 +1844,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,
@@ -1854,7 +1861,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]
@@ -1884,7 +1891,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,
@@ -1898,7 +1905,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]