Merge branch 'master' into master

ballerina-platform · Jun 14, 2024 · aca8a4c · aca8a4c
2 parents a2fc926 + fa5eeaf
commit aca8a4c
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 10 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "sql"
-version = "1.13.0"
+version = "1.13.1"
 authors = ["Ballerina"]
 keywords = ["database", "client", "network", "SQL", "RDBMS"]
 repository = "https://github.com/ballerina-platform/module-ballerina-sql"
@@ -15,11 +15,11 @@ graalvmCompatible = true
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "sql-native"
-version = "1.13.0"
-path = "../native/build/libs/sql-native-1.13.0.jar"
+version = "1.13.1"
+path = "../native/build/libs/sql-native-1.13.1.jar"
 
 [[platform.java17.dependency]]
-path = "../test-utils/build/libs/sql-test-utils-1.13.0.jar"
+path = "../test-utils/build/libs/sql-test-utils-1.13.1.jar"
 scope = "testOnly"
 
 [[platform.java17.dependency]]

diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "sql-compiler-plugin"
 class = "io.ballerina.stdlib.sql.compiler.SQLCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/sql-compiler-plugin-1.13.0.jar"
+path = "../compiler-plugin/build/libs/sql-compiler-plugin-1.13.1.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -300,7 +300,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "sql"
-version = "1.13.0"
+version = "1.13.1"
 dependencies = [
 	{org = "ballerina", name = "file"},
 	{org = "ballerina", name = "io"},

diff --git a/changelog.md b/changelog.md
@@ -6,12 +6,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+### Changed
+
+## [1.13.1] - 2024-06-12
+
+### Changed
+- [Clean resources after procedure call failure](https://github.com/ballerina-platform/ballerina-library/issues/6626)
+
+## [1.13.0] - 2024-02-05
+
+### Added
+- Support for 2201.9.0 distribution
+
+## [1.12.1] - 2024-06-12
+
+### Changed
+- [Clean resources after procedure call failure](https://github.com/ballerina-platform/ballerina-library/issues/6626)
+
+## [1.12.0] - 2024-02-05
+
 ### Added
 - Support for Cursor based result set retrieval in procedure calls
 
 ### Changed
 - [Revert Accept escaped backtick as insertions in parameterised query](https://github.com/ballerina-platform/ballerina-standard-library/issues/2056)
 
+## [1.11.2] - 2024-06-12
+
+### Changed
+- [Clean resources after procedure call failure](https://github.com/ballerina-platform/ballerina-library/issues/6626)
+
 ## [1.11.1] - 2023-10-16
 
 ### Changed

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=io.ballerina.stdlib
-version=1.13.1-SNAPSHOT
+version=1.13.2-SNAPSHOT
 
 puppycrawlCheckstyleVersion=10.12.1
 hikkariLibVersion=3.3.1

diff --git a/native/src/main/java/io/ballerina/stdlib/sql/nativeimpl/CallProcessor.java b/native/src/main/java/io/ballerina/stdlib/sql/nativeimpl/CallProcessor.java
@@ -63,6 +63,7 @@
 import static io.ballerina.stdlib.sql.utils.Utils.getDefaultStreamConstraint;
 import static io.ballerina.stdlib.sql.utils.Utils.getSqlQuery;
 import static io.ballerina.stdlib.sql.utils.Utils.updateProcedureCallExecutionResult;
+import static io.ballerina.stdlib.sql.utils.Utils.closeResources;
 
 /**
  * This class holds the utility methods involved with executing the call statements.
@@ -116,9 +117,9 @@ private static Object nativeCallExecutable(BObject client, BObject paramSQLStrin
                 return ErrorGenerator.getSQLApplicationError(
                         "SQL Client is already closed, hence further operations are not allowed");
             }
-            Connection connection;
-            CallableStatement statement;
-            ResultSet resultSet;
+            Connection connection = null;
+            CallableStatement statement = null;
+            ResultSet resultSet = null;
             String sqlQuery = null;
             try {
                 sqlQuery = getSqlQuery(paramSQLString);
@@ -168,11 +169,14 @@ private static Object nativeCallExecutable(BObject client, BObject paramSQLStrin
                 procedureCallResult.addNativeData(RESULT_SET_COUNT_NATIVE_DATA_FIELD, resultSetCount);
                 return procedureCallResult;
             } catch (SQLException e) {
+                closeResources(isWithinTrxBlock, resultSet, statement, connection);
                 return ErrorGenerator.getSQLDatabaseError(e,
                         String.format("Error while executing SQL query: %s. ", sqlQuery));
             } catch (ApplicationError e) {
+                closeResources(isWithinTrxBlock, resultSet, statement, connection);
                 return ErrorGenerator.getSQLApplicationError(e);
             } catch (Throwable th) {
+                closeResources(isWithinTrxBlock, resultSet, statement, connection);
                 return ErrorGenerator.getSQLError(th, String.format("Error while executing SQL query: %s. ", sqlQuery));
             }
         } else {