Skip to content

Commit

Permalink
Fix plugin crash when variable is passed for Options
Browse files Browse the repository at this point in the history
  • Loading branch information
niveathika committed Dec 22, 2021
1 parent c465bba commit 2de823b
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 8 deletions.
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 PostgreSQL module on Ballerina 2201.0.0 distribution
- [Fix Compiler plugin crash when variable is passed for `sql:ConnectionPool` and `postgresql: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 @@ -204,4 +204,17 @@ public void testOutParameterHint() {
});

}

@Test
public void testOptionsWithVariables() {
Package currentPackage = loadPackage("sample6");
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 = "postgresql_test"
name = "sample6"
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/postgresql;

public function main() returns error? {

decimal loginTimeout = 5;
decimal loginTimeoutInvalid = -5;

postgresql:Options options1 = {
loginTimeout: loginTimeout
};

postgresql:Options options2 = {
loginTimeout: loginTimeoutInvalid
};

}
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static void validateOptions(SyntaxNodeAnalysisContext ctx, MappingConstru
case Constants.Options.LOGIN_TIMEOUT:
case Constants.Options.SOCKET_TIMEOUT:
case Constants.Options.CANCEL_SIGNAL_TIMEOUT:
float timeoutVal = Float.parseFloat(getTerminalNodeValue(valueNode));
float timeoutVal = Float.parseFloat(getTerminalNodeValue(valueNode, "0"));
if (timeoutVal < 0) {
DiagnosticInfo diagnosticInfo = new DiagnosticInfo(POSTGRESQL_101.getCode(),
POSTGRESQL_101.getMessage(), POSTGRESQL_101.getSeverity());
Expand All @@ -113,7 +113,7 @@ public static void validateOptions(SyntaxNodeAnalysisContext ctx, MappingConstru
case Constants.Options.PREPARED_STATEMENT_THRESHOLD:
case Constants.Options.PREPARED_STATEMENT_CACHE_QUERIES:
case Constants.Options.PREPARED_STATEMENT_CACHE_SIZE_MIB:
int sizeVal = Integer.parseInt(getTerminalNodeValue(valueNode));
int sizeVal = Integer.parseInt(getTerminalNodeValue(valueNode, "1"));
if (sizeVal <= 0) {
DiagnosticInfo diagnosticInfo = new DiagnosticInfo(POSTGRESQL_102.getCode(),
POSTGRESQL_102.getMessage(), POSTGRESQL_102.getSeverity());
Expand All @@ -128,15 +128,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, "");
}

Expand Down
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

0 comments on commit 2de823b

Please sign in to comment.