Upgrade ili tools to 5.0.1

.pre-commit-config.yaml

@@ -4,6 +4,7 @@ exclude: '^.*\.xtf|.*\.xml|.*\.ili|qgepqwat2ili/bin.*$'
 repos:
   # Fix end of files
   - repo: https://github.com/pre-commit/pre-commit-hooks
+
     rev: v5.0.0
     hooks:
       - id: trailing-whitespace

qgepqwat2ili/__init__.py

@@ -210,6 +210,7 @@ def main(args):
                 ILI_MODEL,
                 make_log_path(log_path, "ilicreate"),
                 recreate_schema=args.recreate_schema,
+                create_basket_col=True,
             )
             # add model dependency
             if args.export_sia405:
@@ -288,6 +289,7 @@ def main(args):
                     ILI_MODEL,
                     make_log_path(log_path, "ilicreate"),
                     recreate_schema=args.recreate_schema,
+                    create_basket_col=True,
                 )
                 utils.ili2db.import_xtf_data(
                     SCHEMA, args.path, make_log_path(log_path, "iliimport")
@@ -302,6 +304,7 @@ def main(args):
                     ABWASSER_SIA405_ILI_MODEL,
                     make_log_path(log_path, "ilicreate"),
                     recreate_schema=args.recreate_schema,
+                    create_basket_col=True,
                 )
                 utils.ili2db.import_xtf_data(
                     ABWASSER_SIA405_SCHEMA, args.path, make_log_path(log_path, "iliimport")
@@ -322,6 +325,7 @@ def main(args):
                     ABWASSER_DSS_ILI_MODEL,
                     make_log_path(log_path, "ilicreate"),
                     recreate_schema=args.recreate_schema,
+                    create_basket_col=True,
                 )
                 utils.ili2db.import_xtf_data(
                     ABWASSER_DSS_SCHEMA, args.path, make_log_path(log_path, "iliimport")
@@ -349,6 +353,7 @@ def main(args):
                 ILI_MODEL,
                 make_log_path(log_path, "ilicreate"),
                 recreate_schema=args.recreate_schema,
+                create_basket_col=False,
             )
             qwat_export(include_hydraulics=args.include_hydraulics)
             utils.ili2db.export_xtf_data(
@@ -388,6 +393,7 @@ def main(args):
                 ILI_MODEL,
                 make_log_path(log_path, "ilicreate"),
                 recreate_schema=args.recreate_schema,
+                create_basket_col=False,
             )
             utils.ili2db.import_xtf_data(SCHEMA, args.path, make_log_path(log_path, "iliimport"))
             qwat_import()
@@ -400,7 +406,10 @@ def main(args):
                 config.PGSERVICE = config.QGEP_DEFAULT_PGSERVICE
             # to do add model dependency
             utils.ili2db.create_ili_schema(
-                config.ABWASSER_SCHEMA, config.ABWASSER_ILI_MODEL, recreate_schema=True
+                config.ABWASSER_SCHEMA,
+                config.ABWASSER_ILI_MODEL,
+                recreate_schema=True,
+                create_basket_col=True,
             )
             QGEPMAPPING = get_qgep_mapping()
             utils.templates.generate_template(
@@ -411,7 +420,10 @@ def main(args):
             if config.PGSERVICE is None:
                 config.PGSERVICE = config.QWAT_DEFAULT_PGSERVICE
             utils.ili2db.create_ili_schema(
-                config.WASSER_SCHEMA, config.WASSER_ILI_MODEL, recreate_schema=True
+                config.WASSER_SCHEMA,
+                config.WASSER_ILI_MODEL,
+                recreate_schema=True,
+                create_basket_col=False,
             )
             QWATMAPPING = get_qwat_mapping()
             utils.templates.generate_template("qwat", "wasser", BaseQwat, BaseWasser, QWATMAPPING)

qgepqwat2ili/bin/ili2pg-4.6.1-bindist/docs/CHANGELOG.txt → qgepqwat2ili/bin/ili2pg-5.0.1/docs/CHANGELOG.txt

@@ -11,8 +11,103 @@ ideas/open issues/questions
 - einfache Liste mit den neu erzeugten Vertexpunkte (aufgrund der Overlap-Bereinigung)
 - Schalter für das "disablen" der Overlaps-Bereinigung. Bei vorhandenen gueltigen Overlaps erfolgen: a) Import mit NULL als Polygon, ohne Fehlermeldung, b) Import mit NULL als Polygon, mit Warning, c) kein Import, Fehlermeldung
 
-LATEST
+ili2db 5.0.1 (2023-09-25)
 ---------------------------
