Merge pull request #320 from obrix/extend_object_reference_list

Add 4 new elements to qwat_vl.object_reference
qwat · Mar 26, 2020 · 4059a14 · 4059a14
2 parents 68ba774 + 8a5a30c
commit 4059a14
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/update/delta/delta_1.3.5_000_extend_object_ref_list.sql b/update/delta/delta_1.3.5_000_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/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):

diff --git 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');