From dbe5b521651725396a2b8f7a27f2fd684f78c90f Mon Sep 17 00:00:00 2001
From: Eric Long <elong@jumpmind.com>
Date: Tue, 21 Jun 2022 10:56:11 -0400
Subject: [PATCH] 0005341: Add system property to control use of "on conflict"
 on Postgres

---
 .../java/org/jumpmind/db/platform/DmlStatementFactory.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/DmlStatementFactory.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/DmlStatementFactory.java
index 4c44b78267..5ddb48bf4d 100644
--- a/symmetric-db/src/main/java/org/jumpmind/db/platform/DmlStatementFactory.java
+++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/DmlStatementFactory.java
@@ -49,7 +49,8 @@ public static synchronized IDmlStatementFactory getInstance() {
     public DmlStatement create(String databaseName, DmlStatementOptions options) {
         if (DatabaseNamesConstants.ORACLE.equals(databaseName) || DatabaseNamesConstants.ORACLE122.equals(databaseName)) {
             return new OracleDmlStatement(options);
-        } else if (DatabaseNamesConstants.POSTGRESQL.equals(databaseName)) {
+        } else if (DatabaseNamesConstants.POSTGRESQL.equals(databaseName) || (DatabaseNamesConstants.POSTGRESQL95.equals(databaseName) &&
+                System.getProperty("postgres.use.on.conflict", "").equalsIgnoreCase("false"))) {
             return new PostgreSqlDmlStatement(options);
         } else if (DatabaseNamesConstants.POSTGRESQL95.equals(databaseName)) {
             return new PostgreSqlDmlStatement95(options);