Skip to content

Commit a04a2ee

Browse files
authored
Merge pull request #363 from cashapp/prudhvi.go-mysql_bump
Upgrade go-mysql version to v1.9.1
2 parents 72b6acb + cd689ec commit a04a2ee

15 files changed

+8
-373
lines changed

.github/workflows/buildandrun.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/mysql8.0.28.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/mysql8.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/mysql84.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/mysql8_rbr_minimal.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

DEVELOPMENT.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,16 @@ The tests require a MySQL server to run. If you have MySQL installed locally, yo
99
```bash
1010
MYSQL_DSN="root:mypassword@tcp(127.0.0.1:3306)/test" go test -v ./...
1111
```
12+
If the `MYSQL_DSN` is not specified, it currently defaults to `msandbox:msandbox@tcp(127.0.0.1:8030)/test`. This may change in the future.
1213

13-
### Install dbdeployer
14-
15-
We use (and recommend) [dbdeployer](https://github.com/datacharmer/dbdeployer) for running the tests against multiple MySQL versions at once. For example, with MySQL 8.0.32 installed from dbdeployer:
1614

15+
### Running tests with docker on specific MySQL version
1716
```bash
18-
# deploy 8.0.32
19-
dbdeployer deploy single 8.0.32
20-
# Running tests
21-
MYSQL_DSN="msandbox:msandbox@tcp(127.0.0.1:8032)/test" go test -v ./...
17+
cd compose/
18+
docker compose down --volumes && docker compose up -f compose.yml -f 8.0.28.yml
19+
docker compose up mysql test --abort-on-container-exit
2220
```
2321

24-
If the `MYSQL_DSN` is not specified, it currently defaults to `msandbox:msandbox@tcp(127.0.0.1:8030)/test`. This may change in the future.
25-
2622
## Running linter
2723

2824
```bash

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.0
44

55
require (
66
github.com/alecthomas/kong v0.7.1
7-
github.com/go-mysql-org/go-mysql v1.8.1-0.20240805131754-ccf204bf2b2a
7+
github.com/go-mysql-org/go-mysql v1.9.1
88
github.com/go-sql-driver/mysql v1.7.1
99
github.com/pingcap/errors v0.11.5-0.20221009092201-b66cddb77c32
1010
github.com/pingcap/tidb/pkg/parser v0.0.0-20231103042308-035ad5ccbe67

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
1717
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1818
github.com/go-mysql-org/go-mysql v1.8.1-0.20240805131754-ccf204bf2b2a h1:VO6kiE9ex1uNaCCgDz/q0EhTueLrr3vmxkjJpU2x6pk=
1919
github.com/go-mysql-org/go-mysql v1.8.1-0.20240805131754-ccf204bf2b2a/go.mod h1:+SgFgTlqjqOQoMc98n9oyUWEgn2KkOL1VmXDoq2ONOs=
20+
github.com/go-mysql-org/go-mysql v1.9.1 h1:W2ZKkHkoM4mmkasJCoSYfaE4RQNxXTb6VqiaMpKFrJc=
21+
github.com/go-mysql-org/go-mysql v1.9.1/go.mod h1:+SgFgTlqjqOQoMc98n9oyUWEgn2KkOL1VmXDoq2ONOs=
2022
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
2123
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
2224
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=

scripts/dbdeployer_install_8.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

scripts/dbdeployer_install_8028.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)