From cf88f2375b571ead3729b35f3e7e70e074408e40 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Wed, 27 Jan 2016 20:34:51 +1300 Subject: [PATCH] #544 - Postgres @History DB trigger using current_timestamp (transaction) and should instead use statement_timestamp() --- .../ddlgeneration/platform/PostgresHistoryDdl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java index 9f2a97db6..240840208 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java +++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java @@ -14,7 +14,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl { public PostgresHistoryDdl() { - this.currentTimestamp = "current_timestamp"; + this.currentTimestamp = "statement_timestamp()"; } /** @@ -80,7 +80,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl { .append(" if (TG_OP = 'UPDATE') then").newLine(); appendInsertIntoHistory(apply, historyTable, includedColumns); apply - .append(" NEW.").append(sysPeriod).append(" = tstzrange(CURRENT_TIMESTAMP,null);").newLine() + .append(" NEW.").append(sysPeriod).append(" = tstzrange(").append(currentTimestamp).append(",null);").newLine() .append(" return new;").newLine(); apply .append(" elsif (TG_OP = 'DELETE') then").newLine(); @@ -137,7 +137,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl { buffer.append(" insert into ").append(historyTable).append(" (").append(sysPeriod).append(","); appendColumnNames(buffer, columns, ""); - buffer.append(") values (tstzrange(lower(OLD.").append(sysPeriod).append("), current_timestamp), "); + buffer.append(") values (tstzrange(lower(OLD.").append(sysPeriod).append("), ").append(currentTimestamp).append("), "); appendColumnNames(buffer, columns, "OLD."); buffer.append(");").newLine(); }