From 9678c7561b8f3bf2d738653eb366ed1ec0471605 Mon Sep 17 00:00:00 2001 From: Bertrand Rix Date: Tue, 10 Mar 2020 16:37:09 +0100 Subject: [PATCH 1/3] Add 4 new elements to qwat_vl.object_reference --- update/delta/delta_1.4.0_001_extend_object_ref_list.sql | 4 ++++ value_lists/vl_object_reference.sql | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 update/delta/delta_1.4.0_001_extend_object_ref_list.sql diff --git a/update/delta/delta_1.4.0_001_extend_object_ref_list.sql b/update/delta/delta_1.4.0_001_extend_object_ref_list.sql new file mode 100644 index 00000000..09cd679a --- /dev/null +++ b/update/delta/delta_1.4.0_001_extend_object_ref_list.sql @@ -0,0 +1,4 @@ +INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9010,'fond de fouille','excavation bed','bază săpătură'); +INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9020,'sur vanne','on valve','pe supapă'); +INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9021,'sur tige de vanne','on valve shaft','pe arborele supapei'); +INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9022,'sur cape de vanne','on valve bonnet','pe capota supapelor'); diff --git a/value_lists/vl_object_reference.sql b/value_lists/vl_object_reference.sql index 230ae2d9..f0f5830b 100644 --- a/value_lists/vl_object_reference.sql +++ b/value_lists/vl_object_reference.sql @@ -18,7 +18,8 @@ INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES ( INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9003,'dessus de la conduite','on top of pipe','pe conductă'); INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9004,'dessus','on top','deasupra'); INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9005,'axe de la conduite','pipe axis','axul conductei'); - - - +INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9010,'fond de fouille','excavation bed','bază săpătură'); +INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9020,'sur vanne','on valve','pe supapă'); +INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9021,'sur tige de vanne','on valve shaft','pe arborele supapei'); +INSERT INTO qwat_vl.object_reference (id, value_fr, value_en, value_ro) VALUES (9022,'sur cape de vanne','on valve bonnet','pe capota supapelor'); From c092f2164e572fc9f41f0187b8c00ac3d36542da Mon Sep 17 00:00:00 2001 From: Bertrand Rix Date: Wed, 11 Mar 2020 09:44:41 +0100 Subject: [PATCH 2/3] Rename delta 1.4.0 to 1.3.5. --- ...ct_ref_list.sql => delta_1.3.5_000_extend_object_ref_list.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename update/delta/{delta_1.4.0_001_extend_object_ref_list.sql => delta_1.3.5_000_extend_object_ref_list.sql} (100%) diff --git a/update/delta/delta_1.4.0_001_extend_object_ref_list.sql b/update/delta/delta_1.3.5_000_extend_object_ref_list.sql similarity index 100% rename from update/delta/delta_1.4.0_001_extend_object_ref_list.sql rename to update/delta/delta_1.3.5_000_extend_object_ref_list.sql From 8a5a30c038e83ec721389799b0fd8c081b20e0d7 Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Thu, 26 Mar 2020 09:36:39 +0100 Subject: [PATCH 3/3] Fix pre-all per pum 0.9.10 --- update/delta/pre-all.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update/delta/pre-all.py b/update/delta/pre-all.py index e7163c21..0232443c 100644 --- a/update/delta/pre-all.py +++ b/update/delta/pre-all.py @@ -1,4 +1,5 @@ from pum.core.deltapy import DeltaPy +import pkg_resources import os class DropViews(DeltaPy): @@ -11,7 +12,7 @@ def run(self): # If you have to do or NOT to do some specific work, you must do it there # For example, the 1.2.8 version delta contain some specific actions wich require to drop the views before playing them; # But we have to drop them only if the current version is 1.2.8 or superior - if version > '1.2.8': + if version > pkg_resources.parse_version('1.2.8'): self.drop_views() def drop_views(self):