diff --git a/api/s2_junctions.py b/api/s2_junctions.py index 78cb2c1..88d3f73 100644 --- a/api/s2_junctions.py +++ b/api/s2_junctions.py @@ -25,9 +25,8 @@ def delete_junction(name: str, id: str) -> ChangeSet: return elevation = row['elevation'] - demand = 'NULL' if row['demand'] == None else row['demand'] - pattern = 'NULL' if row['pattern'] == None else row['pattern'] - pattern = f'"{pattern}"' if pattern != 'NULL' else pattern + demand = utility.decorate(row['demand'], 'float', True) + pattern = utility.decorate(row['pattern'], 'str', True) sql = f"delete from junctions where id = '{id}';" undo_sql = f'insert into junctions (id, elevation, demand, pattern) values ("{id}", {elevation}, {demand}, {pattern});' diff --git a/api/s3_reservoirs.py b/api/s3_reservoirs.py index 7dc649c..e663e39 100644 --- a/api/s3_reservoirs.py +++ b/api/s3_reservoirs.py @@ -26,8 +26,7 @@ def delete_reservoir(name: str, id: str) -> ChangeSet: return head = row['head'] - pattern = 'NULL' if row['pattern'] == None else row['pattern'] - pattern = f'"{pattern}"' if pattern != 'NULL' else pattern + pattern = utility.decorate(row['pattern'], 'str', True) sql = f"delete from reservoirs where id = '{id}';" undo_sql = f'insert into reservoirs (id, head, pattern) values ("{id}", {head}, {pattern});'