Merge pull request #207 from statisticsnorway/fix/table-user-name

fix table user name

Author: tilen1976

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

@@ -1,2 +1,11 @@
 # 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
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=user
+spring.datasource.driverClassName=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
+
+spring.flyway.enabled=true
+spring.flyway.locations=classpath:db/migration/postgresql
+
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.jpa.show-sql=true

klass-api/src/main/resources/application-postgres-local.properties

@@ -8,8 +8,6 @@ spring.datasource.driverclassName=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=none
 spring.flyway.enabled=false
 
-#spring.flyway.locations=classpath:db/migration/{vendor}
-
 spring.datasource.hikari.connection-test-query=SELECT 1
 spring.datasource.hikari.validation-timeout=3000
 

klass-shared/pom.xml

@@ -106,10 +106,6 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-mysql</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>

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

@@ -13,7 +13,7 @@
 
 @Entity
 @Table(
-        name = "user",
+        name = "\"user\"",
         indexes = {
         @Index(columnList = "username", name = "user_username_idx", unique = true),
         @Index(columnList = "fullname", name = "user_fullname_idx")

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

@@ -1,2 +1,11 @@
 # 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
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=user
+spring.datasource.driverClassName=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
+
+spring.flyway.enabled=true
+spring.flyway.locations=classpath:db/migration/postgresql
+
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.jpa.show-sql=true