Browse Source

Added explicit column names for census and census entry

Andrew Grant 7 months ago
parent
commit
c94e687028

+ 5 - 1
src/main/java/scot/carricksoftware/grants/domains/census/Census.java

@@ -18,20 +18,24 @@ import java.util.List;
 public class Census extends BaseEntity {
 
     @Enumerated(EnumType.STRING)
+    @Column(name = "`census_date`")
     private CensusDate censusDate;
 
     @OneToMany(mappedBy = "census", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<CensusEntry> censusEntries = new ArrayList<>();
 
     @ManyToOne
-    @JoinColumn(name = "place_id")
+    @JoinColumn(name = "`place_id`")
     private Place place;
 
     @Enumerated(EnumType.STRING)
+    @Column(name = "`boundary_type`")
     private CensusBoundaryType boundaryType;
 
+    @Column(name = "`inhabited_rooms`")
     private String inhabitedRooms;
 
+    @Column(name = "`rooms_with_windows`")
     private String roomsWithWindows;
 
     public CensusDate getCensusDate() {

+ 23 - 2
src/main/java/scot/carricksoftware/grants/domains/census/CensusEntry.java

@@ -17,37 +17,58 @@ public class CensusEntry extends BaseEntity {
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
-    @JoinColumn(name = "census_id")
+    @JoinColumn(name = "`census_id`")
     private Census census;
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
-    @JoinColumn(name = "person_id")
+    @JoinColumn(name = "`person_id`")
     private Person person;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
+    @Column(name = "`relationship`")
     private CensusEntryRelationship relationship;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
+    @Column(name = "`gaelic`")
     private CensusEntryGaelic gaelic;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
+    @Column(name = "`condition`")
     private CensusEntryCondition condition;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
+    @Column(name = "`worker`")
     private CensusEntryWorker worker;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
+    @Column(name = "`sex`")
     private CensusEntrySex sex;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`age`")
     private String age;
 
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`where_born`")
     private String whereBorn;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`birth_day`")
     private String birthDay;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`birth_year`")
     private String birthYear;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`personal_occupation`")
     private String personalOccupation;
 
     public Person getPerson() {

+ 1 - 1
src/main/resources/application-uat.properties

@@ -1,6 +1,6 @@
 # Set up for uat
 spring.datasource.url=jdbc:mariadb://git.carricksoftware.co.uk:3306/grants_uat
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect
 
 spring.jpa.hibernate.ddl-auto=none
 spring.liquibase.change-log=classpath:db/changelog/db.changelog-master.yaml

+ 2 - 2
src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=grants
 server.port=8086
 server.servlet.context-path=/grants
 spring.mvc.format.date=dd-MM-yyyy
-spring.profiles.active=dev
-logging.level.scot.carricksoftware=debug
+spring.profiles.active=uat
+logging.level.scot.carricksoftware=trace