Fix merge conflicts

ballerina-platform · Mar 10, 2025 · 9d831f7 · 9d831f7
2 parents b5fbad6 + e2fa2c1
commit 9d831f7
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 82 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,31 +1,31 @@
 [package]
 org = "ballerinax"
 name = "persist.sql"
-version = "1.5.1"
+version = "1.6.0"
 authors = ["Ballerina"]
 keywords = ["persist", "sql", "mysql", "mssql", "sql-server"]
 repository = "https://github.com/ballerina-platform/module-ballerinax-persist.sql"
 icon = "icon.png"
 license = ["Apache-2.0"]
-distribution = "2201.11.0"
+distribution = "2201.12.0"
 
 [platform.java21]
 graalvmCompatible = true
 
 [[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "persist.sql-native"
-version = "1.5.1"
-path = "../native/build/libs/persist.sql-native-1.5.1-SNAPSHOT.jar"
+version = "1.6.0"
+path = "../native/build/libs/persist.sql-native-1.6.0-SNAPSHOT.jar"
 
 [[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "persist-native"
-version = "1.5.0"
-path = "./lib/persist-native-1.5.0.jar"
+version = "1.6.0"
+path = "./lib/persist-native-1.6.0-20250305-165700-4c89ca9.jar"
 
 [[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "sql-native"
-version = "1.15.0"
-path = "./lib/sql-native-1.15.0.jar"
+version = "1.16.0-20250306-064600-ff83996"
+path = "./lib/sql-native-1.16.0-20250306-064600-ff83996.jar"
diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,10 +3,10 @@ id = "persist.sql-compiler-plugin"
 class = "io.ballerina.stdlib.persist.sql.compiler.PersistSqlCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/persist.sql-compiler-plugin-1.5.1-SNAPSHOT.jar"
+path = "../compiler-plugin/build/libs/persist.sql-compiler-plugin-1.6.0-SNAPSHOT.jar"
 
 [[dependency]]
-path = "./lib/persist-native-1.5.0.jar"
+path = "./lib/persist-native-1.6.0-20250305-165700-4c89ca9.jar"
 
 [[dependency]]
-path = "./lib/persist-compiler-plugin-1.5.0.jar"
+path = "./lib/persist-compiler-plugin-1.6.0-20250305-165700-4c89ca9.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -5,12 +5,12 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.11.0"
+distribution-version = "2201.12.0-20250228-201300-8d411a0f"
 
 [[package]]
 org = "ballerina"
 name = "auth"
-version = "2.13.0"
+version = "2.14.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
@@ -23,7 +23,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "cache"
-version = "3.9.0"
+version = "3.10.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "constraint"},
@@ -35,7 +35,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "constraint"
-version = "1.6.0"
+version = "1.7.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
@@ -44,7 +44,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "crypto"
-version = "2.8.0"
+version = "2.9.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
@@ -54,7 +54,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "data.jsondata"
-version = "1.0.0"
+version = "1.1.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
@@ -64,7 +64,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "file"
-version = "1.11.0"
+version = "1.12.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "io"},
@@ -76,7 +76,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.13.5"
+version = "2.14.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -106,7 +106,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.7.0"
+version = "1.8.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.value"}
@@ -123,7 +123,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "jwt"
-version = "2.14.0"
+version = "2.15.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "cache"},
@@ -238,7 +238,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "log"
-version = "2.11.0"
+version = "2.12.0"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -252,7 +252,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "mime"
-version = "2.11.0"
+version = "2.12.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "io"},
@@ -264,7 +264,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "oauth2"
-version = "2.13.0"
+version = "2.14.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "cache"},
@@ -278,15 +278,15 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "os"
-version = "1.9.0"
+version = "1.10.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "io"},
@@ -296,7 +296,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "persist"
-version = "1.5.0"
+version = "1.6.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -307,7 +307,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "sql"
-version = "1.15.0"
+version = "1.16.0"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -321,7 +321,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "task"
-version = "2.6.0"
+version = "2.7.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
@@ -345,7 +345,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "time"
-version = "2.6.0"
+version = "2.7.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -356,7 +356,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "url"
-version = "2.5.0"
+version = "2.6.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
@@ -365,7 +365,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "uuid"
-version = "1.9.0"
+version = "1.10.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
@@ -408,7 +408,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "java.jdbc"
-version = "1.13.0"
+version = "1.14.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "io"},
@@ -424,7 +424,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "mssql"
-version = "1.14.0"
+version = "1.15.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
@@ -448,7 +448,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "mysql"
-version = "1.14.0"
+version = "1.15.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
@@ -473,7 +473,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "persist.sql"
-version = "1.5.1"
+version = "1.6.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "log"},
@@ -498,7 +498,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "postgresql"
-version = "1.14.0"
+version = "1.15.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "crypto"},

diff --git a/ballerina/tests/h2_hospital_with_schema_tests.bal b/ballerina/tests/h2_hospital_with_schema_tests.bal
@@ -102,7 +102,7 @@ function testCreateAppointmentAlreadyExistsH2WithSchema() returns error? {
         reason: "Headache"
     };
     int[]|persist:Error res = h2DbHospital->/appointments.post([appointment]);
-    if !(res is persist:AlreadyExistsError) {
+    if res !is persist:AlreadyExistsError {
         test:assertFail("Appointment should not be created");
     }
 }
@@ -139,7 +139,7 @@ function testGetPatientByIdH2WithSchema() returns error? {
 function testGetPatientNotFoundH2WithSchema() returns error? {
     H2HospitalWithSchemaClient h2DbHospital = check new ();
     Patient|persist:Error patient = h2DbHospital->/patients/[10].get();
-    if !(patient is persist:NotFoundError) {
+    if patient !is persist:NotFoundError {
         test:assertFail("Patient should be not found");
     }
 }
@@ -299,7 +299,7 @@ function testPatchAppointmentH2WithSchema() returns error? {
     ];
     test:assertEquals(filteredAppointments, expected, "Appointment details should be updated");
     Appointment|persist:Error result2 = h2DbHospital->/appointments/[0].put({status: "STARTED"});
-    if !(result2 is persist:NotFoundError) {
+    if result2 !is persist:NotFoundError {
         test:assertFail("Appointment should not be found");
     }
 }
@@ -317,7 +317,7 @@ function testDeleteAppointmentByPatientIdH2WithSchema() returns error? {
                 && appointment.appointmentTime.month == 5
                 && appointment.appointmentTime.day == 31
         select appointment;
-    if (result is persist:Error) {
+    if result is persist:Error {
         test:assertFail("Appointment should be found");
     }
     foreach Appointment appointment in result {

diff --git a/ballerina/tests/mssql_hospital_with_schema_persist_client.bal b/ballerina/tests/mssql_hospital_with_schema_persist_client.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2024 WSO2 LLC. (http://www.wso2.com).
+// Copyright (c) 2025 WSO2 LLC. (http://www.wso2.com).
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/tests/mssql_hospital_with_schema_tests.bal b/ballerina/tests/mssql_hospital_with_schema_tests.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2024 WSO2 LLC. (http://www.wso2.com).
+// Copyright (c) 2025 WSO2 LLC. (http://www.wso2.com).
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except
@@ -17,7 +17,6 @@
 import ballerina/persist;
 import ballerina/test;
 
-
 @test:Config{
   groups: ["annotation", "mssql", "schema"]
 }
@@ -62,7 +61,7 @@ function testCreateDoctorAlreadyExistsMsSqlWithSchema() returns error? {
       salary: 20000.00
     };
     int[]|persist:Error res = mssqlDbHospital->/doctors.post([doctor]);
-    if !(res is persist:AlreadyExistsError) {
+    if res !is persist:AlreadyExistsError {
         test:assertFail("Doctor should not be created");
     }
 }
@@ -99,7 +98,7 @@ function testCreateAppointmentAlreadyExistsMsSqlWithSchema() returns error? {
       reason: "Headache"
     };
     int[]|persist:Error res = mssqlDbHospital->/appointments.post([appointment]);
-    if !(res is persist:AlreadyExistsError) {
+    if res !is persist:AlreadyExistsError {
         test:assertFail("Appointment should not be created");
     }
 }
@@ -135,7 +134,7 @@ function testGetPatientByIdMsSqlWithSchema() returns error? {
 function testGetPatientNotFoundMsSqlWithSchema() returns error? {
     MsSqlHospitalWithSchemaClient mssqlDbHospital = check new();
     Patient|persist:Error patient = mssqlDbHospital->/patients/[10].get();
-    if !(patient is persist:NotFoundError) {
+    if patient !is persist:NotFoundError {
         test:assertFail("Patient should be not found");
     }
 }
@@ -295,7 +294,7 @@ function testPatchAppointmentMsSqlWithSchema() returns error? {
     ];        
     test:assertEquals(filteredAppointments, expected, "Appointment details should be updated");
     Appointment|persist:Error result2 = mssqlDbHospital->/appointments/[0].put({status: "STARTED"});
-    if !(result2 is persist:NotFoundError) {
+    if result2 !is persist:NotFoundError {
         test:assertFail("Appointment should not be found");
     }
 }
@@ -313,7 +312,7 @@ function testDeleteAppointmentByPatientIdMsSqlWithSchema() returns error? {
                 && appointment.appointmentTime.month == 7
                 && appointment.appointmentTime.day == 1
             select appointment;
-    if (result is persist:Error) {
+    if result is persist:Error {
         test:assertFail("Appointment should be found");
     }
     foreach Appointment appointment in result {
@@ -340,7 +339,7 @@ function testDeletePatientMsSqlWithSchema() returns error? {
     MsSqlHospitalWithSchemaClient mssqlDbHospital = check new();
     Patient|persist:Error result = mssqlDbHospital->/patients/[1].delete();
     if result is persist:Error {
-            test:assertFail("Patient should be deleted");
+        test:assertFail("Patient should be deleted");
     }
 }