Merge pull request #474 from niveathika/master

Fix plugin crash when variable is passed for `ConnectionPool`
ballerina-platform · Dec 22, 2021 · ea6f821 · ea6f821
2 parents 5edc06d + 9b116b5
commit ea6f821
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 7 deletions.
diff --git 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 SQL module on Ballerina 2201.0.0 distribution
+- [Fix Compiler plugin crash when variable is passed for `sql:connectionPool`](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/sql/compiler/CompilerPluginTest.java b/compiler-plugin-tests/src/test/java/io/ballerina/stdlib/sql/compiler/CompilerPluginTest.java
@@ -140,4 +140,17 @@ public void testOutParameterHint() {
         });
 
     }
+
+    @Test
+    public void testConnectionPoolWithVariable() {
+        Package currentPackage = loadPackage("sample4");
+        PackageCompilation compilation = currentPackage.getCompilation();
+        DiagnosticResult diagnosticResult = compilation.diagnosticResult();
+        List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
+                .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
+                .collect(Collectors.toList());
+        long availableErrors = errorDiagnosticsList.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 = "sql_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 ballerina/sql;
+
+public function main() {
+
+    int connectionNum = 5;
+    int connectionNumInvalid = -5;
+
+    int|sql:ConnectionPool pool = {
+        maxOpenConnections: connectionNum
+    };
+
+    sql:ConnectionPool|int poolInvalid = {
+        maxOpenConnections: connectionNumInvalid
+    };
+
+}
diff --git a/...src/main/java/io/ballerina/stdlib/sql/compiler/analyzer/ConnectionPoolConfigAnalyzer.java b/...src/main/java/io/ballerina/stdlib/sql/compiler/analyzer/ConnectionPoolConfigAnalyzer.java
@@ -99,7 +99,7 @@ public void perform(SyntaxNodeAnalysisContext ctx) {
                 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());
@@ -110,7 +110,7 @@ public void perform(SyntaxNodeAnalysisContext ctx) {
                         }
                         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());
@@ -120,7 +120,7 @@ public void perform(SyntaxNodeAnalysisContext ctx) {
                         }
                         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());
@@ -137,15 +137,16 @@ public void perform(SyntaxNodeAnalysisContext ctx) {
         }
     }
 
-    private String getTerminalNodeValue(Node valueNode) {
-        String value;
+    private String getTerminalNodeValue(Node valueNode, String defaultValue) {
+        String value = defaultValue;
         if (valueNode instanceof BasicLiteralNode) {
             value = ((BasicLiteralNode) valueNode).literalToken().text();
-        } else {
+        } 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, "");
     }