From aa68acea3d23dcc8f267475a5ba6f8a027e71bbb Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Mon, 5 Aug 2024 17:05:42 +0200 Subject: [PATCH] DB: Minor change to 0.1.0 update. --- src/Model/River.py | 2 +- src/Model/SedimentLayer/SedimentLayer.py | 4 ++-- src/Model/Tools/PamhyrID.py | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Model/River.py b/src/Model/River.py index 0565b42b..fb8745cb 100644 --- a/src/Model/River.py +++ b/src/Model/River.py @@ -284,7 +284,7 @@ class RiverReach(Edge, SQLSubModel): def _db_save(self, execute, data=None): execute( "INSERT OR REPLACE INTO " + - "river_reach(pamhyr_id, name, enable, node1, node2) " + + "river_reach(pamhyr_id, name, enabled, node1, node2) " + "VALUES (" + f"{self.pamhyr_id}, '{self._db_format(self._name)}', " + f"{self._db_format(self.is_enable())}," diff --git a/src/Model/SedimentLayer/SedimentLayer.py b/src/Model/SedimentLayer/SedimentLayer.py index c7371d10..db9ee458 100644 --- a/src/Model/SedimentLayer/SedimentLayer.py +++ b/src/Model/SedimentLayer/SedimentLayer.py @@ -213,7 +213,7 @@ class Layer(SQLSubModel): execute( "INSERT INTO " + - "sedimentary_layer_layer(id, ind, name, type, height, " + + "sedimentary_layer_layer(pamhyr_id, ind, name, type, height, " + "d50, sigma, critical_constraint, sl) " + "VALUES (" + f"{self.pamhyr_id}, {ind}, '{self._db_format(self._name)}', " + @@ -357,7 +357,7 @@ class SedimentLayer(SQLSubModel): data = {} execute( - "INSERT INTO sedimentary_layer (id, name, comment) " + + "INSERT INTO sedimentary_layer (pamhyr_id, name, comment) " + f"VALUES ({self.pamhyr_id}, " + f"'{self._db_format(self._name)}', " + f"'{self._db_format(self._comment)}')" diff --git a/src/Model/Tools/PamhyrID.py b/src/Model/Tools/PamhyrID.py index b04781fe..503fb0ad 100644 --- a/src/Model/Tools/PamhyrID.py +++ b/src/Model/Tools/PamhyrID.py @@ -45,6 +45,10 @@ class PamhyrID(object): return pid + @property + def id(self): + return self._pamhyr_id + @property def pamhyr_id(self): return self._pamhyr_id