Merge pull request #153 from kaneeldias/stage-1.2.1

Patch release for MSSQL 1.2.1
ballerina-platform · Feb 3, 2022 · 7b18372 · 7b18372
2 parents 0726dca + 6bbb5cb
commit 7b18372
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 16 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,18 +1,18 @@
 [package]
 org = "ballerinax"
 name = "mssql"
-version = "1.2.0"
+version = "1.2.1"
 authors = ["Ballerina"]
 keywords = ["database", "client", "network", "SQL", "RDBMS", "SQLServer", "MSSQL"]
 repository = "https://github.com/ballerina-platform/module-ballerinax-mssql"
 license = ["Apache-2.0"]
 distribution = "slbeta6"
 
 [[platform.java11.dependency]]
-path = "../native/build/libs/mssql-native-1.2.0.jar"
+path = "../native/build/libs/mssql-native-1.2.1.jar"
 
 [[platform.java11.dependency]]
-path = "./lib/sql-native-1.2.0.jar"
+path = "./lib/sql-native-1.2.1.jar"
 
 [[platform.java11.dependency]]
 path = "./lib/mssql-jdbc-9.2.0.jre11.jar"

diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "mssql-compiler-plugin"
 class = "io.ballerina.stdlib.mssql.compiler.MSSQLCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/mssql-compiler-plugin-1.2.0.jar"
+path = "../compiler-plugin/build/libs/mssql-compiler-plugin-1.2.1.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -130,7 +130,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "sql"
-version = "1.2.0"
+version = "1.2.1"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -167,7 +167,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "mssql"
-version = "1.2.0"
+version = "1.2.1"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "file"},

diff --git a/changelog.md b/changelog.md
@@ -7,9 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
-- [Add tooling support](https://github.com/ballerina-platform/ballerina-standard-library/issues/2282)
 
 ### Changed
+- [Fix Compiler plugin crash when variable is passed for `sql:ConnectionPool` and `mssql:Options`](https://github.com/ballerina-platform/ballerina-standard-library/issues/2536)
+
+## [1.2.0] - 2021-12-13
+
+### Added
+- [Add tooling support](https://github.com/ballerina-platform/ballerina-standard-library/issues/2282)
 
 ## [1.1.0] - 2021-11-20
 

diff --git a/...ler-plugin-tests/src/test/java/io/ballerina/stdlib/mssql/compiler/CompilerPluginTest.java b/...ler-plugin-tests/src/test/java/io/ballerina/stdlib/mssql/compiler/CompilerPluginTest.java
@@ -135,4 +135,17 @@ public void testMSSQLOptionRecord() {
         });
     }
 
+    @Test
+    public void testOptionsWithVariables() {
+        Package currentPackage = loadPackage("sample4");
+        PackageCompilation compilation = currentPackage.getCompilation();
+        DiagnosticResult diagnosticResult = compilation.diagnosticResult();
+        List<Diagnostic> diagnosticErrorStream = diagnosticResult.diagnostics().stream()
+                .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
+                .collect(Collectors.toList());
+        long availableErrors = diagnosticErrorStream.size();
+
+        Assert.assertEquals(availableErrors, 0);
+    }
+
 }
