aboutsummaryrefslogtreecommitdiffstats
path: root/mdbc-server
diff options
context:
space:
mode:
authorArthur Martella <arthur.martella.1@att.com>2019-03-28 14:00:03 -0400
committerArthur Martella <arthur.martella.1@att.com>2019-03-28 14:00:03 -0400
commit0325143a8ddc6e95a5d02517468b3c8de40da9b5 (patch)
tree5f1b9d4df9b1c4e29b2a50e2a6dd6588c448ae91 /mdbc-server
parent9715bb302ae309810fe533ad024cafe87e5480dd (diff)
Add primary key for delete in tx replay
Change-Id: Ic8a2e8c311dd657fbdb5936568bc8d168458d3b2 Issue-ID: MUSIC-371 Signed-off-by: Arthur Martella <arthur.martella.1@att.com>
Diffstat (limited to 'mdbc-server')
-rwxr-xr-xmdbc-server/src/main/java/org/onap/music/mdbc/mixins/MySQLMixin.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MySQLMixin.java b/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MySQLMixin.java
index 820817b..338839a 100755
--- a/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MySQLMixin.java
+++ b/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/MySQLMixin.java
@@ -344,6 +344,7 @@ NEW.field refers to the new value
*/
private String generateTrigger(String tableName, String op) {
boolean isdelete = op.equals("DELETE");
+ boolean isinsert = op.equals("INSERT");
boolean isupdate = op.equals("UPDATE");
TableInfo ti = getTableInfo(tableName);
StringBuilder newJson = new StringBuilder("JSON_OBJECT("); // JSON_OBJECT(key, val, key, val) page 1766
@@ -355,10 +356,10 @@ NEW.field refers to the new value
.append("'").append(col).append("', ")
.append(isdelete ? "OLD." : "NEW.")
.append(col);
- if (!isdelete && (ti.iskey(col) || !ti.hasKey())) {
+ if (ti.iskey(col) || !ti.hasKey()) {
keyJson.append(kfx)
.append("'").append(col).append("', ")
- .append(isupdate ? "OLD." : "NEW.")
+ .append(isinsert ? "NEW." : "OLD.")
.append(col);
kfx = ", ";
}
@@ -382,7 +383,7 @@ NEW.field refers to the new value
.append("', ")
.append(isdelete ? "'D'" : (op.equals("INSERT") ? "'I'" : "'U'"))
.append(", ")
- .append(!isdelete ? keyJson.toString() : "NULL")
+ .append( (keyJson.length()>"JSON_OBJECT()".length()) ? keyJson.toString() : "NULL")
.append(", ")
.append(newJson.toString())
.append(", ")