rake-db 2.3.1 → 2.3.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # rake-db
 
+## 2.3.3
+
+### Patch Changes
+
+- Improve pullindg db structure
+
+## 2.3.2
+
+### Patch Changes
+
+- Improve pulling db structure
+- Updated dependencies
+  - pqb@0.9.2
+
 ## 2.3.1
 
 ### Patch Changes

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { singleQuote, quote, isRaw, getRaw, toArray, columnTypes, raw, getColumnTypes, getTableData, resetTableData, ColumnType, emptyObject, Operators, TransactionAdapter, logParamToLogObject, Adapter, columnsByType, instantiateColumn, codeToString, addCode, quoteObjectKey, primaryKeyToCode, indexToCode, foreignKeyToCode } from 'pqb';
+import { singleQuote, quote, isRaw, getRaw, toArray, columnTypes, raw, getColumnTypes, getTableData, resetTableData, ColumnType, emptyObject, Operators, TransactionAdapter, logParamToLogObject, Adapter, columnsByType, instantiateColumn, codeToString, addCode, quoteObjectKey, primaryKeyToCode, indexToCode, foreignKeyToCode, TimestampColumn } from 'pqb';
 import Enquirer from 'enquirer';
 import path from 'path';
 import { readdir, mkdir, writeFile } from 'fs/promises';
@@ -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}` : ""}`,
@@ -1771,8 +1778,8 @@ const matchMap = {
   p: "PARTIAL"
 };
 const fkeyActionMap = {
-  a: "NO ACTION",
-  r: void 0,
+  a: void 0,
+  r: "RESTRICT",
   c: "CASCADE",
   n: "SET NULL",
   d: "SET DEFAULT"
@@ -1807,6 +1814,8 @@ const structureToAst = async (db) => {
   }
   for (const table of tables) {
     const { schemaName, name } = table;
+    if (name === "schemaMigrations")
+      continue;
     const belongsToTable = makeBelongsToTable(schemaName, name);
     const columns = allColumns.filter(belongsToTable);
     const primaryKey = allPrimaryKeys.find(belongsToTable);
@@ -1815,13 +1824,13 @@ const structureToAst = async (db) => {
     const shape = {};
     for (let item of columns) {
       const isSerial = getIsSerial(item);
+      if (isSerial) {
+        item = __spreadProps(__spreadValues({}, item), { default: void 0 });
+      }
       const klass = columnsByType[getColumnType(item, isSerial)];
       if (!klass) {
         throw new Error(`Column type \`${item.type}\` is not supported`);
       }
-      if (isSerial) {
-        item = __spreadProps(__spreadValues({}, item), { default: void 0 });
-      }
       let column = instantiateColumn(klass, item);
       if ((primaryKey == null ? void 0 : primaryKey.columnNames.length) === 1 && (primaryKey == null ? void 0 : primaryKey.columnNames[0]) === item.name) {
         column = column.primaryKey();
@@ -1835,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,
@@ -1852,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]
@@ -1882,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,
@@ -1896,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]
@@ -1959,12 +1968,20 @@ const createSchema = (ast) => {
 const createTable = (ast) => {
   const code = [];
   addCode(code, `await db.createTable(${quoteSchemaTable(ast)}, (t) => ({`);
+  const hasTimestamps = isTimestamp(ast.shape.createdAt) && isTimestamp(ast.shape.updatedAt);
   for (const key in ast.shape) {
+    if (hasTimestamps && (key === "createdAt" || key === "updatedAt"))
+      continue;
     const line = [`${quoteObjectKey(key)}: `];
-    addCode(line, ast.shape[key].toCode("t"));
+    for (const part of ast.shape[key].toCode("t")) {
+      addCode(line, part);
+    }
     addCode(line, ",");
     code.push(line);
   }
+  if (hasTimestamps) {
+    code.push(["...t.timestamps(),"]);
+  }
   if (ast.primaryKey) {
     code.push([primaryKeyToCode(ast.primaryKey, "t")]);
   }
@@ -1977,10 +1994,18 @@ const createTable = (ast) => {
   addCode(code, "}));");
   return code;
 };
+const isTimestamp = (column) => {
+  if (!column)
+    return false;
+  const { default: def } = column.data;
+  return column instanceof TimestampColumn && !column.data.isNullable && def && typeof def === "object" && isRaw(def) && def.__raw === "now()";
+};
 
 const pullDbStructure = async (options, config) => {
-  const db = new DbStructure(new Adapter(options));
+  const adapter = new Adapter(options);
+  const db = new DbStructure(adapter);
   const ast = await structureToAst(db);
+  await adapter.close();
   const result = astToMigration(ast);
   if (!result)
     return;