From 623ee02a21293b00da044af924ab0d83948013ed Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Sat, 25 Jun 2022 23:15:58 +0200
Subject: [PATCH] minor during setup

---
 package.json                | 2 +-
 server/api/models/index.js  | 9 ++++++---
 server/initialize.server.js | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c3c39cd6..991f76dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gancio",
-  "version": "1.5.0-rc.10",
+  "version": "1.5.0-rc.11",
   "description": "A shared agenda for local communities",
   "author": "lesion",
   "scripts": {
diff --git a/server/api/models/index.js b/server/api/models/index.js
index be9271fb..ffa72560 100644
--- a/server/api/models/index.js
+++ b/server/api/models/index.js
@@ -2,7 +2,6 @@ const Sequelize = require('sequelize')
 const Umzug = require('umzug')
 const path = require('path')
 const config = require('../../config')
-const { col } = require('../../helpers')
 const log = require('../../log')
 const settingsController = require('../controller/settings')
 
@@ -31,8 +30,12 @@ const db = {
     return db.sequelize.authenticate()
   },
   async isEmpty () {
-    const users = await db.sequelize.query(`SELECT * from ${col('users')}`).catch(e => {})
-    return !(users && users.length)
+    try {
+      const users = await db.sequelize.query('SELECT * from users')
+      return !(users && users.length)
+    } catch (e) {
+      return true
+    }
   },
   async runMigrations () {
     const logging = config.status !== 'READY' ? false : log.debug.bind(log)
diff --git a/server/initialize.server.js b/server/initialize.server.js
index 3fff8448..cb21c17b 100644
--- a/server/initialize.server.js
+++ b/server/initialize.server.js
@@ -40,7 +40,7 @@ const initialize = {
           password: process.env.GANCIO_DB_PASSWORD,
         }
     
-        setupController._setupDb(dbConf)
+        await setupController._setupDb(dbConf)
           .catch(e => {
             log.warn(String(e))
             process.exit(1)