minor during setup
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "gancio",
|
"name": "gancio",
|
||||||
"version": "1.5.0-rc.10",
|
"version": "1.5.0-rc.11",
|
||||||
"description": "A shared agenda for local communities",
|
"description": "A shared agenda for local communities",
|
||||||
"author": "lesion",
|
"author": "lesion",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ const Sequelize = require('sequelize')
|
|||||||
const Umzug = require('umzug')
|
const Umzug = require('umzug')
|
||||||
const path = require('path')
|
const path = require('path')
|
||||||
const config = require('../../config')
|
const config = require('../../config')
|
||||||
const { col } = require('../../helpers')
|
|
||||||
const log = require('../../log')
|
const log = require('../../log')
|
||||||
const settingsController = require('../controller/settings')
|
const settingsController = require('../controller/settings')
|
||||||
|
|
||||||
@@ -31,8 +30,12 @@ const db = {
|
|||||||
return db.sequelize.authenticate()
|
return db.sequelize.authenticate()
|
||||||
},
|
},
|
||||||
async isEmpty () {
|
async isEmpty () {
|
||||||
const users = await db.sequelize.query(`SELECT * from ${col('users')}`).catch(e => {})
|
try {
|
||||||
return !(users && users.length)
|
const users = await db.sequelize.query('SELECT * from users')
|
||||||
|
return !(users && users.length)
|
||||||
|
} catch (e) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
},
|
},
|
||||||
async runMigrations () {
|
async runMigrations () {
|
||||||
const logging = config.status !== 'READY' ? false : log.debug.bind(log)
|
const logging = config.status !== 'READY' ? false : log.debug.bind(log)
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ const initialize = {
|
|||||||
password: process.env.GANCIO_DB_PASSWORD,
|
password: process.env.GANCIO_DB_PASSWORD,
|
||||||
}
|
}
|
||||||
|
|
||||||
setupController._setupDb(dbConf)
|
await setupController._setupDb(dbConf)
|
||||||
.catch(e => {
|
.catch(e => {
|
||||||
log.warn(String(e))
|
log.warn(String(e))
|
||||||
process.exit(1)
|
process.exit(1)
|
||||||
|
|||||||
Reference in New Issue
Block a user