Fix issues with H2 and reserved keywords

klass-api/src/main/resources/application-h2-inmemory.properties

@@ -1,2 +1,2 @@
 # custom properties used when "h2-inmemory" Profile is used
-spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;MODE=MySQL
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;MODE=MySQL;NON_KEYWORDS=user

klass-shared/src/main/java/no/ssb/klass/core/model/BaseEntity.java

@@ -5,6 +5,7 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.PreUpdate;
@@ -15,7 +16,7 @@
 @MappedSuperclass
 public abstract class BaseEntity {
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     @Column(nullable = false)
     private final String uuid;
@@ -71,7 +72,8 @@ public boolean equals(Object other) {
     }
 
     /**
-     * Any initialisation needed after Hibernate has recreated instance. Typically initialise any transient fields.
+     * Any initialisation needed after Hibernate has recreated instance. Typically
+     * initialise any transient fields.
      */
     public void init() {
     }

klass-shared/src/main/java/no/ssb/klass/core/model/SearchWords.java

@@ -5,26 +5,27 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 @Entity
 public class SearchWords {
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    
+
     @Column(nullable = false)
     Date timeStamp;
-    
+
     @Column(nullable = false)
     boolean hit;
-    
+
     @Column(nullable = false)
     String searchString;
-    
+
     public SearchWords() {
     }
-    
+
     public SearchWords(String searchString, boolean hit) {
         this.timeStamp = new Date();
         this.searchString = searchString;

klass-shared/src/main/resources/application-h2-inmemory.properties

@@ -0,0 +1,2 @@
+# custom properties used when "h2-inmemory" Profile is used
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;MODE=MySQL;NON_KEYWORDS=user

klass-shared/src/main/resources/db/migration/V17__adding_phonenumber_and_email_to_users.sql

@@ -1,2 +1,2 @@
-ALTER TABLE "user" ADD email VARCHAR(255) NULL;
-ALTER TABLE "user" ADD phone VARCHAR(255) NULL;
+ALTER TABLE "USER" ADD email VARCHAR(255) NULL;
+ALTER TABLE "USER" ADD phone VARCHAR(255) NULL;

klass-shared/src/main/resources/db/migration/V1__init.sql

@@ -166,7 +166,7 @@ CREATE TABLE subscription
      PRIMARY KEY (id)
   );
 
-CREATE TABLE "user"
+CREATE TABLE "USER"
   (
      id            BIGINT NOT NULL auto_increment,
      deleted       BIT NOT NULL,
@@ -205,10 +205,10 @@ CREATE INDEX ct_target_idx ON correspondence_table (target_id);
 ALTER TABLE subscriber
   ADD CONSTRAINT subscriber_email_idx UNIQUE (email);
 
-ALTER TABLE "user"
+ALTER TABLE "USER"
   ADD CONSTRAINT user_username_idx UNIQUE (username);
 
-CREATE INDEX user_fullname_idx ON "user" (fullname);
+CREATE INDEX user_fullname_idx ON "USER" (fullname);
 
 ALTER TABLE user_favorites
   ADD CONSTRAINT uk_dk8ngwbk9dgeuegrx1nuktdv1 UNIQUE (favorites_id);
@@ -231,7 +231,7 @@ ALTER TABLE classification_series
 
 ALTER TABLE classification_series
   ADD CONSTRAINT fk_jefvdo01kn4kq98m64ajli6y5 FOREIGN KEY (contact_person_id)
-  REFERENCES "user" (id);
+  REFERENCES "USER" (id);
 
 ALTER TABLE classification_series_statistical_units
   ADD CONSTRAINT fk_rfx4t7rjg3hykfr39xi8dvrdu FOREIGN KEY (statistical_units_id)
@@ -283,7 +283,7 @@ ALTER TABLE statistical_classification
 
 ALTER TABLE statistical_classification
   ADD CONSTRAINT fk_12hsnu91tsf1c8b4697tv1bts FOREIGN KEY (contact_person_id)
-  REFERENCES "user" (id);
+  REFERENCES "USER" (id);
 
 ALTER TABLE statistical_classification
   ADD CONSTRAINT fk_ie31cb245vkf1vhswws053s29 FOREIGN KEY (classification_id)
@@ -311,4 +311,4 @@ ALTER TABLE user_favorites
 
 ALTER TABLE user_favorites
   ADD CONSTRAINT fk_dx271ymxhckcafibaqijpda8h FOREIGN KEY (user_id) REFERENCES
-  "user" (id);
+  "USER" (id);

klass-shared/src/main/resources/db/migration/V25__remove_favorite_constraint.sql

@@ -9,7 +9,7 @@ CREATE TABLE user_favorites
   PRIMARY KEY (id)
 );
 ALTER TABLE user_favorites ADD CONSTRAINT fk_favorite_id FOREIGN KEY (favorites_id) REFERENCES classification_series (id);
-ALTER TABLE user_favorites ADD CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES "user" (id);
+ALTER TABLE user_favorites ADD CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES "USER" (id);
 INSERT INTO user_favorites (user_id, favorites_id) SELECT
                                                      user_id,
                                                      favorites_id

klass-shared/src/main/resources/db/migration/V4__drop_deleted_columns.sql

@@ -1,10 +1,10 @@
 -- Only classes(tables) implementing SoftDeletable shall have deleted column
- 
+
 ALTER TABLE classification_family DROP COLUMN deleted;
 ALTER TABLE classification_item DROP COLUMN deleted;
 ALTER TABLE correspondence_map DROP COLUMN deleted;
 ALTER TABLE level DROP COLUMN deleted;
 ALTER TABLE statistical_unit DROP COLUMN deleted;
 ALTER TABLE subscriber DROP COLUMN deleted;
 ALTER TABLE subscription DROP COLUMN deleted;
-ALTER TABLE "user" DROP COLUMN deleted;
+ALTER TABLE "USER" DROP COLUMN deleted;