From 53d8fabfc6efdb5756247d45361ade2011ed3701 Mon Sep 17 00:00:00 2001 From: Nate Levesque Date: Sun, 3 Dec 2023 23:19:49 -0500 Subject: [PATCH 1/3] handle size column being NULL in migration v263 --- models/migrations/v1_21/v263.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/migrations/v1_21/v263.go b/models/migrations/v1_21/v263.go index 5dccd8bfa0d9e..de316902f5daa 100644 --- a/models/migrations/v1_21/v263.go +++ b/models/migrations/v1_21/v263.go @@ -32,7 +32,7 @@ func AddGitSizeAndLFSSizeToRepositoryTable(x *xorm.Engine) error { return err } - _, err = sess.Exec(`UPDATE repository SET git_size = size - lfs_size`) + _, err = sess.Exec(`UPDATE repository SET git_size = size - lfs_size WHERE size IS NOT NULL`) if err != nil { return err } From b71839b03b53ddb4d4fa0d02d196f0fff4125c21 Mon Sep 17 00:00:00 2001 From: Nate Levesque Date: Mon, 4 Dec 2023 22:52:09 -0500 Subject: [PATCH 2/3] dont leave repository.size == NULL --- models/migrations/v1_21/v263.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/models/migrations/v1_21/v263.go b/models/migrations/v1_21/v263.go index de316902f5daa..dab89b0765ff2 100644 --- a/models/migrations/v1_21/v263.go +++ b/models/migrations/v1_21/v263.go @@ -32,7 +32,12 @@ func AddGitSizeAndLFSSizeToRepositoryTable(x *xorm.Engine) error { return err } - _, err = sess.Exec(`UPDATE repository SET git_size = size - lfs_size WHERE size IS NOT NULL`) + , err = sess.Exec(`UPDATE repository SET size = 0 WHERE size IS NULL`) + if err != nil { + return err + } + + _, err = sess.Exec(`UPDATE repository SET git_size = size - lfs_size WHERE size > lfs_size`) if err != nil { return err } From 3d361c36efb0ba62557593b904f7871ab4801f4c Mon Sep 17 00:00:00 2001 From: Nate Levesque Date: Tue, 5 Dec 2023 07:49:00 -0500 Subject: [PATCH 3/3] lint --- models/migrations/v1_21/v263.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/migrations/v1_21/v263.go b/models/migrations/v1_21/v263.go index dab89b0765ff2..2c7cbadf0d89d 100644 --- a/models/migrations/v1_21/v263.go +++ b/models/migrations/v1_21/v263.go @@ -32,7 +32,7 @@ func AddGitSizeAndLFSSizeToRepositoryTable(x *xorm.Engine) error { return err } - , err = sess.Exec(`UPDATE repository SET size = 0 WHERE size IS NULL`) + _, err = sess.Exec(`UPDATE repository SET size = 0 WHERE size IS NULL`) if err != nil { return err }