From 0ed8d9d8d3ab955c4ec497e091f772e36c1175c6 Mon Sep 17 00:00:00 2001 From: Niveathika Date: Fri, 4 Nov 2022 19:38:29 +0530 Subject: [PATCH 1/4] Remove SQL_901 diagnostic hint --- changelog.md | 5 ++ .../oracledb/compiler/CompilerPluginTest.java | 58 ------------- .../diagnostics/sample1/Ballerina.toml | 4 - .../resources/diagnostics/sample1/main.bal | 29 ------- .../diagnostics/sample5/Ballerina.toml | 4 - .../resources/diagnostics/sample5/main.bal | 22 ----- .../compiler/OracleDBCodeAnalyzer.java | 2 - .../compiler/OracleDBDiagnosticsCode.java | 10 +-- .../compiler/analyzer/MethodAnalyzer.java | 41 +-------- .../analyzer/RemoteMethodAnalyzer.java | 87 ------------------- 10 files changed, 10 insertions(+), 252 deletions(-) delete mode 100644 compiler-plugin-tests/src/test/resources/diagnostics/sample1/Ballerina.toml delete mode 100644 compiler-plugin-tests/src/test/resources/diagnostics/sample1/main.bal delete mode 100644 compiler-plugin-tests/src/test/resources/diagnostics/sample5/Ballerina.toml delete mode 100644 compiler-plugin-tests/src/test/resources/diagnostics/sample5/main.bal delete mode 100644 compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/analyzer/RemoteMethodAnalyzer.java diff --git a/changelog.md b/changelog.md index 7aa31b98..2dbd24e9 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +### Changed +- [Remove SQL_901 diagnostic hint](https://github.com/ballerina-platform/ballerina-standard-library/issues/3609) + +## [1.6.0] + ### Changed - [Updated API Docs](https://github.com/ballerina-platform/ballerina-standard-library/issues/3463) diff --git a/compiler-plugin-tests/src/test/java/io/ballerina/stdlib/oracledb/compiler/CompilerPluginTest.java b/compiler-plugin-tests/src/test/java/io/ballerina/stdlib/oracledb/compiler/CompilerPluginTest.java index 6ad5d567..5f9c12fb 100644 --- a/compiler-plugin-tests/src/test/java/io/ballerina/stdlib/oracledb/compiler/CompilerPluginTest.java +++ b/compiler-plugin-tests/src/test/java/io/ballerina/stdlib/oracledb/compiler/CompilerPluginTest.java @@ -39,9 +39,6 @@ import static io.ballerina.stdlib.oracledb.compiler.OracleDBDiagnosticsCode.ORACLEDB_101; import static io.ballerina.stdlib.oracledb.compiler.OracleDBDiagnosticsCode.ORACLEDB_201; import static io.ballerina.stdlib.oracledb.compiler.OracleDBDiagnosticsCode.ORACLEDB_202; -import static io.ballerina.stdlib.oracledb.compiler.OracleDBDiagnosticsCode.ORACLEDB_901; -import static io.ballerina.stdlib.oracledb.compiler.OracleDBDiagnosticsCode.ORACLEDB_902; -import static io.ballerina.stdlib.oracledb.compiler.OracleDBDiagnosticsCode.ORACLEDB_903; import static io.ballerina.stdlib.oracledb.compiler.OracleDBDiagnosticsCode.SQL_101; /** @@ -65,34 +62,6 @@ private Package loadPackage(String path) { return project.currentPackage(); } - @Test - public void testFunctionHints() { - Package currentPackage = loadPackage("sample1"); - PackageCompilation compilation = currentPackage.getCompilation(); - DiagnosticResult diagnosticResult = compilation.diagnosticResult(); - long availableErrors = diagnosticResult.diagnostics().stream() - .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR)).count(); - Assert.assertEquals(availableErrors, 3); - - List diagnosticHints = diagnosticResult.diagnostics().stream() - .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.HINT)) - .collect(Collectors.toList()); - long availableHints = diagnosticHints.size(); - Assert.assertEquals(availableHints, 3); - - DiagnosticInfo hint1 = diagnosticHints.get(0).diagnosticInfo(); - Assert.assertEquals(hint1.code(), ORACLEDB_901.getCode()); - Assert.assertEquals(hint1.messageFormat(), ORACLEDB_901.getMessage()); - - DiagnosticInfo hint2 = diagnosticHints.get(1).diagnosticInfo(); - Assert.assertEquals(hint2.code(), ORACLEDB_902.getCode()); - Assert.assertEquals(hint2.messageFormat(), ORACLEDB_902.getMessage()); - - DiagnosticInfo hint3 = diagnosticHints.get(2).diagnosticInfo(); - Assert.assertEquals(hint3.code(), ORACLEDB_901.getCode()); - Assert.assertEquals(hint3.messageFormat(), ORACLEDB_901.getMessage()); - } - @Test public void testSQLConnectionPoolFieldsInNewExpression() { Package currentPackage = loadPackage("sample2"); @@ -164,33 +133,6 @@ public void testOutParameterValidations() { } - @Test - public void testOutParameterHint() { - Package currentPackage = loadPackage("sample5"); - PackageCompilation compilation = currentPackage.getCompilation(); - DiagnosticResult diagnosticResult = compilation.diagnosticResult(); - List errorDiagnosticsList = diagnosticResult.diagnostics().stream() - .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR)) - .collect(Collectors.toList()); - long availableErrors = errorDiagnosticsList.size(); - - Assert.assertEquals(availableErrors, 1); - - List hintDiagnosticsList = diagnosticResult.diagnostics().stream() - .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.HINT)) - .collect(Collectors.toList()); - long availableHints = hintDiagnosticsList.size(); - - Assert.assertEquals(availableHints, 1); - - hintDiagnosticsList.forEach(diagnostic -> { - Assert.assertEquals(diagnostic.diagnosticInfo().code(), ORACLEDB_903.getCode()); - Assert.assertEquals(diagnostic.diagnosticInfo().messageFormat(), ORACLEDB_903.getMessage()); - }); - - } - - @Test public void testOptionsWithVariables() { Package currentPackage = loadPackage("sample6"); diff --git a/compiler-plugin-tests/src/test/resources/diagnostics/sample1/Ballerina.toml b/compiler-plugin-tests/src/test/resources/diagnostics/sample1/Ballerina.toml deleted file mode 100644 index fc12cd67..00000000 --- a/compiler-plugin-tests/src/test/resources/diagnostics/sample1/Ballerina.toml +++ /dev/null @@ -1,4 +0,0 @@ -[package] -org = "oracledb_test" -name = "sample1" -version = "0.1.0" diff --git a/compiler-plugin-tests/src/test/resources/diagnostics/sample1/main.bal b/compiler-plugin-tests/src/test/resources/diagnostics/sample1/main.bal deleted file mode 100644 index 75dec0c4..00000000 --- a/compiler-plugin-tests/src/test/resources/diagnostics/sample1/main.bal +++ /dev/null @@ -1,29 +0,0 @@ -// 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/oracledb; - -public function main() returns error? { - oracledb:Client dbClient = check new(); - _ = check dbClient->query(``); - _ = check dbClient->queryRow(``); - check invokeQuery(dbClient); - check dbClient.close(); -} - -function invokeQuery(oracledb:Client dbClient) returns error? { - _ = check dbClient->query(``); -} diff --git a/compiler-plugin-tests/src/test/resources/diagnostics/sample5/Ballerina.toml b/compiler-plugin-tests/src/test/resources/diagnostics/sample5/Ballerina.toml deleted file mode 100644 index 46b92d11..00000000 --- a/compiler-plugin-tests/src/test/resources/diagnostics/sample5/Ballerina.toml +++ /dev/null @@ -1,4 +0,0 @@ -[package] -org = "oracledb_test" -name = "sample5" -version = "0.1.0" diff --git a/compiler-plugin-tests/src/test/resources/diagnostics/sample5/main.bal b/compiler-plugin-tests/src/test/resources/diagnostics/sample5/main.bal deleted file mode 100644 index f391dfc1..00000000 --- a/compiler-plugin-tests/src/test/resources/diagnostics/sample5/main.bal +++ /dev/null @@ -1,22 +0,0 @@ -// 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/oracledb; - -public function main() returns error? { - oracledb:XmlOutParameter xmlOut = new(); - check xmlOut.get(); -} diff --git a/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/OracleDBCodeAnalyzer.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/OracleDBCodeAnalyzer.java index 09c576f5..04c469f4 100644 --- a/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/OracleDBCodeAnalyzer.java +++ b/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/OracleDBCodeAnalyzer.java @@ -24,7 +24,6 @@ import io.ballerina.stdlib.oracledb.compiler.analyzer.InitializerParamAnalyzer; import io.ballerina.stdlib.oracledb.compiler.analyzer.MethodAnalyzer; import io.ballerina.stdlib.oracledb.compiler.analyzer.RecordAnalyzer; -import io.ballerina.stdlib.oracledb.compiler.analyzer.RemoteMethodAnalyzer; import java.util.List; @@ -35,7 +34,6 @@ public class OracleDBCodeAnalyzer extends CodeAnalyzer { @Override public void init(CodeAnalysisContext ctx) { - ctx.addSyntaxNodeAnalysisTask(new RemoteMethodAnalyzer(), SyntaxKind.REMOTE_METHOD_CALL_ACTION); ctx.addSyntaxNodeAnalysisTask(new InitializerParamAnalyzer(), List.of(SyntaxKind.IMPLICIT_NEW_EXPRESSION, SyntaxKind.EXPLICIT_NEW_EXPRESSION)); ctx.addSyntaxNodeAnalysisTask(new RecordAnalyzer(), diff --git a/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/OracleDBDiagnosticsCode.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/OracleDBDiagnosticsCode.java index 2c99ddd6..89987d1b 100644 --- a/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/OracleDBDiagnosticsCode.java +++ b/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/OracleDBDiagnosticsCode.java @@ -20,7 +20,6 @@ import io.ballerina.tools.diagnostics.DiagnosticSeverity; import static io.ballerina.tools.diagnostics.DiagnosticSeverity.ERROR; -import static io.ballerina.tools.diagnostics.DiagnosticSeverity.HINT; /** * Enum class to hold OracleDB module diagnostic codes. @@ -37,14 +36,7 @@ public enum OracleDBDiagnosticsCode { // Out parameter return type validations diagnostics ORACLEDB_201("ORACLEDB_201", "invalid value: expected value is either record or object", ERROR), - ORACLEDB_202("ORACLEDB_202", "invalid value: expected value is xml", ERROR), - - ORACLEDB_901("ORACLEDB_901", - "parameter 'rowType' should be explicitly passed when the return data is ignored", HINT), - ORACLEDB_902("ORACLEDB_902", - "parameter 'returnType' should be explicitly passed when the return data is ignored", HINT), - ORACLEDB_903("ORACLEDB_903", - "parameter 'typeDesc' should be explicitly passed when the return data is ignored", HINT); + ORACLEDB_202("ORACLEDB_202", "invalid value: expected value is xml", ERROR); private final String code; private final String message; diff --git a/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/analyzer/MethodAnalyzer.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/analyzer/MethodAnalyzer.java index 1b8864a8..c3962986 100644 --- a/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/analyzer/MethodAnalyzer.java +++ b/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/analyzer/MethodAnalyzer.java @@ -39,10 +39,6 @@ import java.util.List; import java.util.Optional; -import static io.ballerina.stdlib.oracledb.compiler.OracleDBDiagnosticsCode.ORACLEDB_903; -import static org.ballerinalang.util.diagnostic.DiagnosticErrorCode.CANNOT_INFER_TYPE_FOR_PARAM; -import static org.ballerinalang.util.diagnostic.DiagnosticErrorCode.INCOMPATIBLE_TYPE_FOR_INFERRED_TYPEDESC_VALUE; - /** * Code Analyser for OutParameter get method type validations. */ @@ -51,15 +47,10 @@ public class MethodAnalyzer implements AnalysisTask { public void perform(SyntaxNodeAnalysisContext ctx) { MethodCallExpressionNode node = (MethodCallExpressionNode) ctx.node(); List diagnostics = ctx.semanticModel().diagnostics(); - if (!diagnostics.isEmpty()) { - diagnostics.stream() - .filter(diagnostic -> diagnostic.diagnosticInfo().severity() == DiagnosticSeverity.ERROR) - .filter(diagnostic -> - diagnostic.diagnosticInfo().code().equals(CANNOT_INFER_TYPE_FOR_PARAM.diagnosticId()) || - diagnostic.diagnosticInfo().code().equals( - INCOMPATIBLE_TYPE_FOR_INFERRED_TYPEDESC_VALUE.diagnosticId())) - .filter(diagnostic -> diagnostic.location().lineRange().equals(node.location().lineRange())) - .forEach(diagnostic -> addHint(ctx, node)); + for (Diagnostic diagnostic : diagnostics) { + if (diagnostic.diagnosticInfo().severity() == DiagnosticSeverity.ERROR) { + return; + } } // Get the object type to validate arguments @@ -113,28 +104,4 @@ public void perform(SyntaxNodeAnalysisContext ctx) { node.arguments().get(0).location())); } } - - private void addHint(SyntaxNodeAnalysisContext ctx, MethodCallExpressionNode node) { - if (!(Utils.isOracleDBObject(ctx, node.expression(), Constants.OUT_PARAMETER_POSTFIX))) { - return; - } - if (isGetMethod(ctx, node)) { - return; - } - ctx.reportDiagnostic(DiagnosticFactory.createDiagnostic( - new DiagnosticInfo(ORACLEDB_903.getCode(), ORACLEDB_903.getMessage(), ORACLEDB_903.getSeverity()), - node.location())); - } - - private boolean isGetMethod(SyntaxNodeAnalysisContext ctx, MethodCallExpressionNode node) { - Optional methodSymbol = ctx.semanticModel().symbol(node.methodName()); - if (methodSymbol.isEmpty()) { - return true; - } - Optional methodName = methodSymbol.get().getName(); - if (methodName.isEmpty()) { - return true; - } - return !methodName.get().equals(Constants.OutParameter.METHOD_NAME); - } } diff --git a/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/analyzer/RemoteMethodAnalyzer.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/analyzer/RemoteMethodAnalyzer.java deleted file mode 100644 index 9f880355..00000000 --- a/compiler-plugin/src/main/java/io/ballerina/stdlib/oracledb/compiler/analyzer/RemoteMethodAnalyzer.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * 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. - */ -package io.ballerina.stdlib.oracledb.compiler.analyzer; - -import io.ballerina.compiler.api.symbols.Symbol; -import io.ballerina.compiler.syntax.tree.RemoteMethodCallActionNode; -import io.ballerina.projects.plugins.AnalysisTask; -import io.ballerina.projects.plugins.SyntaxNodeAnalysisContext; -import io.ballerina.stdlib.oracledb.compiler.Constants; -import io.ballerina.stdlib.oracledb.compiler.Utils; -import io.ballerina.tools.diagnostics.Diagnostic; -import io.ballerina.tools.diagnostics.DiagnosticFactory; -import io.ballerina.tools.diagnostics.DiagnosticInfo; -import io.ballerina.tools.diagnostics.DiagnosticSeverity; - -import java.util.List; -import java.util.Optional; - -import static io.ballerina.stdlib.oracledb.compiler.OracleDBDiagnosticsCode.ORACLEDB_901; -import static io.ballerina.stdlib.oracledb.compiler.OracleDBDiagnosticsCode.ORACLEDB_902; -import static org.ballerinalang.util.diagnostic.DiagnosticErrorCode.CANNOT_INFER_TYPE_FOR_PARAM; -import static org.ballerinalang.util.diagnostic.DiagnosticErrorCode.INCOMPATIBLE_TYPE_FOR_INFERRED_TYPEDESC_VALUE; - -/** - * OracleDB Client remote call analyzer. - */ -public class RemoteMethodAnalyzer implements AnalysisTask { - - @Override - public void perform(SyntaxNodeAnalysisContext ctx) { - RemoteMethodCallActionNode node = (RemoteMethodCallActionNode) ctx.node(); - List diagnostics = ctx.semanticModel().diagnostics(); - diagnostics.stream() - .filter(diagnostic -> diagnostic.diagnosticInfo().severity() == DiagnosticSeverity.ERROR) - .filter(diagnostic -> - diagnostic.diagnosticInfo().code().equals(CANNOT_INFER_TYPE_FOR_PARAM.diagnosticId()) || - diagnostic.diagnosticInfo().code().equals( - INCOMPATIBLE_TYPE_FOR_INFERRED_TYPEDESC_VALUE.diagnosticId())) - .filter(diagnostic -> diagnostic.location().lineRange().equals(node.location().lineRange())) - .forEach(diagnostic -> addHint(ctx, node)); - } - - private void addHint(SyntaxNodeAnalysisContext ctx, RemoteMethodCallActionNode node) { - if (!(Utils.isOracleDBObject(ctx, node.expression(), Constants.Client.NAME))) { - return; - } - - Optional methodSymbol = ctx.semanticModel().symbol(node.methodName()); - if (methodSymbol.isEmpty()) { - return; - } - Optional methodName = methodSymbol.get().getName(); - if (methodName.isEmpty()) { - return; - } - - switch (methodName.get()) { - case Constants.Client.QUERY: - ctx.reportDiagnostic(DiagnosticFactory.createDiagnostic( - new DiagnosticInfo(ORACLEDB_901.getCode(), ORACLEDB_901.getMessage(), - ORACLEDB_901.getSeverity()), node.location())); - break; - case Constants.Client.QUERY_ROW: - ctx.reportDiagnostic(DiagnosticFactory.createDiagnostic( - new DiagnosticInfo(ORACLEDB_902.getCode(), ORACLEDB_902.getMessage(), - ORACLEDB_902.getSeverity()), node.location())); - break; - default: - return; - } - } -} From 008bdc57c4de94214ac19d9815156d66c69b7380 Mon Sep 17 00:00:00 2001 From: Niveathika Date: Fri, 4 Nov 2022 19:43:43 +0530 Subject: [PATCH 2/4] Migrate to Ballerina Update 4 --- build-config/resources/Ballerina.toml | 2 +- gradle.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 2fe50165..b1645c8d 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -7,7 +7,7 @@ keywords = ["database", "client", "network", "SQL", "RDBMS", "OracleDB", "Oracle repository = "https://github.com/ballerina-platform/module-ballerinax-oracledb" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.3.0" +distribution = "2201.4.0" [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" diff --git a/gradle.properties b/gradle.properties index fec73ad5..771afe39 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=io.ballerina.stdlib -version=1.6.0-SNAPSHOT +version=1.7.0-SNAPSHOT puppycrawlCheckstyleVersion=8.18 oracleDBDriverVersion=12.2.0.1 @@ -13,9 +13,9 @@ researchgateReleaseVersion=2.8.0 testngVersion=7.4.0 ballerinaGradlePluginVersion=0.15.0 -ballerinaLangVersion=2201.3.0-rc1 +ballerinaLangVersion=2201.4.0-20221104-003000-4b73c40e -stdlibSqlVersion=1.6.0-20221024-211900-c028f98 +stdlibSqlVersion=1.7.0-20221104-172000-addd057 # Direct Dependencies # Level 01 From 9ea52ed973046d332a3f8b3bf5f413b0489bbfa4 Mon Sep 17 00:00:00 2001 From: Niveathika Date: Fri, 4 Nov 2022 20:40:37 +0530 Subject: [PATCH 3/4] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 12 ++++++------ ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index e44c5af4..59498151 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,25 +1,25 @@ [package] org = "ballerinax" name = "oracledb" -version = "1.6.0" +version = "1.7.0" authors = ["Ballerina"] keywords = ["database", "client", "network", "SQL", "RDBMS", "OracleDB", "Oracle"] repository = "https://github.com/ballerina-platform/module-ballerinax-oracledb" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.3.0" +distribution = "2201.4.0" [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "oracledb-native" -version = "1.6.0" -path = "../native/build/libs/oracledb-native-1.6.0-SNAPSHOT.jar" +version = "1.7.0" +path = "../native/build/libs/oracledb-native-1.7.0-SNAPSHOT.jar" [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "sql-native" -version = "1.6.0" -path = "./lib/sql-native-1.6.0-20221017-111500-2844cd5.jar" +version = "1.7.0" +path = "./lib/sql-native-1.7.0-20221104-172000-addd057.jar" [[platform.java11.dependency]] path = "./lib/ojdbc8-12.2.0.1.jar" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index f7342b41..8df1f799 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "oracledb-compiler-plugin" class = "io.ballerina.stdlib.oracledb.compiler.OracleDBCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/oracledb-compiler-plugin-1.6.0-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/oracledb-compiler-plugin-1.7.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 31a81a54..7c96194c 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -23,7 +23,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.4.0" +version = "3.3.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, @@ -300,7 +300,7 @@ dependencies = [ [[package]] org = "ballerina" name = "sql" -version = "1.6.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -391,7 +391,7 @@ modules = [ [[package]] org = "ballerinax" name = "oracledb" -version = "1.6.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "file"}, From bcf0351cbf75d4d90bf3d1780df5b507d422c4ea Mon Sep 17 00:00:00 2001 From: Niveathika Date: Fri, 4 Nov 2022 19:47:46 +0530 Subject: [PATCH 4/4] Add branch to the PR check --- .github/workflows/pull-request.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 252519eb..034bc9fb 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -5,6 +5,7 @@ on: branches: - main - 2201.[0-9]+.x + - update4 jobs: ubuntu-build: