summaryrefslogtreecommitdiff
path: root/lorrycontroller
diff options
context:
space:
mode:
authorBen Brown <ben.brown@codethink.co.uk>2020-06-14 17:33:54 +0000
committerBen Brown <ben.brown@codethink.co.uk>2020-06-14 17:33:54 +0000
commitb6e1f939fd5a1da7f6b1008e05d1e6bfb20d3206 (patch)
tree4ba6eeb7d1d86eb048bf162fc2d80ab9693db295 /lorrycontroller
parent372644c12e3833f15b6bfbfacbf30bce6850501d (diff)
parenta9368a32b28a5904934e12c9313c34b3f8fa8969 (diff)
downloadlorry-controller-b6e1f939fd5a1da7f6b1008e05d1e6bfb20d3206.tar.gz
Merge branch 'bwh/statedb-no-json1' into 'master'
STATEDB: Avoid depending on SQLite json1 extension See merge request CodethinkLabs/lorry-controller!13
Diffstat (limited to 'lorrycontroller')
-rw-r--r--lorrycontroller/migrations/0003-generalise-troves.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lorrycontroller/migrations/0003-generalise-troves.py b/lorrycontroller/migrations/0003-generalise-troves.py
index bacd2ad..7219ec0 100644
--- a/lorrycontroller/migrations/0003-generalise-troves.py
+++ b/lorrycontroller/migrations/0003-generalise-troves.py
@@ -34,7 +34,7 @@ yoyo.step('INSERT INTO hosts '
'SELECT trovehost, protocol, username, password, '
"CASE WHEN gitlab_token IS NULL THEN 'trove' ELSE 'gitlab' END, "
"CASE WHEN gitlab_token IS NULL THEN '{}' "
- "ELSE json_object('private-token', gitlab_token) END, "
+ "ELSE '{\"private-token\":\"' || gitlab_token || '\"}' END, "
'lorry_interval, lorry_timeout, ls_interval, ls_last_run, prefixmap, '
'ignore '
'FROM troves')