+- ili2c-5.3.3
+
+ili2db 5.0.0 (2023-09-09)
+---------------------------
+- ili2pg: fix support of SCRAM authentification in PostgreSQL (#448)
+- ili2gpkg: Update sqlite lib (Apple M1) (#421)
+- remove ToXtfRecordConverter.isMsAccess (#303)
+- remove option --structWithGenericRef (#497)
+- JRE 1.8
+- org.postgresql:postgresql:42.6.0
+- org.xerial:sqlite-jdbc:3.43.0.0
+
+ili2db 4.11.1 (2023-08-22)
+---------------------------
+- ili2gpkg: new option --gpkgMultiGeomPerTable to create multi geom col tables (#511)
+- Failed to query extended many-to-many associations (smart2) (#521)
+- ehisqlgen-1.16.0
+
+ili2db 4.11.0 (2023-04-24)
+---------------------------
+- fix references with mixed case INTERLIS.UUIDOID (#507)
+- fix issues with duplicate coordinates (#510)
+- fix validate fails if external connection is used (#514)
+- fix delete empty dataset (#513)
+- fix additionalModel in the --validConfig on validation not found (#509)
+- Provide metaConfig info in the database (#508)
+- ili2h2gis: fix bigint schema import
+- iox-ili-1.21.18
+
+ili2db 4.10.1 (2023-02-28)
+---------------------------
+- fix Bug --delete Flag im mehrsprachigen DMAV01 Modell (#504)
+- iox-ili-1.21.17
+
+ili2db 4.10.0 (2022-12-30)
+------------------------------
+- ili24: LIST/BAG mit primitiven Typen (nicht nur mit Strukturen) (#471) 
+- support --option NULL (#500)
+- implement --metaConfig (#392)
+- support ilidata:basketId as import file argument (#480)
+- create mandatory reference check with --coalesceCatalogueRef (#481)
+- iox-ili-1.21.15
+- ili2c-5.3.2
+
+ili2db 4.9.1 (2022-11-02)
+------------------------------
+- remove Swing reference from Main (#496) 
+- fix error when using --update function (#450)
+- iox-ili-1.21.13
+- ili2c-5.3.0
+
+ili2db 4.9.0 (2022-08-24)
+------------------------------
+- new option --verbose
+- new option --logtime
+- new meta info about ili attr type ch.ehi.ili2db.typeKind (#469)
+- fix bigint import (#464)
+- fix enum itfCode on ili-import (#478) 
+- support ALL OF enum-domain (#476)
+- new option --createMandatoryChecks to create DB constraint for Reference attributes (#475)
+- fix JRE 1.6 compatibility
+- iox-ili-1.21.12
+- ili2c-5.2.8
+- ehisqlgen-1.15.0
+
+ili2db 4.8.0 (2022-04-29)
+------------------------------
+- API: added Ili2db.getDatasets()
+- API: make AbstractMain.getDbUrlConverter() public
+- rename option --importBatchSize to set JDBC batchSize (#458)
+- rename option --exportFetchSize to set JDBC fetchSize (#458)
+- use batchSize to INSERT/UPDATE xtf/itf-data (#458) 
+- new option --disableBoundaryRecoding to fix imported geometry (#437)
+- save --nameLanguage to t_ili2db_settings
+- use translated enum model element name for dispName in enum tables (#460)
+- export: fix ALL OF missing translations of values German to French (#439) 
+- iox-ili-1.21.10
+- ili2c-5.2.6
+
+ili2db 4.7.0 (2021-12-28)
+------------------------------
+- create metainfo about possible classes in a topic (#216)
+- create metainfo about BID domain (#440)
+- set length of description field in ENUM tables to 'unlimited' (#429)
+- import polygons from XTF as boundary lines (#269)
+- check that --createBasketCol is used (if required) (#130)
+- add used TransferDescription to Settings as ch.ehi.ili2db.model
+- API: add getCustomMappingStrategy() 
+- ili24: implement MULTISURFACE/MULTIAREA (#410)
+- ili24: implement MULTIPOLYLINE (#409)
+- ili2gpkg: create spatial index (#391) 
+- mysql:mysql-connector-java:5.1.49
+- iox-ili-1.21.9
+- ehisqlgen-1.14.1
+- ili2c-5.2.5
 
 ili2db 4.6.1 (2021-11-10)
 ------------------------------

qgepqwat2ili/bin/ili2pg-4.6.1-bindist/docs/README.txt → qgepqwat2ili/bin/ili2pg-5.0.1/docs/README.txt

@@ -12,7 +12,7 @@ Status
 ili2ora is in beta/transition state.
 
 System Requirements
-For the current version of ili2ora, you will need a JRE (Java Runtime Environment) installed on your system, version 1.6 or later.
+For the current version of ili2ora, you will need a JRE (Java Runtime Environment) installed on your system, version 1.8 or later.
 The JRE (Java Runtime Environment) can be downloaded for free from the Website http://www.java.com/ .
 ili2ora was tested with Oracle 9.