Skip to content

Commit

Permalink
Merge branch 'master' into default-user
Browse files Browse the repository at this point in the history
  • Loading branch information
kaneeldias authored Jun 3, 2022
2 parents e7fd9de + adbd309 commit 7eb8260
Show file tree
Hide file tree
Showing 14 changed files with 205 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/central-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
scan-type: 'fs'
scan-type: 'rootfs'
scan-ref: '/github/workspace/ballerina/lib'
format: 'table'
timeout: '10m0s'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
scan-type: 'fs'
scan-type: 'rootfs'
scan-ref: '/github/workspace/ballerina/lib'
format: 'table'
timeout: '10m0s'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
scan-type: 'fs'
scan-type: 'rootfs'
scan-ref: '/github/workspace/ballerina/lib'
format: 'table'
timeout: '10m0s'
Expand Down
6 changes: 3 additions & 3 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ keywords = ["database", "client", "network", "SQL", "RDBMS", "MySQL"]
repository = "https://github.com/ballerina-platform/module-ballerinax-mysql"
icon = "icon.png"
license = ["Apache-2.0"]
distribution = "2201.0.1"
distribution = "2201.1.0"

[[platform.java11.dependency]]
path = "../native/build/libs/mysql-native-1.4.0-SNAPSHOT.jar"
path = "../native/build/libs/mysql-native-1.4.0.jar"

[[platform.java11.dependency]]
path = "./lib/sql-native-1.4.0-20220324-122700-70834a7.jar"
path = "./lib/sql-native-1.4.0.jar"

[[platform.java11.dependency]]
path = "./lib/mysql-connector-java-8.0.21.jar"
Expand Down
2 changes: 1 addition & 1 deletion ballerina/CompilerPlugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ id = "mysql-compiler-plugin"
class = "io.ballerina.stdlib.mysql.compiler.MySQLCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/mysql-compiler-plugin-1.4.0-SNAPSHOT.jar"
path = "../compiler-plugin/build/libs/mysql-compiler-plugin-1.4.0.jar"
41 changes: 22 additions & 19 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies-toml-version = "2"
[[package]]
org = "ballerina"
name = "auth"
version = "2.2.1"
version = "2.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "crypto"},
Expand All @@ -23,7 +23,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "cache"
version = "3.2.1"
version = "3.2.2"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -34,7 +34,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "crypto"
version = "2.2.1"
version = "2.2.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "time"}
Expand All @@ -46,9 +46,10 @@ modules = [
[[package]]
org = "ballerina"
name = "file"
version = "1.2.1"
version = "1.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "log"},
{org = "ballerina", name = "os"},
Expand All @@ -62,7 +63,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http"
version = "2.2.1"
version = "2.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "auth"},
Expand Down Expand Up @@ -90,7 +91,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "io"
version = "1.2.1"
version = "1.2.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.value"}
Expand All @@ -110,7 +111,7 @@ modules = [
[[package]]
org = "ballerina"
name = "jwt"
version = "2.2.1"
version = "2.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "cache"},
Expand Down Expand Up @@ -213,7 +214,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "log"
version = "2.2.1"
version = "2.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand All @@ -225,7 +226,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "mime"
version = "2.2.1"
version = "2.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand All @@ -236,7 +237,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "oauth2"
version = "2.2.1"
version = "2.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "cache"},
Expand All @@ -249,7 +250,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "observe"
version = "1.0.3"
version = "1.0.4"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
Expand All @@ -258,7 +259,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "os"
version = "1.2.1"
version = "1.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
Expand All @@ -267,10 +268,11 @@ dependencies = [
[[package]]
org = "ballerina"
name = "regex"
version = "1.2.1"
version = "1.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.string"}
]

