Switch to use generate_random_uuid() instead of uuid_random_v4()

Markus Sutter · Markus Sutter · commit 1dfaa8acc0fc · 2026-03-06T15:52:35.000+01:00
So that users do not have to install an extra extension in PostgreSQL
13+ .
diff --git a/.travis.yml b/.travis.yml
@@ -48,7 +48,7 @@ before_script:
     - psql -c 'create database ili2db;' -U $PGUSER
     - psql -c 'select version();' -d ili2db -U $PGUSER
     - psql -c 'create extension if not exists postgis;' -d ili2db -U $PGUSER
-    - psql -c 'create extension if not exists "uuid-ossp";' -d ili2db -U $PGUSER
+    - psql -c 'create extension if not exists pgcrypto;' -d ili2db -U $PGUSER
     - psql -c 'select postgis_full_version();' -d ili2db -U $PGUSER
     - # dpkg-query -L python3-docutils
     - python3 --version
diff --git a/docs/ili2db.rst b/docs/ili2db.rst
@@ -158,9 +158,9 @@ 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 
-OID verwendet, wird die Funktion uuid_generate_v4() verwendet. 
-Dazu muss die PostgreSQL-Erweiterung uuid-ossp konfiguriert sein
-(``CREATE EXTENSION "uuid-ossp";``). Mit der Option ``--setupPgExt``
+OID verwendet, wird die Funktion gen_random_uuid() verwendet.
+Dazu muss für PostgreSQL VOR Version 13 die PostgreSQL-Erweiterung pgcrypto konfiguriert sein
+(``CREATE EXTENSION "pgcrypto";``). Mit der Option ``--setupPgExt``
 erstellt ili2pg die fehlenden notwendigen Erweiterungen.
 
 **FileGDB:** Es muss `Visual Studio 2015 C and C++ Runtimes <https://www.microsoft.com/en-us/download/details.aspx?id=48145>`_ 
@@ -740,7 +740,7 @@ Optionen:
 |                               |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 |                               | **FileGDB:** Name der ESRI File Geodatabase-Datei.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 +-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| --setupPgExt                  | **PostGIS:** erstellt postgreql Erweiterungen 'uuid-ossp' und 'postgis' (falls noch nicht vorhanden)                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| --setupPgExt                  | **PostGIS:** erstellt postgreql Erweiterungen 'pgcrypto' und 'postgis' (falls noch nicht vorhanden)                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 +-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | --disableRounding             | Beim Import und Export werden die Daten per Default gerundet gem. Angaben im Modell. Mit dieser Option findet keine Rundung statt.                                                                                                                                                                                                                                                                                                                                                                                                         |
 +-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/docs/ili2db_es.rst b/docs/ili2db_es.rst
@@ -99,9 +99,9 @@ El programa requiere Java 1.8.
 
 **PostGIS:** Se requiere por lo menos PostgreSQL 8.3 con PostGIS 1.5. En
 el caso de usar el modelo de datos Interlis INTERLIS.UUIDOID como OID,
-la función uuid\_generate\_v4() será empleada. Para ello es necesario de
-configurar la extensión de PostgreSQL uuid-ossp (CREATE EXTENSION
-"uuid-ossp";).
+la función gen\_random\_uuid() será empleada. PostgreSQL < 13: Para ello es necesario de
+configurar la extensión de PostgreSQL pgcrypto (CREATE EXTENSION
+"pgcrypto";).
 
 **FileGDB:** `*Visual Studio 2015 C y C++
 Runtimes* <https://www.microsoft.com/en-us/download/details.aspx?id=48145>`__
@@ -453,7 +453,7 @@ Opciones:
 |                               |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 |                               | **FileGDB:** Nombre de archivo de la FileGeodatabase de ESRI.                                                                                                                                                                                                                                                                                                                                                                                                                          |
 +-------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| --setupPgExt                  | **PostGIS:** crea la extensión PostgreSQL 'uuid-ossp' y 'postgis' (si aún no creadas).                                                                                                                                                                                                                                                                                                                                                                                                 |
