Add MySQL 8.4 LTS and 9.x Innovation release support #16
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| run: | ||
| timeout: 5m | ||
|
|
||
| linters: | ||
| enable: | ||
| - errcheck | ||
| - govet | ||
| - ineffassign | ||
| - staticcheck | ||
| - unused | ||
| disable: | ||
| - depguard | ||
|
|
||
| linters-settings: | ||
| errcheck: | ||
| check-type-assertions: false | ||
|
|
||
| issues: | ||
| exclude-use-default: true | ||
| max-issues-per-linter: 50 | ||
| max-same-issues: 10 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -19,7 +19,7 @@ type GuessInfo struct { | |||||||||
| Url string | ||||||||||
| } | ||||||||||
|
|
||||||||||
| var allowedGuessVersions = []string{"5.7", "8.0", "8.4", "9.0", "9.1", "9.2"} | ||||||||||
|
There was a problem hiding this comment. Now that guessing is enabled for 8.4/9.x, the guessing code path still hard-codes the Linux extension override only for shortVersion=="8.0" (else it defaults to .tar.gz). Add coverage and/or logic to ensure guessed filenames/URLs use the correct extension and naming conventions for 8.4 and 9.x, otherwise guess-latest may generate URLs that don’t exist.
Suggested change
|
||||||||||
|
|
||||||||||
| func isAllowedForGuessing(s string) bool { | ||||||||||
| for _, v := range allowedGuessVersions { | ||||||||||
|
|
||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,21 +61,21 @@ var downloadsSettings = map[TarballType]TarballDef{ | |
| NameInFile: "mysql-cluster", | ||
| NameInUrl: "cluster", | ||
| DownloadDir: "MySQL-Cluster-VERSION", | ||
| Versions: []string{"7.6", "8.0", "8.4", "9.0"}, | ||
| }, | ||
| TtMysql: { | ||
| Flavor: "mysql", | ||
| NameInFile: "mysql", | ||
| NameInUrl: "mysql", | ||
| DownloadDir: "MySQL-VERSION", | ||
| Versions: []string{"5.7", "8.0", "8.4", "9.0", "9.1", "9.2"}, | ||
| }, | ||
| TtShell: { | ||
| Flavor: "shell", | ||
| NameInFile: "mysql-shell", | ||
| NameInUrl: "shell", | ||
| DownloadDir: "MySQL-Shell-VERSION", | ||
| Versions: []string{"8.0", "8.4", "9.0"}, | ||
| }, | ||
|
Comment on lines
+64
to
79
There was a problem hiding this comment. The new MySQL Innovation versions are only partially added: cluster and shell settings include 9.0 but omit 9.1/9.2, which conflicts with the PR description/issue acceptance criteria (support 9.0–9.2 across mysql/cluster/shell). Add the missing versions here or clarify why those tarballs are intentionally unsupported.
Comment on lines
+64
to
79
There was a problem hiding this comment. Cluster/Shell 9.x support is incomplete vs PR objective. Line 64 and Line 78 only allow Proposed fix TtCluster: {
Flavor: "ndb",
NameInFile: "mysql-cluster",
NameInUrl: "cluster",
DownloadDir: "MySQL-Cluster-VERSION",
- Versions: []string{"7.6", "8.0", "8.4", "9.0"},
+ Versions: []string{"7.6", "8.0", "8.4", "9.0", "9.1", "9.2"},
},
@@
TtShell: {
Flavor: "shell",
NameInFile: "mysql-shell",
NameInUrl: "shell",
DownloadDir: "MySQL-Shell-VERSION",
- Versions: []string{"8.0", "8.4", "9.0"},
+ Versions: []string{"8.0", "8.4", "9.0", "9.1", "9.2"},
},🤖 Prompt for AI Agents |
||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "DbdeployerVersion": "1.74.0", | ||
| "Tarballs": [ | ||
| { | ||
| "name": "tidb-master-darwin-amd64.tar.gz", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,41 +1,39 @@ | ||||||
| module github.com/datacharmer/dbdeployer | ||||||
|
|
||||||
| go 1.22 | ||||||
|
There was a problem hiding this comment. Bumping the module to
Suggested change
|
||||||
|
|
||||||
| require ( | ||||||
| github.com/alexeyco/simpletable v1.0.0 | ||||||
| github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de | ||||||
| github.com/dustin/go-humanize v1.0.1 | ||||||
| github.com/go-sql-driver/mysql v1.7.1 | ||||||
| github.com/nightlyone/lockfile v1.0.0 | ||||||
| github.com/pkg/errors v0.9.1 | ||||||
| github.com/rogpeppe/go-internal v1.12.0 | ||||||
| github.com/spf13/cobra v1.8.1 | ||||||
| github.com/spf13/pflag v1.0.6 | ||||||
| github.com/stretchr/testify v1.9.0 | ||||||
| github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 | ||||||
| golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 | ||||||
| golang.org/x/term v0.25.0 | ||||||
| golang.org/x/text v0.19.0 | ||||||
| jaytaylor.com/html2text v0.0.0-20200412013138-3577fbdbcff7 | ||||||
| ) | ||||||
|
|
||||||
| require ( | ||||||
| github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect | ||||||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||||||
| github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||||||
| github.com/kr/pretty v0.3.0 // indirect | ||||||
| github.com/mattn/go-runewidth v0.0.12 // indirect | ||||||
| github.com/olekukonko/tablewriter v0.0.5 // indirect | ||||||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||||||
| github.com/rivo/uniseg v0.1.0 // indirect | ||||||
| github.com/russross/blackfriday/v2 v2.1.0 // indirect | ||||||
| github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect | ||||||
| golang.org/x/net v0.30.0 // indirect | ||||||
| golang.org/x/sys v0.26.0 // indirect | ||||||
| golang.org/x/tools v0.22.0 // indirect | ||||||
| gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect | ||||||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||||||
| ) | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -249,8 +249,8 @@ func findRemoteTarballByVersion(version, flavor, OS, arch string, minimal, newes | |||||
|
|
||||||
| tarball, err = downloads.FindOrGuessTarballByVersionFlavorOS(version, flavor, OS, arch, minimal, newest, guessLatest) | ||||||
| if err != nil { | ||||||
| return downloads.TarballDescription{}, fmt.Errorf("Error getting version %s (%s-%s)[minimal: %v - newest: %v - guess: %v]: %s", | ||||||
|
There was a problem hiding this comment. This returned error string is capitalized ("Error getting version...") while most other errors in this package are lowercase. Prefer starting errors with lowercase (e.g., "error getting version...") so callers can wrap/compose errors consistently.
Suggested change
|
||||||
| version, flavor, OS, minimal, newest, guessLatest, err) | ||||||
| } | ||||||
| return tarball, nil | ||||||
| } | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -60,7 +60,7 @@ func findErrorsInLogFile(ts *testscript.TestScript, neg bool, args []string) { | |||||
| ts.Check(err) | ||||||
| hasError := strings.Contains(string(contents), "ERROR") | ||||||
| if neg && hasError { | ||||||
| reLines := regexp.MustCompile(`(?s)(^.*ERROR.*)`) | ||||||
|
There was a problem hiding this comment. The regex used to extract ERROR lines is still not doing what the code implies:
Suggested change
|
||||||
| errorLines := reLines.FindAll(contents, -1) | ||||||
| ts.Fatalf("ERRORs found in %s (%s)\n", logFile, errorLines) | ||||||
| } | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
README now points to the ProxySQL-maintained repo, but the “features comparison” link still points to
datacharmer/dbdeployer. Consider switching it to a relative link (e.g.,docs/features.md) or updating to the new repo so it doesn’t send users to the legacy project.