Skip to content

fix(cli): Fix postgres TDE failing version check #7203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 19, 2023
Merged

fix(cli): Fix postgres TDE failing version check #7203

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc107ae
fix(cli): Fix postgres TDE failing version check
MTschirnich Apr 19, 2023
9d6aadc
Fix fmt fail: newline with spaces
MTschirnich Apr 19, 2023
e33880a
Fix wrong comparison sign usage
MTschirnich Apr 19, 2023
5ccf3a1
Add verion information to the error message
MTschirnich Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(cli): Fix postgres TDE failing version check
  • Loading branch information
@MTschirnich
MTschirnich committed Apr 19, 2023
commit fc107aef76055421008ac91ad67eae6ce296362c
12 changes: 6 additions & 6 deletions cli/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1740,24 +1740,24 @@ func connectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
}

// Ensure the PostgreSQL version is >=13.0.0!
version, err := sqlDB.QueryContext(ctx, "SHOW server_version;")
version, err := sqlDB.QueryContext(ctx, "SHOW server_version_num;")
if err != nil {
return nil, xerrors.Errorf("get postgres version: %w", err)
}
if !version.Next() {
return nil, xerrors.Errorf("no rows returned for version select")
}
var versionStr string
err = version.Scan(&versionStr)
var versionNum int
err = version.Scan(&versionNum)
if err != nil {
return nil, xerrors.Errorf("scan version: %w", err)
}
_ = version.Close()
versionStr = strings.Split(versionStr, " ")[0]
if semver.Compare("v"+versionStr, "v13") < 0 {

if versionNum >= 130000 {
return nil, xerrors.New("PostgreSQL version must be v13.0.0 or higher!")
}
logger.Debug(ctx, "connected to postgresql", slog.F("version", versionStr))
logger.Debug(ctx, "connected to postgresql", slog.F("version", versionNum))

err = migrations.Up(sqlDB)
if err != nil {
Expand Down