#207 Make ShedlockCompatible with PostgreSQL JDBC Driver 42.2.11

lukas-krecan · Mar 20, 2020 · e29921e · e29921e
1 parent 57211b0
commit e29921e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.../main/java/net/javacrumbs/shedlock/provider/jdbctemplate/JdbcTemplateStorageAccessor.java b/.../main/java/net/javacrumbs/shedlock/provider/jdbctemplate/JdbcTemplateStorageAccessor.java
@@ -60,23 +60,23 @@ class JdbcTemplateStorageAccessor extends AbstractStorageAccessor {
 
     @Override
     public boolean insertRecord(@NotNull LockConfiguration lockConfiguration) {
-        String sql = "INSERT INTO " + tableName() + "(" + name() + ", " + lockUntil() + ", " + lockedAt() + ", " + lockedBy() + ") VALUES(?, ?, ?, ?)";
-        return transactionTemplate.execute(status -> {
-            try {
+        try {
+            String sql = "INSERT INTO " + tableName() + "(" + name() + ", " + lockUntil() + ", " + lockedAt() + ", " + lockedBy() + ") VALUES(?, ?, ?, ?)";
+            return transactionTemplate.execute(status -> {
                 int insertedRows = jdbcTemplate.update(sql, preparedStatement -> {
                     preparedStatement.setString(1, lockConfiguration.getName());
                     setTimestamp(preparedStatement, 2, lockConfiguration.getLockAtMostUntil());
                     setTimestamp(preparedStatement, 3, ClockProvider.now());
                     preparedStatement.setString(4, lockedByValue());
                 });
                 return insertedRows > 0;
-            } catch (DuplicateKeyException e) {
-                return false;
-            } catch (DataIntegrityViolationException e) {
-                logger.warn("Unexpected exception", e);
-                return false;
-            }
-        });
+            });
+        } catch (DuplicateKeyException e) {
+            return false;
+        } catch (DataIntegrityViolationException e) {
+            logger.warn("Unexpected exception", e);
+            return false;
+        }
     }
 
     @Override

diff --git a/providers/jdbc/shedlock-test-support-jdbc/pom.xml b/providers/jdbc/shedlock-test-support-jdbc/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>9.4.1212</version>
+            <version>42.2.11</version>
         </dependency>
 
         <dependency>