Merge pull request #3 from gertrude-app/monitoring-changes

gertrude-app · Aug 23, 2022 · cb73f67 · cb73f67
2 parents 6152341 + bc0502e
commit cb73f67
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Sources/DuetSQL/WhereConstraint.swift b/Sources/DuetSQL/WhereConstraint.swift
@@ -238,6 +238,13 @@ public func != <M: Model>(
 
 infix operator |=|
 
+public func |=| <M: Model>(
+  lhs: M.ColumnName,
+  rhs: [UUIDStringable]
+) -> SQL.WhereConstraint<M> {
+  .in(lhs, rhs.map { .uuid($0) })
+}
+
 public func |=| <M: Model>(
   lhs: M.ColumnName,
   rhs: [M.IdValue]

diff --git a/codegen/lib/models/graphql.ts b/codegen/lib/models/graphql.ts
@@ -344,6 +344,7 @@ function keyPath(
   if (
     type === `Id` ||
     type === `UUID` ||
+    type === `[UUID]` ||
     model.taggedTypes[type] === `UUID` ||
     globalTypes.taggedTypes[type] === `UUID` ||
     type.endsWith(`.Id`)

diff --git a/codegen/lib/models/model-attrs.ts b/codegen/lib/models/model-attrs.ts
@@ -153,7 +153,7 @@ function setMigrationNumber(model: Model, lines: string[]): void {
     if (line.startsWith(`}`)) {
       return;
     }
-    const migrationMatch = line.match(/^  enum M(\d+) {$/);
+    const migrationMatch = line.match(/^  enum M(\d+)(: TableNamingMigration)? {$/);
     if (migrationMatch && !Number.isNaN(Number(migrationMatch[1]))) {
       inMigration = Number(migrationMatch[1]);
     }