to compile or not compile, that is the question... the container service runs

fda-analyse-service/fda-mdb/create_mdb.py

@@ -65,6 +65,13 @@ cursor.execute(f"""	CREATE TYPE gender AS ENUM ('F', 'M', 'T');
 		NO MAXVALUE
 		CACHE 1;
 
+	CREATE SEQUENCE public.mdb_user_seq
+		START WITH 1
+		INCREMENT BY 1
+		NO MINVALUE
+		NO MAXVALUE
+		CACHE 1;
+	
 	CREATE TABLE IF NOT EXISTS mdb_CONTAINER ( 
 		ID bigint PRIMARY KEY DEFAULT nextval('mdb_container_seq'),
 		CONTAINER_CREATED timestamp without time zone NOT NULL,
@@ -86,7 +93,7 @@ cursor.execute(f"""	CREATE TYPE gender AS ENUM ('F', 'M', 'T');
 		CACHE 1;
 
 	CREATE TABLE IF NOT EXISTS mdb_DATA ( 
-		ID INTEGER PRIMARY KEY DEFAULT nextval('mdb_data_seq'), 
+		ID bigint PRIMARY KEY DEFAULT nextval('mdb_data_seq'),
 		PROVENANCE TEXT, 
 		FileEncoding TEXT, 
 		FileType VARCHAR(100),
@@ -95,15 +102,17 @@ cursor.execute(f"""	CREATE TYPE gender AS ENUM ('F', 'M', 'T');
 	);  
 
 	CREATE TABLE IF NOT EXISTS mdb_USERS ( 
-		UserID INTEGER PRIMARY KEY,
-		TISS_ID INTEGER,
-		OID INTEGER,
+		UserID bigint PRIMARY KEY DEFAULT nextval('mdb_user_seq'),
+		TISS_ID bigint,
+		OID bigint,
 		First_name VARCHAR(50),
 		Last_name VARCHAR(50),
 		Gender gender,
 		Preceding_titles VARCHAR(50),
 		Postpositioned_title VARCHAR(50),
-		Main_Email TEXT
+		Main_Email TEXT,
+		created timestamp without time zone NOT NULL,
+		last_modified timestamp without time zone
 	); 
 	
 	CREATE SEQUENCE public.mdb_databases_seq

fda-analyse-service/fda-mdb/initi.sh

@@ -56,6 +56,13 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
 		NO MAXVALUE
 		CACHE 1;
 
+	CREATE SEQUENCE public.mdb_user_seq
+		START WITH 1
+		INCREMENT BY 1
+		NO MINVALUE
+		NO MAXVALUE
+		CACHE 1;
+	
 	CREATE TABLE IF NOT EXISTS mdb_CONTAINER ( 
 		ID bigint PRIMARY KEY DEFAULT nextval('mdb_container_seq'),
 		CONTAINER_CREATED timestamp without time zone NOT NULL,
@@ -77,7 +84,7 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
 		CACHE 1;
 
 	CREATE TABLE IF NOT EXISTS mdb_DATA ( 
-		ID INTEGER PRIMARY KEY DEFAULT nextval('mdb_data_seq'), 
+		ID bigint PRIMARY KEY DEFAULT nextval('mdb_data_seq'),
 		PROVENANCE TEXT, 
 		FileEncoding TEXT, 
 		FileType VARCHAR(100),
@@ -86,15 +93,17 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
 	);  
 
 	CREATE TABLE IF NOT EXISTS mdb_USERS ( 
-		UserID INTEGER PRIMARY KEY,
-		TISS_ID INTEGER,
-		OID INTEGER,
+		UserID bigint PRIMARY KEY DEFAULT nextval('mdb_user_seq'),
+		TISS_ID bigint,
+		OID bigint,
 		First_name VARCHAR(50),
 		Last_name VARCHAR(50),
 		Gender gender,
 		Preceding_titles VARCHAR(50),
 		Postpositioned_title VARCHAR(50),
-		Main_Email TEXT
+		Main_Email TEXT,
+		created timestamp without time zone NOT NULL,
+		last_modified timestamp without time zone
 	); 
 	
 	CREATE SEQUENCE public.mdb_databases_seq

fda-container-service/rest-service/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
     show-sql: true
     database-platform: org.hibernate.dialect.PostgreSQLDialect
     hibernate:
-      ddl-auto: update
+      ddl-auto: validate
     open-in-view: false
   application:
     name: fda-container-service

fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java

@@ -28,7 +28,7 @@ public class Container {
     @GenericGenerator(
             name = "sequence-per-entity",
             strategy = "enhanced-sequence",
-            parameters = @org.hibernate.annotations.Parameter(name = "prefer_sequence_per_entity", value = "true")
+            parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_container_seq")
     )
     private Long id;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java

@@ -28,7 +28,7 @@ public class ContainerImage {
     @GenericGenerator(
             name = "sequence-per-entity",
             strategy = "enhanced-sequence",
-            parameters = @org.hibernate.annotations.Parameter(name = "prefer_sequence_per_entity", value = "true")
+            parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_image_seq")
     )
     public Long id;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java

@@ -27,7 +27,7 @@ public class ContainerImageEnvironmentItem {
     @GenericGenerator(
             name = "sequence-per-entity",
             strategy = "enhanced-sequence",
-            parameters = @org.hibernate.annotations.Parameter(name = "prefer_sequence_per_entity", value = "true")
+            parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_environment_item_seq")
     )
     public Long id;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java

@@ -36,7 +36,7 @@ public class Database {
     @GenericGenerator(
             name = "sequence-per-entity",
             strategy = "enhanced-sequence",
-            parameters = @org.hibernate.annotations.Parameter(name = "prefer_sequence_per_entity", value = "true")
+            parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_databases_seq")
     )
     private Long id;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/Query.java

@@ -28,7 +28,7 @@ public class Query  {
 	@GenericGenerator(
 			name = "sequence-per-entity",
 			strategy = "enhanced-sequence",
-			parameters = @org.hibernate.annotations.Parameter(name = "prefer_sequence_per_entity", value = "true")
+			parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_queries_seq")
 	)
 	private Long id;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java

@@ -31,7 +31,7 @@ public class Table {
     @GenericGenerator(
             name = "sequence-per-entity",
             strategy = "enhanced-sequence",
-            parameters = @org.hibernate.annotations.Parameter(name = "prefer_sequence_per_entity", value = "true")
+            parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_tables_seq")
     )
     private Long id;
 
@@ -50,10 +50,15 @@ public class Table {
 
     @ToString.Include
     @ManyToOne
+    @JoinColumn(name = "tdbid", insertable = false, updatable = false)
     private Database database;
 
     @ToString.Include
     @OneToMany
+    @JoinColumns({
+            @JoinColumn(name = "id", insertable = false, updatable = false),
+            @JoinColumn(name = "tid", insertable = false, updatable = false),
+    })
     private List<TableColumn> columns;
 
     @Column(nullable = false, updatable = false)

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/View.java

@@ -12,7 +12,7 @@ import java.time.Instant;
 import java.util.List;
 
 @Data
-@Entity
+//@Entity
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
@@ -29,7 +29,7 @@ public class View {
     @GenericGenerator(
             name = "sequence-per-entity",
             strategy = "enhanced-sequence",
-            parameters = @org.hibernate.annotations.Parameter(name = "prefer_sequence_per_entity", value = "true")
+            parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_view_seq")
     )
     private Long id;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java

@@ -30,7 +30,7 @@ public class TableColumn {
     @GenericGenerator(
             name = "sequence-per-entity",
             strategy = "enhanced-sequence",
-            parameters = @org.hibernate.annotations.Parameter(name = "prefer_sequence_per_entity", value = "true")
+            parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_columns_seq")
     )
     private Long id;
 
@@ -48,7 +48,7 @@ public class TableColumn {
     @ManyToOne
     @JoinColumns({
             @JoinColumn(name = "id", insertable = false, updatable = false),
-            @JoinColumn(name = "tdbid", insertable = false, updatable = false)
+            @JoinColumn(name = "cdbid", insertable = false, updatable = false)
     })
     private Table table;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java

@@ -7,6 +7,7 @@ import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.time.Instant;
 
@@ -24,12 +25,12 @@ public class User {
 	@Id
 	@EqualsAndHashCode.Include
 	@ToString.Include
-	@Column(name = "userid")
+	@Column(name = "userid", columnDefinition = "numeric(19, 2)")
 	@GeneratedValue(generator = "sequence-per-entity")
 	@GenericGenerator(
 			name = "sequence-per-entity",
 			strategy = "enhanced-sequence",
-			parameters = @org.hibernate.annotations.Parameter(name = "prefer_sequence_per_entity", value = "true")
+			parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_user_seq")
 	)
 	private Long id;
 
@@ -63,9 +64,7 @@ public class User {
 	@Column(name = "main_email")
 	private String email;
 
-	@ToString.Include
-	@Column(nullable = false)
-	private Gender gender;
+
 
 	@Column(nullable = false, updatable = false)
 	@CreatedDate