From f9ede861badb5fca06b553613de604a949ed17ae Mon Sep 17 00:00:00 2001
From: Gunnar Morling <gunnar.morling@googlemail.com>
Date: Wed, 19 Sep 2018 10:40:34 +0200
Subject: [PATCH] DBZ-912 Upgrading to Postgres driver 42.2.5

---
 .../postgresql/connection/PostgresConnection.java    | 12 +++++++-----
 .../connector/postgresql/PostgresConnectorIT.java    |  2 +-
 pom.xml                                              |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debezium-connector-postgres/src/main/java/io/debezium/connector/postgresql/connection/PostgresConnection.java b/debezium-connector-postgres/src/main/java/io/debezium/connector/postgresql/connection/PostgresConnection.java
index d8d104547..315fed119 100644
--- a/debezium-connector-postgres/src/main/java/io/debezium/connector/postgresql/connection/PostgresConnection.java
+++ b/debezium-connector-postgres/src/main/java/io/debezium/connector/postgresql/connection/PostgresConnection.java
@@ -215,16 +215,18 @@ public boolean dropReplicationSlot(String slotName) {
         try {
             execute("select pg_drop_replication_slot('" + slotName + "')");
             return true;
-        } catch (SQLException e) {
+        }
+        catch (SQLException e) {
             // slot is active
-            PSQLState currentState = new PSQLState(e.getSQLState());
-            if (PSQLState.OBJECT_IN_USE.equals(currentState)) {
+            if (PSQLState.OBJECT_IN_USE.getState().equals(e.getSQLState())) {
                 LOGGER.warn("Cannot drop replication slot '{}' because it's still in use", slotName);
                 return false;
-            } else if (PSQLState.UNDEFINED_OBJECT.equals(currentState)) {
+            }
+            else if (PSQLState.UNDEFINED_OBJECT.getState().equals(e.getSQLState())) {
                 LOGGER.debug("Replication slot {} has already been dropped", slotName);
                 return false;
-            } else {
+            }
+            else {
                 LOGGER.error("Unexpected error while attempting to drop replication slot", e);
             }
             return false;
diff --git a/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/PostgresConnectorIT.java b/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/PostgresConnectorIT.java
index 047783bd8..d87c789a3 100644
--- a/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/PostgresConnectorIT.java
+++ b/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/PostgresConnectorIT.java
@@ -165,7 +165,7 @@ public void shouldSupportSSLParameters() throws Exception {
                 assertThat(error).isInstanceOf(ConnectException.class);
                 Throwable cause = error.getCause();
                 assertThat(cause).isInstanceOf(SQLException.class);
-                assertThat(PSQLState.CONNECTION_REJECTED).isEqualTo(new PSQLState(((SQLException)cause).getSQLState()));
+                assertThat(PSQLState.CONNECTION_REJECTED.getState().equals(((SQLException)cause).getSQLState()));
             }
         });
         if (TestHelper.shouldSSLConnectionFail()) {
diff --git a/pom.xml b/pom.xml
index 3a6d86389..150156621 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
         <version.confluent.platform>5.0.0</version.confluent.platform>
 
         <!-- Databases -->
-        <version.postgresql.driver>42.0.0-SNAPSHOT</version.postgresql.driver>
+        <version.postgresql.driver>42.2.5</version.postgresql.driver>
         <version.mysql.server>5.7</version.mysql.server>
         <version.mysql.driver>8.0.12</version.mysql.driver>
         <version.mysql.binlog>0.16.1</version.mysql.binlog>
@@ -238,7 +238,7 @@
             <dependency>
                 <groupId>org.postgresql</groupId>
                 <artifactId>postgresql</artifactId>
-                <version>42.0.0</version>
+                <version>${version.postgresql.driver}</version>
             </dependency>
 
             <!--Make sure this version is compatible with the Protbuf-C version used on the server -->