Skip to content

Commit 0fb0db8

Browse files
authored
fix: show whether a branch is created with data (#4184)
1 parent 3281889 commit 0fb0db8

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

internal/branches/list/list.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func Run(ctx context.Context, fsys afero.Fs) error {
3737
}
3838

3939
func ToMarkdown(branches []api.BranchResponse) string {
40-
table := `|ID|NAME|DEFAULT|GIT BRANCH|STATUS|CREATED AT (UTC)|UPDATED AT (UTC)|
40+
table := `|ID|NAME|DEFAULT|GIT BRANCH|WITH DATA|STATUS|CREATED AT (UTC)|UPDATED AT (UTC)|
4141
|-|-|-|-|-|-|-|-|
4242
`
4343
for _, branch := range branches {
@@ -46,11 +46,12 @@ func ToMarkdown(branches []api.BranchResponse) string {
4646
gitBranch = *branch.GitBranch
4747
}
4848
table += fmt.Sprintf(
49-
"|`%s`|`%s`|`%t`|`%s`|`%s`|`%s`|`%s`|\n",
49+
"|`%s`|`%s`|`%t`|`%s`|`%t`|`%s`|`%s`|`%s`|\n",
5050
branch.ProjectRef,
5151
strings.ReplaceAll(branch.Name, "|", "\\|"),
5252
branch.IsDefault,
5353
strings.ReplaceAll(gitBranch, "|", "\\|"),
54+
branch.WithData,
5455
branch.Status,
5556
utils.FormatTime(branch.CreatedAt),
5657
utils.FormatTime(branch.UpdatedAt),

internal/link/link.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,7 @@ func linkDatabase(ctx context.Context, config pgconn.Config, fsys afero.Fs, opti
215215
func updatePostgresConfig(conn *pgx.Conn) {
216216
serverVersion := conn.PgConn().ParameterStatus("server_version")
217217
// Safe to assume that supported Postgres version is 10.0 <= n < 100.0
218-
majorDigits := len(serverVersion)
219-
if majorDigits > 2 {
220-
majorDigits = 2
221-
}
218+
majorDigits := min(len(serverVersion), 2)
222219
// Treat error as unchanged
223220
if dbMajorVersion, err := strconv.ParseUint(serverVersion[:majorDigits], 10, 7); err == nil {
224221
utils.Config.Db.MajorVersion = uint(dbMajorVersion)

0 commit comments

Comments
 (0)