Merge pull request #309 from kaneeldias/sql-update

Update SQL version
ballerina-platform · Jul 4, 2022 · a5611fb · a5611fb
2 parents d57863b + d22b1c0
commit a5611fb
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 17 deletions.
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - 2201.[0-9]+.x
     paths-ignore:
      - '*.md'
      - 'docs/**'

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -1,6 +1,10 @@
 name: PR build
 
-on: [pull_request]
+on:
+  pull_request:
+    branches:
+      - main
+      - 2201.[0-9]+.x
 
 jobs:
   ubuntu-build:

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,19 +1,19 @@
 [package]
 org = "ballerinax"
 name = "oracledb"
-version = "1.4.0"
+version = "1.5.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.1.0"
+distribution = "2201.2.0"
 
 [[platform.java11.dependency]]
-path = "../native/build/libs/oracledb-native-1.4.0.jar"
+path = "../native/build/libs/oracledb-native-1.5.0-SNAPSHOT.jar"
 
 [[platform.java11.dependency]]
-path = "./lib/sql-native-1.4.0.jar"
+path = "./lib/sql-native-1.5.0-20220701-115900-61cf131.jar"
 
 [[platform.java11.dependency]]
 path = "./lib/ojdbc8-12.2.0.1.jar"

diff --git 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.4.0.jar"
+path = "../compiler-plugin/build/libs/oracledb-compiler-plugin-1.5.0-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -250,7 +250,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.0.4"
+version = "1.0.5"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
@@ -278,7 +278,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "sql"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -369,7 +369,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "oracledb"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "file"},

diff --git a/ballerina/tests/02-execute-basic-test.bal b/ballerina/tests/02-execute-basic-test.bal
@@ -129,8 +129,8 @@ isolated function testInsertAndSelectTableWithGeneratedKeys() returns sql:Error?
     string|int? insertedId = result.lastInsertId;
     if insertedId is string {
         sql:ParameterizedQuery query = `SELECT * from TestNumericTable where col_number = 31`;
-        stream<NumericRecord, sql:Error?> streamData = oracledbClient->query(query);
-        record {|NumericRecord value;|}? data = check streamData.next();
+        stream<record {}, sql:Error?> streamData = oracledbClient->query(query);
+        record {|record {} value;|}? data = check streamData.next();
         check streamData.close();
         test:assertNotExactEquals(data?.value, (), "Incorrect InsertId returned.");
     } else {
@@ -151,8 +151,8 @@ isolated function testInsertWithAllNilAndSelectTableWithGeneratedKeys() returns
     string|int? insertedId = result.lastInsertId;
     if insertedId is string {
         sql:ParameterizedQuery query = `SELECT * from TestNumericTable where id = 2`;
-        stream<NumericRecord, sql:Error?> streamData = oracledbClient->query(query);
-        record {|NumericRecord value;|}? data = check streamData.next();
+        stream<record {}, sql:Error?> streamData = oracledbClient->query(query);
+        record {|record {} value;|}? data = check streamData.next();
         check streamData.close();
         test:assertNotExactEquals(data?.value, (), "Incorrect InsertId returned.");
     } else {

diff --git 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.1.0"
+distribution = "2201.2.0"
 
 [[platform.java11.dependency]]
 path = "../native/build/libs/[email protected]@.jar"

diff --git a/changelog.md b/changelog.md
@@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - [Change default username for client initialization to `sys`](https://github.com/ballerina-platform/ballerina-standard-library/issues/2397)
 
+## [1.4.1] - 2022-06-27
+
+### Changed
+- [Fix NullPointerException when retrieving record with default value](https://github.com/ballerina-platform/ballerina-standard-library/issues/2985)
+
 ## [1.4.0] - 2022-05-30
 
 ### Added

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=io.ballerina.stdlib
-version=1.4.1-SNAPSHOT
+version=1.5.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.1.0
+ballerinaLangVersion=2201.2.0-20220613-141500-29439ddf
 
-stdlibSqlVersion=1.4.0
+stdlibSqlVersion=1.5.0-20220701-115900-61cf131
 
 stdlibIoVersion=1.2.2
 stdlibRegexVersion=1.3.0