@smartive/graphql-magic 23.13.0 → 23.14.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,5 @@
-## [23.13.0](https://github.com/smartive/graphql-magic/compare/v23.12.0...v23.13.0) (2026-04-01)
+## [23.14.0-next.1](https://github.com/smartive/graphql-magic/compare/v23.13.0...v23.14.0-next.1) (2026-04-01)
 
 ### Features
 
-* Allow filters to be mandatory ([#446](https://github.com/smartive/graphql-magic/issues/446)) ([77c82f6](https://github.com/smartive/graphql-magic/commit/77c82f64c0db4313d1b41669c0fb62ebd2755f87))
+* Disable null constraints on revisions table ([8b2c179](https://github.com/smartive/graphql-magic/commit/8b2c1794500824bbf3a9f61ede28bb36995d5344))

package/dist/bin/gqm.cjs

@@ -903,21 +903,6 @@ var import_code_block_writer2 = __toESM(require("code-block-writer"), 1);
 var import_knex_schema_inspector = require("knex-schema-inspector");
 var import_lowerFirst = __toESM(require("lodash/lowerFirst"), 1);
 
-// src/resolvers/arguments.ts
-var import_graphql3 = require("graphql");
-
-// src/resolvers/utils.ts
-var import_graphql4 = require("graphql");
-var import_isEqual = __toESM(require("lodash/isEqual"), 1);
-var getColumnName = (field) => field.kind === "relation" ? field.foreignKey || `${field.name}Id` : field.name;
-
-// src/resolvers/resolver.ts
-var import_cloneDeep2 = __toESM(require("lodash/cloneDeep"), 1);
-var import_flatMap = __toESM(require("lodash/flatMap"), 1);
-
-// src/resolvers/resolvers.ts
-var import_graphql5 = require("graphql");
-
 // src/migrations/update-functions.ts
 var normalizeWhitespace = (str) => {
   return str.replace(/\s+/g, " ").replace(/\s*\(\s*/g, "(").replace(/\s*\)\s*/g, ")").replace(/\s*,\s*/g, ",").replace(/\s*;\s*/g, ";").trim();
@@ -1644,24 +1629,28 @@ var MigrationGenerator = class _MigrationGenerator {
     });
     if (isUpdatableModel(model)) {
       const updatableFields = fields2.filter(and(isUpdatableField, isStoredInDatabase));
-      if (!updatableFields.length) {
+      const revisionFieldsNeedingAlter = updatableFields.filter((field) => this.revisionFieldNeedsSchemaAlter(model, field));
+      if (!revisionFieldsNeedingAlter.length) {
         return;
       }
       up.push(() => {
         this.alterTable(`${model.name}Revision`, () => {
-          for (const [index, field] of updatableFields.entries()) {
-            this.columnRaw(field, { alter: true }, index);
+          for (const [index, field] of revisionFieldsNeedingAlter.entries()) {
+            this.columnRaw(field, { alter: true, setNonNull: false }, index);
           }
         });
       });
       down.push(() => {
         this.alterTable(`${model.name}Revision`, () => {
-          for (const [index, field] of updatableFields.entries()) {
+          for (const [index, field] of revisionFieldsNeedingAlter.entries()) {
             this.columnRaw(
               field,
-              { alter: true },
+              { alter: true, setNonNull: false },
               index,
-              summonByName(this.columns[model.name], field.kind === "relation" ? `${field.name}Id` : field.name)
+              summonByName(
+                this.columns[`${model.name}Revision`],
+                field.kind === "relation" ? `${field.name}Id` : field.name
+              )
             );
           }
         });
@@ -1692,23 +1681,27 @@ var MigrationGenerator = class _MigrationGenerator {
     });
     if (isUpdatableModel(model)) {
       const updatableFields = fields2.filter(and(isUpdatableField, isStoredInDatabase));
-      if (!updatableFields.length) {
+      const revisionFieldsNeedingAlter = updatableFields.filter((field) => this.revisionFieldNeedsSchemaAlter(model, field));
+      if (!revisionFieldsNeedingAlter.length) {
         return;
       }
       up.push(() => {
         this.alterTable(`${model.name}Revision`, () => {
-          for (const field of updatableFields) {
-            this.column(field, { alter: true });
+          for (const field of revisionFieldsNeedingAlter) {
+            this.column(field, { alter: true, setUnique: false, setNonNull: false, foreign: false });
           }
         });
       });
       down.push(() => {
         this.alterTable(`${model.name}Revision`, () => {
-          for (const field of updatableFields) {
+          for (const field of revisionFieldsNeedingAlter) {
             this.column(
               field,
-              { alter: true },
-              summonByName(this.columns[model.name], field.kind === "relation" ? `${field.name}Id` : field.name)
+              { alter: true, setUnique: false, setNonNull: false, foreign: false },
+              summonByName(
+                this.columns[`${model.name}Revision`],
+                field.kind === "relation" ? `${field.name}Id` : field.name
+              )
             );
           }
         });
@@ -1730,7 +1723,7 @@ var MigrationGenerator = class _MigrationGenerator {
         }
       }
       for (const field of model.fields.filter(and(isUpdatableField, not(isInherited), isStoredInDatabase))) {
-        this.column(field, { setUnique: false, setDefault: false });
+        this.column(field, { setUnique: false, setDefault: false, setNonNull: false, foreign: false });
       }
     });
   }
@@ -1740,30 +1733,9 @@ var MigrationGenerator = class _MigrationGenerator {
       up.push(() => {
         this.alterTable(revisionTable, () => {
           for (const field of missingRevisionFields) {
-            this.column(field, { setUnique: false, setNonNull: false, setDefault: false });
+            this.column(field, { setUnique: false, setNonNull: false, setDefault: false, foreign: false });
           }
         });
-        const revisionFieldsWithDataToCopy = missingRevisionFields.filter(
-          (field) => this.columns[model.name].find((col) => col.name === getColumnName(field)) || field.defaultValue !== void 0 || field.nonNull
-        );
-        if (revisionFieldsWithDataToCopy.length) {
-          this.writer.write(`await knex('${model.name}Revision').update(`).inlineBlock(() => {
-            for (const { name: name2, kind: type } of revisionFieldsWithDataToCopy) {
-              const col = type === "relation" ? `${name2}Id` : name2;
-              this.writer.write(
-                `${col}: knex.raw('(select "${col}" from "${model.name}" where "${model.name}".id = "${model.name}Revision"."${typeToField(model.name)}Id")'),`
-              ).newLine();
-            }
-          }).write(");").newLine().blankLine();
-        }
-        const nonNullableMissingRevisionFields = missingRevisionFields.filter(({ nonNull: nonNull2 }) => nonNull2);
-        if (nonNullableMissingRevisionFields.length) {
-          this.alterTable(revisionTable, () => {
-            for (const field of nonNullableMissingRevisionFields) {
-              this.column(field, { setUnique: false, setDefault: false, alter: true });
-            }
-          });
-        }
       });
       down.push(() => {
         this.alterTable(revisionTable, () => {
@@ -2349,21 +2321,27 @@ var MigrationGenerator = class _MigrationGenerator {
     return this.columns[tableName].find((col) => col.name === columnName);
   }
   hasChanged(model, field) {
+    return this.hasChangedOnTable(model.name, field, { respectNullability: true });
+  }
+  hasChangedOnTable(tableName, field, { respectNullability }) {
     if (field.generateAs?.type === "expression") {
       return false;
     }
-    const col = this.getColumn(model.name, field.kind === "relation" ? `${field.name}Id` : field.name);
+    const col = this.getColumn(tableName, field.kind === "relation" ? `${field.name}Id` : field.name);
     if (!col) {
       return false;
     }
     if (field.generateAs) {
       if (col.generation_expression !== field.generateAs.expression) {
-        throw new Error(
-          `Column ${col.name} has specific type ${col.generation_expression} but expected ${field.generateAs.expression}`
-        );
+        if (respectNullability) {
+          throw new Error(
+            `Column ${col.name} has specific type ${col.generation_expression} but expected ${field.generateAs.expression}`
+          );
+        }
+        return true;
       }
     }
-    if (!field.nonNull && !col.is_nullable || field.nonNull && col.is_nullable) {
+    if (respectNullability && (!field.nonNull && !col.is_nullable || field.nonNull && col.is_nullable)) {
       return true;
     }
     if (!field.kind || field.kind === "primitive") {
@@ -2406,6 +2384,23 @@ var MigrationGenerator = class _MigrationGenerator {
     }
     return false;
   }
+  revisionFieldNeedsSchemaAlter(model, field) {
+    if (field.generateAs?.type === "expression") {
+      return false;
+    }
+    const tableName = `${model.name}Revision`;
+    const colName = field.kind === "relation" ? `${field.name}Id` : field.name;
+    const revCol = this.getColumn(tableName, colName);
+    if (!revCol) {
+      return false;
+    }
+    if (field.generateAs) {
+      if (revCol.generation_expression !== field.generateAs.expression) {
+        return true;
+      }
+    }
+    return this.hasChangedOnTable(tableName, field, { respectNullability: false });
+  }
   async handleFunctions(up, down) {
     if (!this.parsedFunctions || this.parsedFunctions.length === 0) {
       return;
@@ -2488,9 +2483,24 @@ var getMigrationDate = () => {
   return `${year}${month}${day}${hours}${minutes}${seconds}`;
 };
 
+// src/resolvers/utils.ts
+var import_graphql3 = require("graphql");
+var import_isEqual = __toESM(require("lodash/isEqual"), 1);
+var getColumnName = (field) => field.kind === "relation" ? field.foreignKey || `${field.name}Id` : field.name;
+
 // src/permissions/generate.ts
 var ACTIONS = ["READ", "CREATE", "UPDATE", "DELETE", "RESTORE", "LINK"];
 
+// src/resolvers/arguments.ts
+var import_graphql4 = require("graphql");
+
+// src/resolvers/resolver.ts
+var import_cloneDeep2 = __toESM(require("lodash/cloneDeep"), 1);
+var import_flatMap = __toESM(require("lodash/flatMap"), 1);
+
+// src/resolvers/resolvers.ts
+var import_graphql5 = require("graphql");
+
 // src/schema/generate.ts
 var import_graphql7 = require("graphql");