rake-db 2.3.1 → 2.3.2

package/dist/index.js

@@ -1780,8 +1780,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"
@@ -1816,6 +1816,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);
@@ -1824,13 +1826,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 = pqb.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 = pqb.instantiateColumn(klass, item);
       if ((primaryKey == null ? void 0 : primaryKey.columnNames.length) === 1 && (primaryKey == null ? void 0 : primaryKey.columnNames[0]) === item.name) {
         column = column.primaryKey();
@@ -1968,12 +1970,20 @@ const createSchema = (ast) => {
 const createTable = (ast) => {
   const code = [];
   pqb.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 = [`${pqb.quoteObjectKey(key)}: `];
-    pqb.addCode(line, ast.shape[key].toCode("t"));
+    for (const part of ast.shape[key].toCode("t")) {
+      pqb.addCode(line, part);
+    }
     pqb.addCode(line, ",");
     code.push(line);
   }
+  if (hasTimestamps) {
+    code.push(["...t.timestamps(),"]);
+  }
   if (ast.primaryKey) {
     code.push([pqb.primaryKeyToCode(ast.primaryKey, "t")]);
   }
@@ -1986,10 +1996,18 @@ const createTable = (ast) => {
   pqb.addCode(code, "}));");
   return code;
 };
+const isTimestamp = (column) => {
+  if (!column)
+    return false;
+  const { default: def } = column.data;
+  return column instanceof pqb.TimestampColumn && !column.data.isNullable && def && typeof def === "object" && pqb.isRaw(def) && def.__raw === "now()";
+};
 
 const pullDbStructure = async (options, config) => {
-  const db = new DbStructure(new pqb.Adapter(options));
+  const adapter = new pqb.Adapter(options);
+  const db = new DbStructure(adapter);
   const ast = await structureToAst(db);
+  await adapter.close();
   const result = astToMigration(ast);
   if (!result)
     return;