lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: No data returned from the query errors on migration

Browse source
This commit is contained in:
siiky 2024-09-19 16:10:18 +01:00
parent bb440eedd6
commit ea9a373676
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/admin/settings-loader.js
View file

@ -92,7 +92,7 @@ function loadLatestConfig (filterSchemaVersion = true) {
order by id desc order by id desc
limit 1` limit 1`
return db.one(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION]) return db.oneOrNone(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
.then(row => row.data.config) .then(row => row.data.config)
.then(configValidate.validate) .then(configValidate.validate)
.catch(err => { .catch(err => {

2
lib/new-settings-loader.js
View file

@ -167,7 +167,7 @@ function loadLatestConfig () {
ORDER BY id DESC ORDER BY id DESC
LIMIT 1` LIMIT 1`
return db.one(sql, [NEW_SETTINGS_LOADER_SCHEMA_VERSION]) return db.oneOrNone(sql, [NEW_SETTINGS_LOADER_SCHEMA_VERSION])
.then(row => row ? row.data.config : {}) .then(row => row ? row.data.config : {})
.catch(err => { .catch(err => {
throw err throw err