[[package]]
Expand All @@ -290,7 +292,7 @@ modules = [
[[package]]
org = "ballerina"
name = "task"
version = "2.2.1"
version = "2.2.2"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -312,7 +314,7 @@ modules = [
[[package]]
org = "ballerina"
name = "time"
version = "2.2.1"
version = "2.2.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand All @@ -323,7 +325,7 @@ modules = [
[[package]]
org = "ballerina"
name = "url"
version = "2.2.1"
version = "2.2.2"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
Expand All @@ -332,13 +334,14 @@ dependencies = [
[[package]]
org = "ballerina"
name = "uuid"
version = "1.2.1"
version = "1.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "crypto"},
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.int"},
{org = "ballerina", name = "regex"}
{org = "ballerina", name = "regex"},
{org = "ballerina", name = "time"}
]

[[package]]
Expand Down
6 changes: 3 additions & 3 deletions ballerina/client.bal
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public isolated client class Client {

# Executes the query, which may return multiple results.
#
# + sqlQuery - The SQL query such as `` `SELECT * from Album WHERE name={albumName}` ``
# + sqlQuery - The SQL query such as `` `SELECT * from Album WHERE name=${albumName}` ``
# + rowType - The `typedesc` of the record to which the result needs to be returned
# + return - Stream of records in the `rowType` type
remote isolated function query(sql:ParameterizedQuery sqlQuery, typedesc<record {}> rowType = <>)
Expand All @@ -61,7 +61,7 @@ public isolated client class Client {
# Executes the query, which is expected to return at most one row of the result.
# If the query does not return any results, `sql:NoRowsError` is returned.
#
# + sqlQuery - The SQL query such as `` `SELECT * from Album WHERE name={albumName}` ``
# + sqlQuery - The SQL query such as `` `SELECT * from Album WHERE name=${albumName}` ``
# + returnType - The `typedesc` of the record to which the result needs to be returned.
# It can be a basic type if the query result contains only one column
# + return - Result in the `returnType` type or an `sql:Error`
Expand All @@ -73,7 +73,7 @@ public isolated client class Client {

# Executes the SQL query. Only the metadata of the execution is returned (not the results from the query).
#
# + sqlQuery - The SQL query such as `` `DELETE FROM Album WHERE artist={artistName}` ``
# + sqlQuery - The SQL query such as `` `DELETE FROM Album WHERE artist=${artistName}` ``
# + return - Metadata of the query execution as an `sql:ExecutionResult` or an `sql:Error`
remote isolated function execute(sql:ParameterizedQuery sqlQuery)
returns sql:ExecutionResult|sql:Error = @java:Method {
Expand Down
2 changes: 1 addition & 1 deletion build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ keywords = ["database", "client", "network", "SQL", "RDBMS", "MySQL"]
repository = "https://github.com/ballerina-platform/module-ballerinax-mysql"
icon = "icon.png"
license = ["Apache-2.0"]
distribution = "2201.0.1"
distribution = "2201.1.0"

[[platform.java11.dependency]]
path = "../native/build/libs/[email protected]@.jar"
Expand Down
10 changes: 9 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- [Improve DB columns to Ballerina record Mapping through Annotation](https://github.com/ballerina-platform/ballerina-standard-library/issues/2652)

### Changed
- [Change default username for client initialization to `root`](https://github.com/ballerina-platform/ballerina-standard-library/issues/2397)


## [1.4.0] - 2022-05-30

### Added
- [Improve DB columns to Ballerina record Mapping through Annotation](https://github.com/ballerina-platform/ballerina-standard-library/issues/2652)

### Changed
- [Fix incorrect code snippet in SQL api docs](https://github.com/ballerina-platform/ballerina-standard-library/issues/2931)

## [1.3.1] - 2022-03-01

### Changed
Expand Down
42 changes: 21 additions & 21 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=io.ballerina.stdlib
version=1.4.0-SNAPSHOT
version=1.4.1-SNAPSHOT

puppycrawlCheckstyleVersion=8.18
mySQLDriverVersion=8.0.21
Expand All @@ -11,26 +11,26 @@ researchgateReleaseVersion=2.8.0
testngVersion=7.4.0
ballerinaGradlePluginVersion=0.14.1

ballerinaLangVersion=2201.0.1
ballerinaLangVersion=2201.1.0

stdlibSqlVersion=1.4.0-20220324-122700-70834a7
stdlibSqlVersion=1.4.0

stdlibIoVersion=1.2.1
stdlibRegexVersion=1.2.1
stdlibOsVersion=1.2.1
stdlibTimeVersion=2.2.1
stdlibLogVersion=2.2.1
stdlibFileVersion=1.2.1
observeVersion=1.0.2
stdlibIoVersion=1.2.2
stdlibRegexVersion=1.3.0
stdlibOsVersion=1.3.0
stdlibTimeVersion=2.2.2
stdlibLogVersion=2.3.0
stdlibFileVersion=1.3.0
observeVersion=1.0.4

stdlibTransactionVersion=1.0.19
stdlibTaskVersion=2.2.1
stdlibCryptoVersion=2.2.1
stdlibUuidVersion=1.2.1
stdlibCacheVersion=3.2.1
stdlibMimeVersion=2.2.1
stdlibAuthVersion=2.2.1
stdlibJwtVersion=2.2.1
stdlibOAuth2Version=2.2.1
stdlibUrlVersion=2.2.1
stdlibHttpVersion=2.2.1
stdlibTransactionVersion=1.1.0
stdlibTaskVersion=2.2.2
stdlibCryptoVersion=2.2.2
stdlibUuidVersion=1.3.0
stdlibCacheVersion=3.2.2
stdlibMimeVersion=2.3.0
stdlibAuthVersion=2.3.0
stdlibJwtVersion=2.3.0
stdlibOAuth2Version=2.3.0
stdlibUrlVersion=2.2.2
stdlibHttpVersion=2.3.0
34 changes: 34 additions & 0 deletions load-tests/delete/results/summary.csv
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,37 @@ HTTP Request,929616,29,15,55,77,105,0,60062,0.00%,1847.8,252.5,521.16,1650592951
HTTP Request,1045817,26,15,49,58,82,0,60063,0.00%,1942.3,265.5,518.44,1650678106,50,60
HTTP Request,867123,32,16,66,84,106,0,60061,0.00%,1619.4,221.4,573.22,1650764519,50,60
HTTP Request,1137247,24,13,45,54,79,0,60060,0.00%,2140.5,292.5,497.17,1650850991,50,60
HTTP Request,967012,28,15,54,68,96,0,60066,0.00%,1950.6,266.6,535.76,1650942334,50,60
HTTP Request,4209357,4,1,8,15,54,0,682,100.00%,8771.0,2949.2,12.24,1651025571,50,60
HTTP Request,1130879,23,14,46,53,72,0,60060,0.00%,2248.9,307.4,478.99,1651112868,50,60
HTTP Request,999660,27,15,51,66,95,0,60066,0.00%,1938.7,265.0,533.74,1651198275,50,60
HTTP Request,1049163,26,14,49,61,93,0,60058,0.00%,2051.9,280.4,517.64,1651284358,50,60
HTTP Request,1085993,24,14,48,56,79,0,60062,0.00%,2078.8,284.1,488.85,1651371636,50,60
HTTP Request,1124171,24,14,47,54,73,0,60049,0.00%,2192.6,299.7,483.72,1651457169,50,60
HTTP Request,1128684,24,13,47,55,77,0,60076,0.00%,2186.8,298.9,486.11,1651543657,50,60
HTTP Request,1073522,25,14,48,58,85,0,60065,0.00%,2058.5,281.4,491.68,1651629922,50,60
HTTP Request,1097793,24,14,48,55,74,0,60068,0.00%,2113.0,288.8,489.54,1651716311,50,60
HTTP Request,762635,36,17,78,93,120,0,60074,1.11%,1478.6,204.5,615.44,1651801493,50,60
HTTP Request,1056259,25,14,49,61,89,0,60063,0.00%,2129.9,291.1,512.62,1651887820,50,60
HTTP Request,1058918,25,14,49,59,87,0,60059,0.00%,2028.2,277.2,505.25,1651974523,50,60
HTTP Request,1035692,26,15,50,59,82,0,60071,0.00%,2029.1,277.3,514.29,1652062068,50,60
HTTP Request,939047,29,16,54,70,99,0,60069,0.00%,1742.9,238.2,540.15,1652146808,50,60
HTTP Request,927847,29,17,53,64,91,1,60062,0.00%,1808.5,247.2,543.33,1652235097,50,60
HTTP Request,884304,31,17,56,71,99,0,60086,0.00%,1770.3,241.9,567.45,1652322140,50,60
HTTP Request,894573,30,16,58,76,101,0,60061,0.00%,1679.2,229.5,546.12,1652752650,50,60
HTTP Request,3363673,7,4,15,26,56,0,60053,87.48%,7010.0,1822.5,167.32,1652838123,50,60
HTTP Request,987829,27,14,53,65,91,0,60064,0.00%,1952.9,266.9,526.62,1653011969,50,60
HTTP Request,1797468,13,2,35,75,105,0,60097,78.63%,3347.1,981.5,323.86,1653096942,50,60
HTTP Request,1955370,12,2,31,58,99,0,60062,75.78%,3667.0,1055.7,304.39,1653184059,50,60
HTTP Request,883391,31,15,60,80,106,0,60119,3.98%,1654.2,237.5,568.12,1653270358,50,60
HTTP Request,1004503,27,15,51,60,84,0,60089,0.00%,1908.2,260.8,515.33,1653357904,50,60
HTTP Request,1763978,13,3,37,65,103,0,60070,73.23%,3286.1,929.0,329.93,1653444574,50,60
HTTP Request,997693,27,15,52,62,88,0,60064,0.00%,1940.0,265.2,506.45,1653530799,50,60
HTTP Request,872371,31,16,61,77,103,0,60061,0.00%,1672.4,228.6,564.10,1653616869,50,60
HTTP Request,997068,27,15,52,62,88,0,60059,0.00%,1943.9,265.7,520.72,1653703412,50,60
HTTP Request,776898,35,18,73,91,120,0,60110,0.00%,1495.3,204.4,601.86,1653790066,50,60
HTTP Request,963692,28,15,53,66,93,0,60063,0.00%,1789.5,244.6,529.67,1653876232,50,60
HTTP Request,921642,29,16,55,70,98,0,60061,0.00%,1759.3,240.4,537.99,1653962869,50,60
HTTP Request,1747415,13,2,37,70,104,0,60075,76.33%,3287.4,948.7,322.14,1654049867,50,60
HTTP Request,856605,32,17,63,81,104,0,60068,0.00%,1707.5,233.4,561.85,1654135491,50,60
HTTP Request,957245,28,15,53,65,93,0,60061,0.00%,1922.9,262.8,524.32,1654220591,50,60
Loading

0 comments on commit 7eb8260

Please sign in to comment.