Fixed a few more migration issues [#593]

* Added auto-incremented to the renamed primary key columns. * Fixed a few formulas on Java classes that needed the new colum names.
comixed · Apr 10, 2021 · 5b2042f · 5b2042f
1 parent df55a5a
commit 5b2042f
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 3 deletions.
diff --git a/comixed-model/src/main/java/org/comixedproject/model/comic/Comic.java b/comixed-model/src/main/java/org/comixedproject/model/comic/Comic.java
@@ -163,12 +163,12 @@ public class Comic {
   @Setter
   private ComicFormat format;
 
-  @Formula(value = "(SELECT COUNT(*) FROM pages p WHERE p.ComicId = id)")
+  @Formula(value = "(SELECT COUNT(*) FROM Pages p WHERE p.ComicId = id)")
   @JsonIgnore
   @Transient
   private Integer calculatedPageCount;
 
-  @Formula(value = "(SELECT COUNT(*) FROM pages p where p.ComicId = id AND p.deleted = true)")
+  @Formula(value = "(SELECT COUNT(*) FROM Pages p where p.ComicId = id AND p.Deleted = true)")
   @JsonIgnore
   @Getter
   private Integer calculatedDeletedPageCount;
@@ -295,7 +295,7 @@ public class Comic {
   private String comicVineURL;
 
   @Formula(
-      "(SELECT COUNT(*) FROM comics c WHERE c.Series = series AND c.Volume = volume AND c.IssueNumber = IssueNumber AND c.CoverDate = CoverDate)")
+      "(SELECT COUNT(*) FROM Comics c WHERE c.Series = series AND c.Volume = volume AND c.IssueNumber = IssueNumber AND c.CoverDate = CoverDate)")
   @JsonProperty("duplicateCount")
   @JsonView(View.ComicListView.class)
   private Integer duplicateCount;

diff --git a/comixed-model/src/main/resources/db/migrations/0.9.0/002_593_migrate_to_camel_case.xml b/comixed-model/src/main/resources/db/migrations/0.9.0/002_593_migrate_to_camel_case.xml
@@ -830,6 +830,71 @@
     <dropIndex tableName="WebAuditLogEntries"
                indexName="rest_audit_log_successful_idx"/>
 
+
+    <addAutoIncrement tableName="BlockedPageHashes"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Bookmarks"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Characters"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Comics"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="ComicFormats"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Credits"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Locations"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Pages"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="PageTypes"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="ReadingLists"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Roles"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="ScrapingCache"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="ScrapingCacheEntries"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="SmartReadingLists"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="SmartListMatchers"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Stories"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Tasks"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="TaskProperties"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Teams"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="Users"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+    <addAutoIncrement tableName="WebAuditLogEntries"
+                      columnName="Id"
+                      columnDataType="bigint"/>
+
     <!-- add foreign key constraints -->
 
     <addForeignKeyConstraint baseTableName="Bookmarks"