diff --git a/compiler-plugin-tests/src/test/resources/diagnostics/sample4/Ballerina.toml b/compiler-plugin-tests/src/test/resources/diagnostics/sample4/Ballerina.toml
@@ -0,0 +1,4 @@
+[package]
+org = "mssql_test"
+name = "sample4"
+version = "0.1.0"
diff --git a/compiler-plugin-tests/src/test/resources/diagnostics/sample4/main.bal b/compiler-plugin-tests/src/test/resources/diagnostics/sample4/main.bal
@@ -0,0 +1,32 @@
+// Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+//
+// WSO2 Inc. licenses this file to you under the Apache License,
+// Version 2.0 (the "License"); you may not use this file except
+// in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+import ballerinax/mssql;
+
+public function main() {
+
+    decimal loginTimeout = 5;
+    decimal loginTimeoutInvalid = -5;
+
+    mssql:Options options1 = {
+        loginTimeout: loginTimeout
+    };
+
+    mssql:Options options2 = {
+        loginTimeout: loginTimeoutInvalid
+    };
+
+}
diff --git a/compiler-plugin/src/main/java/io/ballerina/stdlib/mssql/compiler/Utils.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/mssql/compiler/Utils.java
@@ -83,7 +83,7 @@ public static void validateOptions(SyntaxNodeAnalysisContext ctx, MappingConstru
             switch (name) {
                 case Constants.Options.LOGIN_TIMEOUT:
                 case Constants.Options.SOCKET_TIMEOUT:
-                    float fieldVal = Float.parseFloat(getTerminalNodeValue(valueNode));
+                    float fieldVal = Float.parseFloat(getTerminalNodeValue(valueNode, "0"));
                     if (fieldVal < 0) {
                         DiagnosticInfo diagnosticInfo = new DiagnosticInfo(MSSQL_101.getCode(), MSSQL_101.getMessage(),
                                 MSSQL_101.getSeverity());
@@ -92,7 +92,7 @@ public static void validateOptions(SyntaxNodeAnalysisContext ctx, MappingConstru
                     }
                     break;
                 case Constants.Options.QUERY_TIMEOUT:
-                    float queryTimeout = Float.parseFloat(getTerminalNodeValue(valueNode));
+                    float queryTimeout = Float.parseFloat(getTerminalNodeValue(valueNode, "0"));
                     if (queryTimeout < -1) {
                         DiagnosticInfo diagnosticInfo = new DiagnosticInfo(MSSQL_102.getCode(), MSSQL_102.getMessage(),
                                 MSSQL_102.getSeverity());
@@ -107,15 +107,16 @@ public static void validateOptions(SyntaxNodeAnalysisContext ctx, MappingConstru
         }
     }
 
-    public static String getTerminalNodeValue(Node valueNode) {
-        String value = "";
+    public static String getTerminalNodeValue(Node valueNode, String defaultValue) {
+        String value = defaultValue;
         if (valueNode instanceof BasicLiteralNode) {
             value = ((BasicLiteralNode) valueNode).literalToken().text();
         } else if (valueNode instanceof UnaryExpressionNode) {
             UnaryExpressionNode unaryExpressionNode = (UnaryExpressionNode) valueNode;
             value = unaryExpressionNode.unaryOperator() +
                     ((BasicLiteralNode) unaryExpressionNode.expression()).literalToken().text();
         }
+        // Currently, we cannot process values from variables, this needs code flow analysis
         return value.replaceAll(UNNECESSARY_CHARS_REGEX, "");
     }
 }
diff --git a/...n/src/main/java/io/ballerina/stdlib/mssql/compiler/analyzer/InitializerParamAnalyzer.java b/...n/src/main/java/io/ballerina/stdlib/mssql/compiler/analyzer/InitializerParamAnalyzer.java
@@ -115,7 +115,7 @@ private void validateConnectionPool(SyntaxNodeAnalysisContext ctx, MappingConstr
             ExpressionNode valueNode = ((SpecificFieldNode) field).valueExpr().get();
             switch (name) {
                 case Constants.ConnectionPool.MAX_OPEN_CONNECTIONS:
-                    int maxOpenConnections = Integer.parseInt(getTerminalNodeValue(valueNode));
+                    int maxOpenConnections = Integer.parseInt(getTerminalNodeValue(valueNode, "1"));
                     if (maxOpenConnections < 1) {
                         DiagnosticInfo diagnosticInfo = new DiagnosticInfo(SQL_101.getCode(), SQL_101.getMessage(),
                                 SQL_101.getSeverity());
@@ -126,7 +126,7 @@ private void validateConnectionPool(SyntaxNodeAnalysisContext ctx, MappingConstr
                     }
                     break;
                 case Constants.ConnectionPool.MIN_IDLE_CONNECTIONS:
-                    int minIdleConnection = Integer.parseInt(getTerminalNodeValue(valueNode));
+                    int minIdleConnection = Integer.parseInt(getTerminalNodeValue(valueNode, "0"));
                     if (minIdleConnection < 0) {
                         DiagnosticInfo diagnosticInfo = new DiagnosticInfo(SQL_102.getCode(), SQL_102.getMessage(),
                                 SQL_102.getSeverity());
@@ -136,7 +136,7 @@ private void validateConnectionPool(SyntaxNodeAnalysisContext ctx, MappingConstr
                     }
                     break;
                 case Constants.ConnectionPool.MAX_CONNECTION_LIFE_TIME:
-                    float maxConnectionTime = Float.parseFloat(getTerminalNodeValue(valueNode));
+                    float maxConnectionTime = Float.parseFloat(getTerminalNodeValue(valueNode, "30"));
                     if (maxConnectionTime < 30) {
                         DiagnosticInfo diagnosticInfo = new DiagnosticInfo(SQL_103.getCode(), SQL_103.getMessage(),
                                 SQL_103.getSeverity());

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=io.ballerina.stdlib
-version=1.2.0
+version=1.2.1
 
 puppycrawlCheckstyleVersion=8.18
 msSQLDriverVersion=9.2.0.jre11
@@ -13,7 +13,7 @@ ballerinaGradlePluginVersion=0.14.1
 
 ballerinaLangVersion=2.0.0-beta.6
 
-stdlibSqlVersion=1.2.0
+stdlibSqlVersion=1.2.1
 
 stdlibIoVersion=1.1.0
 stdlibRegexVersion=1.1.0