aboutsummaryrefslogtreecommitdiff
path: root/guix-data-service
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2019-09-29 17:10:04 +0100
committerChristopher Baines <mail@cbaines.net>2019-09-29 17:10:04 +0100
commitb90e6289ac4c370e746170a03eb1d1c696103abf (patch)
tree0c1cca5d430c5b7fff9163c9e06e1010a7180faf /guix-data-service
parentbd47a03c220bdd9ad66088075f66b61d291aeaa8 (diff)
downloaddata-service-b90e6289ac4c370e746170a03eb1d1c696103abf.tar
data-service-b90e6289ac4c370e746170a03eb1d1c696103abf.tar.gz
Fix the 'NULL' values in git_branches for the commits
The git_branches table had 'NULL' values for some commits where the branch was deleted, importantly this was the string 'NULL', not an actual NULL value. This commit fixes that, migrating the existing values to be '', and changing the relevant code. The primary key is also extended to include the datetime field, as this is important to allow a branch to be deleted twice.
Diffstat (limited to 'guix-data-service')
-rw-r--r--guix-data-service/branch-updated-emails.scm2
-rw-r--r--guix-data-service/web/view/html.scm4
2 files changed, 3 insertions, 3 deletions
diff --git a/guix-data-service/branch-updated-emails.scm b/guix-data-service/branch-updated-emails.scm
index 246ba53..df5771e 100644
--- a/guix-data-service/branch-updated-emails.scm
+++ b/guix-data-service/branch-updated-emails.scm
@@ -50,7 +50,7 @@
branch-name
(if (string=? "0000000000000000000000000000000000000000"
x-git-newrev)
- "NULL"
+ ""
x-git-newrev)
git-repository-id
date)
diff --git a/guix-data-service/web/view/html.scm b/guix-data-service/web/view/html.scm
index 872d6cc..20a02fc 100644
--- a/guix-data-service/web/view/html.scm
+++ b/guix-data-service/web/view/html.scm
@@ -940,7 +940,7 @@
"/branch/" name)))
,name))
(td ,date)
- (td ,@(if (string=? commit "NULL")
+ (td ,@(if (string=? commit "")
'((samp "branch deleted"))
`((a (@ (href ,(string-append
"/revision/" commit)))
@@ -1048,7 +1048,7 @@
(previous-commit previous-revision-exists?))
`(tr
(td ,date)
- (td ,@(if (string=? commit "NULL")
+ (td ,@(if (string=? commit "")
'((samp "branch deleted"))
`((a (@ (href ,(string-append
"/revision/" commit)))