do not use try block in case we are not catching

metio · Jul 11, 2022 · a11ac6e · a11ac6e
1 parent 466e92c
commit a11ac6e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 1 deletion.
diff --git a/yosql-codegen/src/main/java/wtf/metio/yosql/codegen/dao/DefaultJdbcBlocks.java b/yosql-codegen/src/main/java/wtf/metio/yosql/codegen/dao/DefaultJdbcBlocks.java
@@ -170,7 +170,10 @@ public CodeBlock openConnection(final SqlConfiguration configuration) {
         return configuration.createConnection()
                 .filter(Boolean.TRUE::equals)
                 .map(value -> controlFlows.tryWithResource(getConnectionInline()))
-                .orElseGet(controlFlows::startTryBlock);
+                .or(() -> configuration.catchAndRethrow()
+                        .filter(Boolean.TRUE::equals)
+                        .map(value -> controlFlows.startTryBlock()))
+                .orElseGet(() -> CodeBlock.builder().build());
     }
 
     @Override

diff --git a/yosql-codegen/src/test/java/wtf/metio/yosql/codegen/dao/DefaultJdbcBlocksTest.java b/yosql-codegen/src/test/java/wtf/metio/yosql/codegen/dao/DefaultJdbcBlocksTest.java
@@ -126,6 +126,12 @@ String openConnectionWithoutConnectionExpectation() {
                     """;
         }
 
+        @Override
+        String openConnectionWithGivenConnectionWithoutRethrowExpectation() {
+            return """
+                    """;
+        }
+
         @Override
         String tryPrepareCallableExpectation() {
             return """
@@ -454,6 +460,12 @@ String openConnectionWithoutConnectionExpectation() {
                     """;
         }
 
+        @Override
+        String openConnectionWithGivenConnectionWithoutRethrowExpectation() {
+            return """
+                    """;
+        }
+
         @Override
         String tryPrepareCallableExpectation() {
             return """
@@ -782,6 +794,12 @@ String openConnectionWithoutConnectionExpectation() {
                     """;
         }
 
+        @Override
+        String openConnectionWithGivenConnectionWithoutRethrowExpectation() {
+            return """
+                    """;
+        }
+
         @Override
         String tryPrepareCallableExpectation() {
             return """
@@ -1111,6 +1129,12 @@ String openConnectionWithoutConnectionExpectation() {
                     """;
         }
 
+        @Override
+        String openConnectionWithGivenConnectionWithoutRethrowExpectation() {
+            return """
+                    """;
+        }
+
         @Override
         String tryPrepareCallableExpectation() {
             return """

diff --git a/yosql-codegen/src/test/java/wtf/metio/yosql/codegen/dao/JdbcBlocksTCK.java b/yosql-codegen/src/test/java/wtf/metio/yosql/codegen/dao/JdbcBlocksTCK.java
@@ -55,6 +55,8 @@ abstract class JdbcBlocksTCK {
 
     abstract String openConnectionWithoutConnectionExpectation();
 
+    abstract String openConnectionWithGivenConnectionWithoutRethrowExpectation();
+
     abstract String tryPrepareCallableExpectation();
 
     abstract String createStatementExpectation();
@@ -202,6 +204,15 @@ final void openConnectionWithoutConnection() {
                         .withCreateConnection(false)).toString());
     }
 
+    @Test
+    final void openConnectionWithGivenConnectionWithoutRethrow() {
+        Assertions.assertEquals(
+                openConnectionWithGivenConnectionWithoutRethrowExpectation(),
+                generator().openConnection(SqlConfiguration.copyOf(SqlConfigurations.sqlConfiguration())
+                        .withCreateConnection(false)
+                        .withCatchAndRethrow(false)).toString());
+    }
+
     @Test
     final void tryPrepareCallable() {
         Assertions.assertEquals(