Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
@claeis
claeis committed Sep 9, 2023
2 parents c54271e + 44b947f commit 20f2bb6
Show file tree
Hide file tree
Showing 18 changed files with 180 additions and 369 deletions.
2 changes: 1 addition & 1 deletion README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ili2db is in stable state.

System Requirements
===================
For the current version of ili2db, you will need a JRE (Java Runtime Environment) installed on your system, version 1.6 or later.
For the current version of ili2db, 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/>.

Download ili2db
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group 'ch.interlis'
version '4.11.1'+System.getProperty('release','-SNAPSHOT')
version '5.0.0'+System.getProperty('release','-SNAPSHOT')

apply plugin: "java"
apply plugin: "maven"
Expand All @@ -8,8 +8,8 @@ apply plugin: "maven"
if(!JavaVersion.current().isJava8()){
compileJava.options.compilerArgs.addAll(['--release', '6'])
}else{
sourceCompatibility = JavaVersion.VERSION_1_6
targetCompatibility = JavaVersion.VERSION_1_6
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
compileJava.options.encoding = 'US-ASCII'

Expand Down Expand Up @@ -335,12 +335,12 @@ dependencies {
testImplementation 'org.xmlunit:xmlunit-matchers:2.8.2'
testImplementation 'org.xmlunit:xmlunit-placeholders:2.8.2'

ili2pgImplementation group: 'org.postgresql', name: 'postgresql', version: '42.2.18.jre6'
compileOnly group: 'org.postgresql', name: 'postgresql', version: '42.2.18.jre6' // add as compileOnly, so that eclipse sees it
ili2pgImplementation group: 'org.postgresql', name: 'postgresql', version: '42.6.0'
compileOnly group: 'org.postgresql', name: 'postgresql', version: '42.6.0' // add as compileOnly, so that eclipse sees it
ili2pgImplementation group: 'com.github.waffle', name: 'waffle-jna', version: '1.9.1'
compileOnly group: 'com.github.waffle', name: 'waffle-jna', version: '1.9.1' // add as compileOnly, so that eclipse sees it
ili2gpkgImplementation group: 'org.xerial', name: 'sqlite-jdbc', version: '3.8.11.2'
compileOnly group: 'org.xerial', name: 'sqlite-jdbc', version: '3.8.11.2' // add as compileOnly, so that eclipse sees it
ili2gpkgImplementation group: 'org.xerial', name: 'sqlite-jdbc', version: '3.43.0.0'
compileOnly group: 'org.xerial', name: 'sqlite-jdbc', version: '3.43.0.0' // add as compileOnly, so that eclipse sees it
ili2mysqlImplementation group: 'mysql', name: 'mysql-connector-java', version: '5.1.49'
compileOnly group: 'mysql', name: 'mysql-connector-java', version: '5.1.49' // add as compileOnly, so that eclipse sees it
ili2h2gisImplementation group: 'org.orbisgis', name:'h2gis',version: '1.5.0'
Expand Down
10 changes: 10 additions & 0 deletions docs/CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ 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

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)
Expand Down
2 changes: 1 addition & 1 deletion docs/README.src.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Status
ili2ora is in beta/transition state.

System Configuration
In order to compile ili2ora, a JAVA software development kit (JDK) version 1.6 or a more recent version must be installed on your system.
In order to compile ili2ora, a JAVA software development kit (JDK) version 1.8 or a more recent version must be installed on your system.
A free version of the JAVA software development kit (JDK) is available at the website http://java.sun.com/j2se/.
Also required is the build tool ant. Download it from http://ant.apache.org and install it as documented there.

Expand Down
2 changes: 1 addition & 1 deletion docs/README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
46 changes: 1 addition & 45 deletions docs/ili2db.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ Um solche Daten zu importieren (um sie danach zu flicken)::
Laufzeitanforderungen
---------------------

Das Programm setzt Java 1.6 voraus.
Das Programm setzt Java 1.8 voraus.

**PostGIS:** Als Datenbank muss mindestens PostgreSQL 8.3 und PostGIS
1.5 vorhanden sein. Falls das Interlis Datenmodell INTERLIS.UUIDOID als
Expand Down Expand Up @@ -804,8 +804,6 @@ Optionen:
+-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| --createTypeDiscriminator | Erstellt für jede Tabelle (auch wenn das Modell keine Vererbung benutzt) eine Spalte für den Typdiskriminator. Für Klassen mit Vererbung wird die Spalte immer erstellt. (siehe Kapitel Abbildungsregeln/Tabellen) |
+-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| --structWithGenericRef | Erstellt generische Spalten für den Fremdschlüssel bei Tabellen die Interlis-Strukturen abbilden. Ohne diese Option wird pro Strukturattribut eine Spalte erstellt (in der Tabelle, die die Struktur abbildet). (siehe Kapitel Abbildungsregeln/Strukturen) |
+-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| --disableNameOptimization | Schaltet die Nutzung von unqualifizierten Klassennamen aus. Für alle Tabellennamen werden qualifizierte Interlis-Klassennamen (Model.Topic.Class) verwendet (und in einen gültigen Tabellennamen abgebildet). (siehe Kapitel Abbildungsregeln/Namenskonventionen) |
+-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| --nameByTopic | Für alle Tabellennamen werden teilweise qualifizierte Interlis-Klassennamen (Topic.Class) verwendet (und in einen gültigen Tabellennamen abgebildet). (siehe Kapitel Abbildungsregeln/Namenskonventionen) |
Expand Down Expand Up @@ -1293,26 +1291,6 @@ der Tabelle der Struktur abgebildet. Bei gewissen Strukturen wird bei Smart-Mapp
| | | | |
| | | | |
+--------------+-------------------------+--------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2 | :: | :: | Mit der Option --structWithGenericRef werden statt für jedes Strukturattribut eine Spalte nur drei Standardspalten T\_ParentId, T\_ParentType, T\_ParentAttr angelegt. Diese drei Spalten bilden zusammen einen generischen Fremdschlüssel. |
| | | | |
| | STRUCTURE C = | CREATE TABLE C ( | T\_ParentId ist die t\_id des Objektes, das das Strukturelement enthält. |
| | END C; | T_Id integer PRIMARY KEY, | |
| | | T_seq integer NOT NULL, | T\_ParentType ist die konkrete Klasse (der SQL-Name des qualifizierten INTERLIS-Klassennamens [4]_) des Objektes, das das Strukturelement enthält. |
| | | T_ParentId integer NOT NULL | |
| | | T_ParentType varchar(60) NOT NULL | T\_ParentAttr ist der Strukturattributname (der SQL-Name des unqualifizierten INTERLIS-Attributnamens) in der Klasse des Objektes, das das Strukturelement enthält. |
| | | T_ParentAttr varchar(60) NOT NULL | |
| | | ); | |
| | | | |
| | CLASS D = | CREATE TABLE D ( | |
| | attr1 : LIST OF C; | T_Id integer PRIMARY KEY | |
| | END D; | ); | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
+--------------+-------------------------+--------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+

Beispiel XML::
Expand Down Expand Up @@ -1351,27 +1329,6 @@ Beispiel für Abbildungsvariante 1:
| 6 | 2 |
+-------------+---------------+

Beispiel für Abbildungsvariante 2:

+-------------+----------+---------------+-----------------+-----------------+
| Tabelle C | | | | |
+=============+==========+===============+=================+=================+
| t\_id | t\_seq | t\_parentid | t\_parenttype | t\_parentattr |
+-------------+----------+---------------+-----------------+-----------------+
| 7 | 0 | 6 | D | attr1 |
+-------------+----------+---------------+-----------------+-----------------+
| 8 | 1 | 6 | D | attr1 |
+-------------+----------+---------------+-----------------+-----------------+
| 9 | 0 | 6 | D | attr2 |
+-------------+----------+---------------+-----------------+-----------------+

+-------------+---------------+
| Tabelle D | |
+=============+===============+
| t\_id | T\_Ili\_Tid |
+-------------+---------------+
| 6 | 2 |
+-------------+---------------+

Bei den folgenden Strukturen wird bei Smart-Mapping für die Strukturattribute eine alternative Abbildung verwendet:

Expand Down Expand Up @@ -1647,7 +1604,6 @@ Im Aufruf evtl. vorhandene Kommandozeilenargumente übersteuern die Angaben in d
| | | disableNameOptimization |
| | | nameByTopic |
| | | maxNameLength |
| | | structWithGenericRef |
| | | sqlColsAsText |
| | | sqlEnableNull |
| | | sqlExtRefCols |
Expand Down
Loading

0 comments on commit 20f2bb6

Please sign in to comment.