fix Update constraint params

NASA-AMMOS · Mar 3, 2025 · 6ecb0cf · 6ecb0cf
1 parent af48f40
commit 6ecb0cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.../java/gov/nasa/jpl/aerie/merlin/server/remotes/postgres/PostgresConstraintRepository.java b/.../java/gov/nasa/jpl/aerie/merlin/server/remotes/postgres/PostgresConstraintRepository.java
@@ -71,7 +71,7 @@ public void updateConstraintParameterSchema(final long constraintId, final long
         updateConstraintAction.update(constraintId, revision, schema);
       }
     } catch (final SQLException ex) {
-      throw new DatabaseException("Failed to get scheduling specification revision data", ex);
+      throw new DatabaseException("Failed to get constraint revision data", ex);
     }
   }
 }
diff --git a/...a/gov/nasa/jpl/aerie/merlin/server/remotes/postgres/UpdateConstraintParametersAction.java b/...a/gov/nasa/jpl/aerie/merlin/server/remotes/postgres/UpdateConstraintParametersAction.java
@@ -13,9 +13,8 @@
 public class UpdateConstraintParametersAction implements AutoCloseable {
   private static final @Language("SQL") String sql = """
     update merlin.constraint_definition
-    set parameter_schema=?
-    where (constraint_id, revision)= (?,?)
-    returning constraint_id
+    set parameter_schema=?::jsonb
+    where (constraint_id, revision)= (?,?);
     """;
 
   private final PreparedStatement statement;
@@ -28,10 +27,10 @@ public void update(final long constraintId, final long revision, final ValueSche
     this.statement.setString(1, new ValueSchemaJsonParser().unparse(schema).toString());
     this.statement.setLong(2, constraintId);
     this.statement.setLong(3, revision);
-    this.statement.executeUpdate();
+    final var rowsUpdated = this.statement.executeUpdate();
 
-    try (final var results = statement.executeQuery()) {
-      if (!results.next()) throw new FailedUpdateException("merlin.constraint_definition");
+    if (rowsUpdated != 1) {
+      throw new FailedUpdateException("merlin.constraint_definition");
     }
   }