Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix plugin crash when variable is passed for Options #125

Merged
merged 2 commits into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[package]
org = "mssql_test"
name = "sample4"
version = "0.1.0"
Original file line number Diff line number Diff line change
@@ -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
};

}
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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());
Expand All @@ -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, "");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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());
Expand All @@ -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());
Expand Down