ZNTA-1868 - use composite key for two tables

zanata · Apr 27, 2017 · 458504b · 458504b
1 parent 6c8f06f
commit 458504b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java b/server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
@@ -105,10 +105,7 @@ public void setTextFlow(HTextFlow textFlow) {
     @AccessType("field")
     @ElementCollection(fetch = FetchType.EAGER)
     @JoinTable(name = "HTextFlowContentHistory", joinColumns = @JoinColumn(
-            name = "text_flow_history_id"),
-            uniqueConstraints = @UniqueConstraint(
-                    name = "UKTextFlowContentHistory",
-                    columnNames = "text_flow_history_id"))
+            name = "text_flow_history_id"))
     @IndexColumn(name = "pos", nullable = false)
     @Column(name = "content", nullable = false)
     @Override

diff --git a/server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java b/server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
@@ -162,10 +162,7 @@ public void setVersionNum(Integer versionNum) {
     @AccessType("field")
     @ElementCollection(fetch = FetchType.EAGER)
     @JoinTable(name = "HTextFlowTargetContentHistory",
-            joinColumns = @JoinColumn(name = "text_flow_target_history_id"),
-            uniqueConstraints = @UniqueConstraint(
-                    name = "UKHTextFlowTargetContentHistory",
-                    columnNames = {"text_flow_target_history_id", "pos"})
+            joinColumns = @JoinColumn(name = "text_flow_target_history_id")
     )
     @IndexColumn(name = "pos", nullable = false)
     @Column(name = "content", nullable = false)

diff --git a/server/zanata-war/src/main/resources/db/changelogs/db.changelog-4.2.xml b/server/zanata-war/src/main/resources/db/changelogs/db.changelog-4.2.xml
@@ -83,7 +83,7 @@
   </changeSet>
 
   <changeSet id="4" author="pahuang@redhat.com">
-    <comment>drop duplicate index and add missing index, unique constraints</comment>
+    <comment>drop duplicate index and add missing index</comment>
     <dropIndex tableName="HTextFlowTargetHistory" indexName="Idx_lastModifiedBy" />
     <createIndex tableName="TransMemoryUnit" indexName="Idx_TransMemoryUnit_tm_id">
       <column name="tm_id"/>
@@ -92,10 +92,6 @@
       indexName="Idx_HProjectIteration_Locale_projectIterationId">
       <column name="projectIterationId"/>
     </createIndex>
-    <addUniqueConstraint tableName="HTextFlowContentHistory"
-      columnNames="text_flow_history_id,pos" />
-    <addUniqueConstraint tableName="HTextFlowTargetContentHistory"
-      columnNames="text_flow_target_history_id,pos" />
   </changeSet>
 
   <changeSet id="5" author="pahuang@redhat.com">
@@ -128,4 +124,16 @@
     <dropUniqueConstraint tableName="HProject_Glossary" constraintName="UKHProject_Glossary" />
   </changeSet>
 
+  <changeSet id="9" author="pahuang@redhat.com">
+    <comment>modify HTextFlowContentHistory to match hibernate mapping</comment>
+    <dropColumn tableName="HTextFlowContentHistory" columnName="id" />
+    <addPrimaryKey tableName="HTextFlowContentHistory" columnNames="pos,text_flow_history_id"/>
+  </changeSet>
+
+  <changeSet id="10" author="pahuang@redhat.com">
+    <comment>modify HTextFlowTargetContentHistory to match hibernate mapping</comment>
+    <dropColumn tableName="HTextFlowTargetContentHistory" columnName="id" />
+    <addPrimaryKey tableName="HTextFlowTargetContentHistory" columnNames="pos,text_flow_target_history_id"/>
+  </changeSet>
+
 </databaseChangeLog>