+| --setupPgExt                  | **PostGIS:** crea la extensión PostgreSQL 'pgcrypto' y 'postgis' (si aún no creadas).                                                                                                                                                                                                                                                                                                                                                                                                 |
 +-------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | --deleteData                  | Durante un import de datos (--import), se eliminan todos los datos de las tablas existentes/usadas (con DELETE, la estructura de la tabla permanece).                                                                                                                                                                                                                                                                                                                                  |
 +-------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/ili2pg/src/ch/ehi/ili2pg/PgCustomStrategy.java b/ili2pg/src/ch/ehi/ili2pg/PgCustomStrategy.java
@@ -41,7 +41,7 @@ public void fixupEmbeddedLink(DbTable dbTable, DbColumn dbColId,
 	}
 
 	private final static String[] pgExtensions = new String[]{
-			"postgis", "\"uuid-ossp\""
+			"postgis", "\"pgcrypto\""
 	};
 
 	@Override
diff --git a/ili2pg/src/ch/ehi/ili2pg/PgMain.java b/ili2pg/src/ch/ehi/ili2pg/PgMain.java
@@ -38,7 +38,7 @@ public void initConfig(Config config) {
 		config.setJdbcDriver("org.postgresql.Driver");
 		config.setIdGenerator(ch.ehi.ili2pg.PgSequenceBasedIdGen.class.getName());
 		config.setIli2dbCustomStrategy(ch.ehi.ili2pg.PgCustomStrategy.class.getName());
-		config.setUuidDefaultValue("uuid_generate_v4()");
+		config.setUuidDefaultValue("gen_random_uuid()");
 	}
 	@Override
 	public DbUrlConverter getDbUrlConverter() {
@@ -107,7 +107,7 @@ protected void printConnectOptions() {
 	protected void printSpecificOptions() {
 		System.err.println("--dbschema  schema     The name of the schema in the database. Defaults to not set.");
 		System.err.println("--oneGeomPerTable      If more than one geometry per table, create secondary table.");
-		System.err.println("--setupPgExt           create extensions 'uuid-ossp' and 'postgis'.");
+		System.err.println("--setupPgExt           create extensions 'pgcrypto' and 'postgis'.");
 	}
 	@Override
 	protected int doArgs(String args[],int argi,Config config) throws ParseException
diff --git a/src/ch/ehi/ili2db/converter/AbstractRecordConverter.java b/src/ch/ehi/ili2db/converter/AbstractRecordConverter.java
@@ -181,7 +181,7 @@ public void addIliTidCol(DbTable dbTable,Domain oidDomain) {
 			if(isUuidOid(td,oidDomain)){
 				DbColUuid dbColIliTid= new DbColUuid();
 				dbColIliTid.setName(DbNames.T_ILI_TID_COL);
-				// CREATE EXTENSION "uuid-ossp";
+				// CREATE EXTENSION "pgcrypto";
 				dbColIliTid.setDefaultValue(uuid_default_value);
 				dbTable.addColumn(dbColIliTid);
 			}else{
diff --git a/test/data/Array/Array23InsertIntoTable.sql b/test/data/Array/Array23InsertIntoTable.sql
@@ -133,7 +133,7 @@ INSERT INTO array23.t_ili2db_settings VALUES ('ch.ehi.ili2db.BasketHandling', 'r
 INSERT INTO array23.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsAuthority', 'EPSG');
 INSERT INTO array23.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsCode', '21781');
 INSERT INTO array23.t_ili2db_settings VALUES ('ch.ehi.ili2db.maxSqlNameLength', '60');
-INSERT INTO array23.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'uuid_generate_v4()');
+INSERT INTO array23.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'gen_random_uuid()');
 INSERT INTO array23.t_ili2db_settings VALUES ('ch.ehi.ili2db.multiPointTrafo', 'coalesce');
 INSERT INTO array23.t_ili2db_table_prop VALUES ('binbox_', 'ch.ehi.ili2db.tableKind', 'STRUCTURE');
 INSERT INTO array23.t_ili2db_table_prop VALUES ('farbe', 'ch.ehi.ili2db.tableKind', 'STRUCTURE');
diff --git a/test/data/CatalogueObjects/CatalogueObjects1.ili.sql b/test/data/CatalogueObjects/CatalogueObjects1.ili.sql
@@ -27,7 +27,7 @@ COMMENT ON TABLE CatalogueObjects1.multilingualtext IS '@iliname Localisation_V1
 CREATE TABLE CatalogueObjects1.topica_katalog_programm (
   T_Id bigint PRIMARY KEY DEFAULT nextval('CatalogueObjects1.t_ili2db_seq')
   ,T_basket bigint NOT NULL
-  ,T_Ili_Tid uuid NULL DEFAULT uuid_generate_v4()
+  ,T_Ili_Tid uuid NULL DEFAULT gen_random_uuid()
   ,code varchar(20) NOT NULL
   ,programm text NULL
   ,programm_de text NULL
diff --git a/test/data/Dataset23NoSmart/InsertIntoTable.sql b/test/data/Dataset23NoSmart/InsertIntoTable.sql
@@ -66,7 +66,7 @@ END Dataset1.
 
 INSERT INTO dataset1nosmart.t_ili2db_settings VALUES ('ch.ehi.ili2db.maxSqlNameLength', '60');
 INSERT INTO dataset1nosmart.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsCode', '21781');
-INSERT INTO dataset1nosmart.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'uuid_generate_v4()');
+INSERT INTO dataset1nosmart.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'gen_random_uuid()');
 INSERT INTO dataset1nosmart.t_ili2db_settings VALUES ('ch.ehi.ili2db.sender', 'ili2pg-3.8.1-20170421');
 INSERT INTO dataset1nosmart.t_ili2db_settings VALUES ('ch.interlis.ili2c.ilidirs', '%ILI_FROM_DB;%XTF_DIR;http://models.interlis.ch/;%JAR_DIR');
 INSERT INTO dataset1nosmart.t_ili2db_settings VALUES ('ch.ehi.ili2db.BasketHandling', 'readWrite');
diff --git a/test/data/Dataset23Smart1/InsertIntoTable.sql b/test/data/Dataset23Smart1/InsertIntoTable.sql
@@ -64,7 +64,7 @@ END Dataset1.
 
 INSERT INTO dataset1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.maxSqlNameLength', '60');
 INSERT INTO dataset1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsCode', '21781');
-INSERT INTO dataset1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'uuid_generate_v4()');
+INSERT INTO dataset1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'gen_random_uuid()');
 INSERT INTO dataset1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.inheritanceTrafo', 'smart1');
 INSERT INTO dataset1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.sender', 'ili2pg-3.8.1-20170421');
 INSERT INTO dataset1smart1.t_ili2db_settings VALUES ('ch.interlis.ili2c.ilidirs', '%ILI_FROM_DB;%XTF_DIR;http://models.interlis.ch/;%JAR_DIR');
