Skip to content

Commit 99a7d7d

Browse files
kyleconroyclaude
andauthored
Upgrade marino to v0.3.0 (#4576)
* Upgrade sqlc-dev/marino to v0.3.0 * endtoend: cover MySQL syntax newly supported by marino v0.3.0 JSON_TABLE in schema files, expression DEFAULTs like (UTC_TIMESTAMP()) and (CURRENT_TIMESTAMP + INTERVAL 30 DAY), and trigger/function/ procedure/event DDL in MySQL schemas. --------- Co-authored-by: Claude <noreply@anthropic.com>
1 parent c391f1f commit 99a7d7d

20 files changed

Lines changed: 295 additions & 3 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/spf13/cobra v1.10.2
2020
github.com/spf13/pflag v1.0.10
2121
github.com/sqlc-dev/doubleclick v1.0.0
22-
github.com/sqlc-dev/marino v0.2.0
22+
github.com/sqlc-dev/marino v0.3.0
2323
github.com/sqlc-dev/meyer v0.1.1
2424
github.com/sqlc-dev/oliphant v0.1.0
2525
github.com/sqlc-dev/teesql v1.1.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
6767
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
6868
github.com/sqlc-dev/doubleclick v1.0.0 h1:2/OApfQ2eLgcfa/Fqs8WSMA6atH0G8j9hHbQIgMfAXI=
6969
github.com/sqlc-dev/doubleclick v1.0.0/go.mod h1:ODHRroSrk/rr5neRHlWMSRijqOak8YmNaO3VAZCNl5Y=
70-
github.com/sqlc-dev/marino v0.2.0 h1:sPGDuaiO+NCY5Nf++u9+nCVTQ2/Euj8pE7Xmf/D4x64=
71-
github.com/sqlc-dev/marino v0.2.0/go.mod h1:mQxC2dgDE0DWHMb2B5jZNk7KToJuS6wnxnffBfYnq08=
70+
github.com/sqlc-dev/marino v0.3.0 h1:e9cinBXJFFa3yRpokYNNinWvkewgd6XVDgnlG0bOmTw=
71+
github.com/sqlc-dev/marino v0.3.0/go.mod h1:mQxC2dgDE0DWHMb2B5jZNk7KToJuS6wnxnffBfYnq08=
7272
github.com/sqlc-dev/meyer v0.1.1 h1:BAeZcfgLyTnk9f90DyGEKXPrHxtgvVD/DTM6awq2kUY=
7373
github.com/sqlc-dev/meyer v0.1.1/go.mod h1:pS4USCRf/SLjWtaMcnTo4YrEEFKBj8CyyqlxcVUJQH8=
7474
github.com/sqlc-dev/oliphant v0.1.0 h1:RAsO6BMitIzB2+swx/qzUR5nf6w4cQ1abgHIu+Fgppo=

‎internal/endtoend/testdata/mysql_ddl_routines/mysql/go/db.go‎

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/mysql_ddl_routines/mysql/go/models.go‎

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/mysql_ddl_routines/mysql/go/query.sql.go‎

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- name: GetCollection :one
2+
SELECT id, updated_at FROM collections WHERE id = ?;
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
CREATE TABLE collections (
2+
id BIGINT PRIMARY KEY,
3+
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
4+
);
5+
6+
CREATE TRIGGER update_timestamp_collections BEFORE UPDATE ON collections FOR EACH ROW SET NEW.updated_at = CURRENT_TIMESTAMP;
7+
8+
CREATE FUNCTION uuidv4() RETURNS CHAR(36) NO SQL RETURN LOWER(HEX(RANDOM_BYTES(4)));
9+
10+
CREATE PROCEDURE touch_collections() UPDATE collections SET updated_at = NOW();
11+
12+
CREATE EVENT clear_stale_collections ON SCHEDULE EVERY 1 HOUR DO DELETE FROM collections WHERE updated_at < CURRENT_TIMESTAMP - INTERVAL 30 DAY;
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "1",
3+
"packages": [
4+
{
5+
"path": "go",
6+
"sql_package": "database/sql",
7+
"sql_driver": "github.com/go-sql-driver/mysql",
8+
"engine": "mysql",
9+
"name": "querytest",
10+
"schema": "schema.sql",
11+
"queries": "query.sql"
12+
}
13+
]
14+
}

‎internal/endtoend/testdata/mysql_default_expression/mysql/go/db.go‎

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/mysql_default_expression/mysql/go/models.go‎

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)