From 4ca16f13b343252c02ddf1eaa10e1c0d27d76369 Mon Sep 17 00:00:00 2001 From: niveathika Date: Wed, 22 Dec 2021 23:59:58 +0530 Subject: [PATCH 1/2] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 34c7e2ad..b8a5137f 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -12,7 +12,7 @@ distribution = "2201.0.0" path = "../native/build/libs/mssql-native-1.3.0-SNAPSHOT.jar" [[platform.java11.dependency]] -path = "./lib/sql-native-1.3.0-20211221-080400-54b27f2.jar" +path = "./lib/sql-native-1.3.0-20211222-201000-1819d5f.jar" [[platform.java11.dependency]] path = "./lib/mssql-jdbc-9.2.0.jre11.jar" From 22107b3aa869261c1b93424c13d0b8fe646903d1 Mon Sep 17 00:00:00 2001 From: niveathika Date: Thu, 23 Dec 2021 00:13:51 +0530 Subject: [PATCH 2/2] Fix plugin crash when variable is passed for `Options` --- changelog.md | 2 +- .../mssql/compiler/CompilerPluginTest.java | 13 ++++++++ .../diagnostics/sample4/Ballerina.toml | 4 +++ .../resources/diagnostics/sample4/main.bal | 32 +++++++++++++++++++ .../stdlib/mssql/compiler/Utils.java | 9 +++--- .../analyzer/InitializerParamAnalyzer.java | 6 ++-- 6 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 compiler-plugin-tests/src/test/resources/diagnostics/sample4/Ballerina.toml create mode 100644 compiler-plugin-tests/src/test/resources/diagnostics/sample4/main.bal diff --git a/changelog.md b/changelog.md index 4d48c7d6..be70df9a 100644 --- a/changelog.md +++ b/changelog.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed -- Release MSSQL module on Ballerina 2201.0.0 distribution +- [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 diff --git a/compiler-plugin-tests/src/test/java/io/ballerina/stdlib/mssql/compiler/CompilerPluginTest.java b/compiler-plugin-tests/src/test/java/io/ballerina/stdlib/mssql/compiler/CompilerPluginTest.java index 8acf515b..3e172ef6 100644 --- a/compiler-plugin-tests/src/test/java/io/ballerina/stdlib/mssql/compiler/CompilerPluginTest.java +++ b/compiler-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 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 new file mode 100644 index 00000000..e7d690d1 --- /dev/null +++ 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 new file mode 100644 index 00000000..caaa4689 --- /dev/null +++ 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 index 6301ad62..2a2e574a 100644 --- 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,8 +107,8 @@ 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) { @@ -116,6 +116,7 @@ public static String getTerminalNodeValue(Node 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/compiler-plugin/src/main/java/io/ballerina/stdlib/mssql/compiler/analyzer/InitializerParamAnalyzer.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/mssql/compiler/analyzer/InitializerParamAnalyzer.java index 99b34c26..4f7ecaea 100644 --- a/compiler-plugin/src/main/java/io/ballerina/stdlib/mssql/compiler/analyzer/InitializerParamAnalyzer.java +++ b/compiler-plugin/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());