diff --git a/test/data/ExtendedModel/ExtendedModelInsertIntoTable.sql b/test/data/ExtendedModel/ExtendedModelInsertIntoTable.sql
@@ -141,7 +141,7 @@ INSERT INTO extendedmodel23.t_ili2db_settings VALUES ('ch.ehi.ili2db.BasketHandl
 INSERT INTO extendedmodel23.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsAuthority', 'EPSG');
 INSERT INTO extendedmodel23.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsCode', '21781');
 INSERT INTO extendedmodel23.t_ili2db_settings VALUES ('ch.ehi.ili2db.maxSqlNameLength', '60');
-INSERT INTO extendedmodel23.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'uuid_generate_v4()');
+INSERT INTO extendedmodel23.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'gen_random_uuid()');
 INSERT INTO extendedmodel23.t_ili2db_settings VALUES ('ch.ehi.ili2db.inheritanceTrafo', 'smart1');
 INSERT INTO extendedmodel23.t_ili2db_settings VALUES ('ch.ehi.ili2db.multiPointTrafo', 'coalesce');
 INSERT INTO extendedmodel23.t_ili2db_settings VALUES ('ch.ehi.ili2db.multiLineTrafo', 'coalesce');
diff --git a/test/data/MultiSurface/InsertIntoTableMultiSurface1a.sql b/test/data/MultiSurface/InsertIntoTableMultiSurface1a.sql
@@ -519,7 +519,7 @@ END Units.
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.multiSurfaceTrafo', 'coalesce');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.maxSqlNameLength', '60');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsCode', '21781');
-INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'uuid_generate_v4()');
+INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'gen_random_uuid()');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.sender', 'ili2pg-3.8.1-20170421');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.interlis.ili2c.ilidirs', '%ILI_FROM_DB;%XTF_DIR;http://models.interlis.ch/;%JAR_DIR');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.BasketHandling', 'readWrite');
diff --git a/test/data/MultiSurface/InsertIntoTableMultiSurface2a.sql b/test/data/MultiSurface/InsertIntoTableMultiSurface2a.sql
@@ -47,7 +47,7 @@ END MultiSurface2.
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.multiSurfaceTrafo', 'coalesce');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.maxSqlNameLength', '60');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsCode', '21781');
-INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'uuid_generate_v4()');
+INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'gen_random_uuid()');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.sender', 'ili2pg-3.8.1-20170421');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.interlis.ili2c.ilidirs', '%ILI_FROM_DB;%XTF_DIR;http://models.interlis.ch/;%JAR_DIR');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.BasketHandling', 'readWrite');
diff --git a/test/data/MultiSurface/InsertIntoTableSingleGeom.sql b/test/data/MultiSurface/InsertIntoTableSingleGeom.sql
@@ -521,7 +521,7 @@ END Units.
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.multiSurfaceTrafo', 'coalesce');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.maxSqlNameLength', '60');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsCode', '21781');
-INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'uuid_generate_v4()');
+INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'gen_random_uuid()');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.sender', 'ili2pg-3.8.1-20170421');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.interlis.ili2c.ilidirs', '%ILI_FROM_DB;%XTF_DIR;http://models.interlis.ch/;%JAR_DIR');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.geomAttrPerTable', 'oneGeomAttrPerTable');
diff --git a/test/data/MultiSurface/InsertIntoTableXtf1a.sql b/test/data/MultiSurface/InsertIntoTableXtf1a.sql
@@ -523,7 +523,7 @@ END Units.
 
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.maxSqlNameLength', '60');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsCode', '21781');
-INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'uuid_generate_v4()');
+INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'gen_random_uuid()');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.sender', 'ili2pg-3.8.1-20170421');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.interlis.ili2c.ilidirs', '%ILI_FROM_DB;%XTF_DIR;http://models.interlis.ch/;%JAR_DIR');
 INSERT INTO multisurface.t_ili2db_settings VALUES ('ch.ehi.ili2db.BasketHandling', 'readWrite');
