OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #55: (api -> master)

Browse Source 
Merge Request: Fix delete junction batch command

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/55
This commit is contained in:
王琼钰
2022-10-21 20:00:35 +08:00
parent 2f474b160f 6afd6c3411
commit a8cd417188
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/command.py
View File

@@ -51,7 +51,7 @@ def execute_delete_command(name: str, cs: ChangeSet) -> ChangeSet:
type = cs.operations[0]['type'] type = cs.operations[0]['type']
if type == JUNCTION: if type == JUNCTION:
return add_junction(name, cs) return delete_junction(name, cs)
elif type == RESERVOIR: elif type == RESERVOIR:
return delete_reservoir(name, cs) return delete_reservoir(name, cs)
elif type == TANK: elif type == TANK:

1
api/operation.py
View File

@@ -55,6 +55,7 @@ def write(name: str, sql: str) -> None:
with conn[name].cursor() as cur: with conn[name].cursor() as cur:
cur.execute(sql) cur.execute(sql)
def get_current_operation(name: str) -> int: def get_current_operation(name: str) -> int:
return int(read(name, 'select id from current_operation')['id']) return int(read(name, 'select id from current_operation')['id'])

5
tjnetwork.py
View File

@@ -96,11 +96,6 @@ def pick_snapshot(name: str, tag: str, discard: bool = False) -> ChangeSet:
def sync_with_server(name: str, operation: int) -> ChangeSet: def sync_with_server(name: str, operation: int) -> ChangeSet:
return api.sync_with_server(name, operation) return api.sync_with_server(name, operation)
############################################################
# operation
############################################################
def execute_batch_commands(name: str, cs: ChangeSet) -> ChangeSet: def execute_batch_commands(name: str, cs: ChangeSet) -> ChangeSet:
return api.execute_batch_commands(name, cs) return api.execute_batch_commands(name, cs)