From 2664fb4922971cb72c91936ed4e18728e5bb004d Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Mon, 10 Mar 2025 19:07:00 +0530 Subject: [PATCH 1/5] [Automated] Update native jar versions in toml files --- ballerina/Ballerina.toml | 6 +++--- ballerina/CompilerPlugin.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index e40f2c8..7a2e8cf 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerinax" name = "persist.sql" -version = "1.5.0" +version = "1.5.1" authors = ["Ballerina"] keywords = ["persist", "sql", "mysql", "mssql", "sql-server"] repository = "https://github.com/ballerina-platform/module-ballerinax-persist.sql" @@ -15,8 +15,8 @@ graalvmCompatible = true [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "persist.sql-native" -version = "1.5.0" -path = "../native/build/libs/persist.sql-native-1.5.0.jar" +version = "1.5.1" +path = "../native/build/libs/persist.sql-native-1.5.1-SNAPSHOT.jar" [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index fd93622..f085f0f 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,7 +3,7 @@ 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.0.jar" +path = "../compiler-plugin/build/libs/persist.sql-compiler-plugin-1.5.1-SNAPSHOT.jar" [[dependency]] path = "./lib/persist-native-1.5.0.jar" From 4c3f7795c9f60815837ec3250238be5dbaeb7dbe Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Mon, 10 Mar 2025 19:16:10 +0530 Subject: [PATCH 2/5] [Automated] Update native jar versions in toml files --- ballerina/Dependencies.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 6eb49d5..c5606b2 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -76,7 +76,7 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.13.3" +version = "2.13.5" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, @@ -473,7 +473,7 @@ modules = [ [[package]] org = "ballerinax" name = "persist.sql" -version = "1.5.0" +version = "1.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "log"}, From b5fbad646a8dbbb1a815cc9a1f3ffe67d3be2858 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Mon, 10 Mar 2025 22:58:25 +0530 Subject: [PATCH 3/5] Change the generate client code --- ballerina/tests/h2_hospital_persist_client.bal | 14 +++++++------- .../h2_hospital_with_schema_persist_client.bal | 14 +++++++------- ballerina/tests/mssql_hospital_persist_client.bal | 14 +++++++------- .../mssql_hospital_with_schema_persist_client.bal | 12 ++++++------ .../tests/postgresql_hospital_persist_client.bal | 14 +++++++------- ...tgresql_hospital_with_schema_persist_client.bal | 14 +++++++------- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/ballerina/tests/h2_hospital_persist_client.bal b/ballerina/tests/h2_hospital_persist_client.bal index e8a689a..e9ddc18 100644 --- a/ballerina/tests/h2_hospital_persist_client.bal +++ b/ballerina/tests/h2_hospital_persist_client.bal @@ -116,15 +116,15 @@ public isolated client class H2HospitalClient { foreach string key in self.metadata.keys() { SQLMetadata metadata = self.metadata.get(key); if metadata.schemaName == () { - metadata.schemaName = h2.defaultSchema; + metadata.schemaName = mssqlWithSchema.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; - if joinMetadataMap != () { - foreach string joinKey in joinMetadataMap.keys() { - JoinMetadata joinMetadata = joinMetadataMap.get(joinKey); - if joinMetadata.refSchema == () { - joinMetadata.refSchema = h2.defaultSchema; - } + if joinMetadataMap == () { + continue; + } + foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { + if joinMetadata.refSchema == () { + joinMetadata.refSchema = mssqlWithSchema.defaultSchema; } } } diff --git a/ballerina/tests/h2_hospital_with_schema_persist_client.bal b/ballerina/tests/h2_hospital_with_schema_persist_client.bal index 444af25..19d5931 100644 --- a/ballerina/tests/h2_hospital_with_schema_persist_client.bal +++ b/ballerina/tests/h2_hospital_with_schema_persist_client.bal @@ -117,15 +117,15 @@ public isolated client class H2HospitalWithSchemaClient { foreach string key in self.metadata.keys() { SQLMetadata metadata = self.metadata.get(key); if metadata.schemaName == () { - metadata.schemaName = h2WithSchema.defaultSchema; + metadata.schemaName = mssqlWithSchema.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; - if joinMetadataMap != () { - foreach string joinKey in joinMetadataMap.keys() { - JoinMetadata joinMetadata = joinMetadataMap.get(joinKey); - if joinMetadata.refSchema == () { - joinMetadata.refSchema = h2WithSchema.defaultSchema; - } + if joinMetadataMap == () { + continue; + } + foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { + if joinMetadata.refSchema == () { + joinMetadata.refSchema = mssqlWithSchema.defaultSchema; } } } diff --git a/ballerina/tests/mssql_hospital_persist_client.bal b/ballerina/tests/mssql_hospital_persist_client.bal index b89bcd6..36282c7 100644 --- a/ballerina/tests/mssql_hospital_persist_client.bal +++ b/ballerina/tests/mssql_hospital_persist_client.bal @@ -116,15 +116,15 @@ public isolated client class MsSqlHospitalClient { foreach string key in self.metadata.keys() { SQLMetadata metadata = self.metadata.get(key); if metadata.schemaName == () { - metadata.schemaName = mssql.defaultSchema; + metadata.schemaName = mssqlWithSchema.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; - if joinMetadataMap != () { - foreach string joinKey in joinMetadataMap.keys() { - JoinMetadata joinMetadata = joinMetadataMap.get(joinKey); - if joinMetadata.refSchema == () { - joinMetadata.refSchema = mssql.defaultSchema; - } + if joinMetadataMap == () { + continue; + } + foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { + if joinMetadata.refSchema == () { + joinMetadata.refSchema = mssqlWithSchema.defaultSchema; } } } diff --git a/ballerina/tests/mssql_hospital_with_schema_persist_client.bal b/ballerina/tests/mssql_hospital_with_schema_persist_client.bal index 5014d2e..2d6b26a 100644 --- a/ballerina/tests/mssql_hospital_with_schema_persist_client.bal +++ b/ballerina/tests/mssql_hospital_with_schema_persist_client.bal @@ -120,12 +120,12 @@ public isolated client class MsSqlHospitalWithSchemaClient { metadata.schemaName = mssqlWithSchema.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; - if joinMetadataMap != () { - foreach string joinKey in joinMetadataMap.keys() { - JoinMetadata joinMetadata = joinMetadataMap.get(joinKey); - if joinMetadata.refSchema == () { - joinMetadata.refSchema = mssqlWithSchema.defaultSchema; - } + if joinMetadataMap == () { + continue; + } + foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { + if joinMetadata.refSchema == () { + joinMetadata.refSchema = mssqlWithSchema.defaultSchema; } } } diff --git a/ballerina/tests/postgresql_hospital_persist_client.bal b/ballerina/tests/postgresql_hospital_persist_client.bal index 41365c8..f90c2f4 100644 --- a/ballerina/tests/postgresql_hospital_persist_client.bal +++ b/ballerina/tests/postgresql_hospital_persist_client.bal @@ -116,15 +116,15 @@ public isolated client class PostgreSqlHospitalClient { foreach string key in self.metadata.keys() { SQLMetadata metadata = self.metadata.get(key); if metadata.schemaName == () { - metadata.schemaName = postgresql.defaultSchema; + metadata.schemaName = mssqlWithSchema.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; - if joinMetadataMap != () { - foreach string joinKey in joinMetadataMap.keys() { - JoinMetadata joinMetadata = joinMetadataMap.get(joinKey); - if joinMetadata.refSchema == () { - joinMetadata.refSchema = postgresql.defaultSchema; - } + if joinMetadataMap == () { + continue; + } + foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { + if joinMetadata.refSchema == () { + joinMetadata.refSchema = mssqlWithSchema.defaultSchema; } } } diff --git a/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal b/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal index 1cb303c..49af051 100644 --- a/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal +++ b/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal @@ -117,15 +117,15 @@ public isolated client class PostgreSqlHospitalWithSchemaClient { foreach string key in self.metadata.keys() { SQLMetadata metadata = self.metadata.get(key); if metadata.schemaName == () { - metadata.schemaName = postgresqlWithSchema.defaultSchema; + metadata.schemaName = mssqlWithSchema.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; - if joinMetadataMap != () { - foreach string joinKey in joinMetadataMap.keys() { - JoinMetadata joinMetadata = joinMetadataMap.get(joinKey); - if joinMetadata.refSchema == () { - joinMetadata.refSchema = postgresqlWithSchema.defaultSchema; - } + if joinMetadataMap == () { + continue; + } + foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { + if joinMetadata.refSchema == () { + joinMetadata.refSchema = mssqlWithSchema.defaultSchema; } } } From 133c21d2fe9822a66c017c0b387ded9090ffc285 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Mon, 10 Mar 2025 23:04:02 +0530 Subject: [PATCH 4/5] Apply suggestions from code review --- ballerina/tests/h2_hospital_persist_client.bal | 4 ++-- ballerina/tests/postgresql_hospital_persist_client.bal | 4 ++-- .../tests/postgresql_hospital_with_schema_persist_client.bal | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ballerina/tests/h2_hospital_persist_client.bal b/ballerina/tests/h2_hospital_persist_client.bal index e9ddc18..bf258e8 100644 --- a/ballerina/tests/h2_hospital_persist_client.bal +++ b/ballerina/tests/h2_hospital_persist_client.bal @@ -116,7 +116,7 @@ public isolated client class H2HospitalClient { foreach string key in self.metadata.keys() { SQLMetadata metadata = self.metadata.get(key); if metadata.schemaName == () { - metadata.schemaName = mssqlWithSchema.defaultSchema; + metadata.schemaName = h2.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; if joinMetadataMap == () { @@ -124,7 +124,7 @@ public isolated client class H2HospitalClient { } foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { if joinMetadata.refSchema == () { - joinMetadata.refSchema = mssqlWithSchema.defaultSchema; + joinMetadata.refSchema = h2.defaultSchema; } } } diff --git a/ballerina/tests/postgresql_hospital_persist_client.bal b/ballerina/tests/postgresql_hospital_persist_client.bal index f90c2f4..c2d368e 100644 --- a/ballerina/tests/postgresql_hospital_persist_client.bal +++ b/ballerina/tests/postgresql_hospital_persist_client.bal @@ -116,7 +116,7 @@ public isolated client class PostgreSqlHospitalClient { foreach string key in self.metadata.keys() { SQLMetadata metadata = self.metadata.get(key); if metadata.schemaName == () { - metadata.schemaName = mssqlWithSchema.defaultSchema; + metadata.schemaName = postgresql.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; if joinMetadataMap == () { @@ -124,7 +124,7 @@ public isolated client class PostgreSqlHospitalClient { } foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { if joinMetadata.refSchema == () { - joinMetadata.refSchema = mssqlWithSchema.defaultSchema; + joinMetadata.refSchema = postgresql.defaultSchema; } } } diff --git a/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal b/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal index edc907e..bef6e36 100644 --- a/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal +++ b/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal @@ -117,7 +117,7 @@ public isolated client class PostgreSqlHospitalWithSchemaClient { foreach string key in self.metadata.keys() { SQLMetadata metadata = self.metadata.get(key); if metadata.schemaName == () { - metadata.schemaName = mssqlWithSchema.defaultSchema; + metadata.schemaName = postgresqlWithSchema.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; if joinMetadataMap == () { @@ -125,7 +125,7 @@ public isolated client class PostgreSqlHospitalWithSchemaClient { } foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { if joinMetadata.refSchema == () { - joinMetadata.refSchema = mssqlWithSchema.defaultSchema; + joinMetadata.refSchema = postgresqlWithSchema.defaultSchema; } } } From 7cc70588843671bf55b11e82c4d3e5a0ce3c7b96 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Mon, 10 Mar 2025 23:05:37 +0530 Subject: [PATCH 5/5] Apply suggestions from code review --- ballerina/tests/h2_hospital_with_schema_persist_client.bal | 4 ++-- ballerina/tests/mssql_hospital_persist_client.bal | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ballerina/tests/h2_hospital_with_schema_persist_client.bal b/ballerina/tests/h2_hospital_with_schema_persist_client.bal index 19d5931..134eeb4 100644 --- a/ballerina/tests/h2_hospital_with_schema_persist_client.bal +++ b/ballerina/tests/h2_hospital_with_schema_persist_client.bal @@ -117,7 +117,7 @@ public isolated client class H2HospitalWithSchemaClient { foreach string key in self.metadata.keys() { SQLMetadata metadata = self.metadata.get(key); if metadata.schemaName == () { - metadata.schemaName = mssqlWithSchema.defaultSchema; + metadata.schemaName = h2WithSchema.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; if joinMetadataMap == () { @@ -125,7 +125,7 @@ public isolated client class H2HospitalWithSchemaClient { } foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { if joinMetadata.refSchema == () { - joinMetadata.refSchema = mssqlWithSchema.defaultSchema; + joinMetadata.refSchema = h2WithSchema.defaultSchema; } } } diff --git a/ballerina/tests/mssql_hospital_persist_client.bal b/ballerina/tests/mssql_hospital_persist_client.bal index 36282c7..22cd242 100644 --- a/ballerina/tests/mssql_hospital_persist_client.bal +++ b/ballerina/tests/mssql_hospital_persist_client.bal @@ -116,7 +116,7 @@ public isolated client class MsSqlHospitalClient { foreach string key in self.metadata.keys() { SQLMetadata metadata = self.metadata.get(key); if metadata.schemaName == () { - metadata.schemaName = mssqlWithSchema.defaultSchema; + metadata.schemaName = mssql.defaultSchema; } map? joinMetadataMap = metadata.joinMetadata; if joinMetadataMap == () { @@ -124,7 +124,7 @@ public isolated client class MsSqlHospitalClient { } foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() { if joinMetadata.refSchema == () { - joinMetadata.refSchema = mssqlWithSchema.defaultSchema; + joinMetadata.refSchema = mssql.defaultSchema; } } }