diff --git a/test/data/Naming1smart1/InsertIntoTable.sql b/test/data/Naming1smart1/InsertIntoTable.sql
@@ -56,7 +56,7 @@ END Naming1.
 INSERT INTO naming1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.nameOptimization', 'topic');
 INSERT INTO naming1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.maxSqlNameLength', '60');
 INSERT INTO naming1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.defaultSrsCode', '21781');
-INSERT INTO naming1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'uuid_generate_v4()');
+INSERT INTO naming1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.uuidDefaultValue', 'gen_random_uuid()');
 INSERT INTO naming1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.inheritanceTrafo', 'smart1');
 INSERT INTO naming1smart1.t_ili2db_settings VALUES ('ch.ehi.ili2db.sender', 'ili2pg-3.8.1-20170421');
 INSERT INTO naming1smart1.t_ili2db_settings VALUES ('ch.interlis.ili2c.ilidirs', '%ILI_FROM_DB;%XTF_DIR;http://models.interlis.ch/;%JAR_DIR');
diff --git a/test/data/PreAndPostScript/CreateTableUpdate.sql b/test/data/PreAndPostScript/CreateTableUpdate.sql
diff --git a/test/data/PreAndPostScript/InsertIntoTable.sql b/test/data/PreAndPostScript/InsertIntoTable.sql
diff --git a/test/data/PreAndPostScript/InsertIntoTableDelete.sql b/test/data/PreAndPostScript/InsertIntoTableDelete.sql
diff --git a/test/data/PreAndPostScript/InsertIntoTableExport.sql b/test/data/PreAndPostScript/InsertIntoTableExport.sql
diff --git a/test/data/PreAndPostScript/InsertIntoTableReplace.sql b/test/data/PreAndPostScript/InsertIntoTableReplace.sql
diff --git a/test/data/PreAndPostScript/InsertIntoTableUpdate.sql b/test/data/PreAndPostScript/InsertIntoTableUpdate.sql

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public void fixupEmbeddedLink(DbTable dbTable, DbColumn dbColId,`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`private final static String[] pgExtensions = new String[]{`
`44`		`- "postgis", "\"uuid-ossp\""`
	`44`	`+ "postgis", "\"pgcrypto\""`
`45`	`45`	`};`
`46`	`46`
`47`	`47`	`@Override`