Merge pull request #90 from opengisch/enumwithtabs

use 'obsolete' parameter createEnumTabs on ili2db 3 only
opengisch · Apr 4, 2024 · 1a4b6f3 · 1a4b6f3
2 parents c90fa78 + 8e20e34
commit 1a4b6f3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/modelbaker/iliwrapper/ili2dbconfig.py b/modelbaker/iliwrapper/ili2dbconfig.py
@@ -252,7 +252,6 @@ def to_ili2db_args(self, extra_args=[], with_action=True):
         self.append_args(args, extra_args, force_append=True)
 
         self.append_args(args, ["--coalesceCatalogueRef"], True)
-        self.append_args(args, ["--createEnumTabs"], True)
 
         if self.disable_validation:
             self.append_args(args, ["--sqlEnableNull"], force_append=True)
@@ -276,10 +275,11 @@ def to_ili2db_args(self, extra_args=[], with_action=True):
             self.append_args(args, ["--createTypeConstraint"], True)
             self.append_args(args, ["--createEnumTabsWithId"], True)
             self.append_args(args, ["--createTidCol"], True)
-
-        # version 3 backwards compatibility (not needed in newer versions)
-        if self.create_import_tid:
-            self.append_args(args, ["--importTid"])
+        else:
+            # version 3 backwards compatibility (not needed in newer versions)
+            self.append_args(args, ["--createEnumTabs"], True)
+            if self.create_import_tid:
+                self.append_args(args, ["--importTid"])
 
         if self.inheritance == "smart1":
             self.append_args(args, ["--smart1Inheritance"])