Always create empty db on start #46

src/router.js

@@ -4,6 +4,8 @@ import Editor from '@/views/Main/Editor'
 import MyQueries from '@/views/Main/MyQueries'
 import Welcome from '@/views/Welcome'
 import Main from '@/views/Main'
+import store from '@/store'
+import database from '@/lib/database'
 
 Vue.use(VueRouter)
 
@@ -36,4 +38,13 @@ const router = new VueRouter({
   routes
 })
 
+router.beforeEach(async (to, from, next) => {
+  if (!store.state.db) {
+    const newDb = database.getNewDatabase()
+    await newDb.loadDb()
+    store.commit('setDb', newDb)
+  }
+  next()
+})
+
 export default router

src/views/Main/Editor/index.vue

@@ -19,8 +19,6 @@
 import Splitpanes from '@/components/Splitpanes'
 import Schema from './Schema'
 import Tabs from './Tabs'
-import database from '@/lib/database'
-import store from '@/store'
 
 export default {
   name: 'Editor',
@@ -29,11 +27,9 @@ export default {
     Splitpanes,
     Tabs
   },
-  async beforeRouteEnter (to, from, next) {
+  async beforeCreate () {
-    if (!store.state.db) {
+    const schema = this.$store.state.db.schema
-      const newDb = database.getNewDatabase()
+    if (!schema || schema.length === 0) {
-      await newDb.loadDb()
-      store.commit('setDb', newDb)
       const stmt = [
         '/*',
         ' * Your database is empty. In order to start building charts',
@@ -51,10 +47,9 @@ export default {
         "('Slytherin', 80);"
       ].join('\n')
 
-      const tabId = await store.dispatch('addTab', { query: stmt })
+      const tabId = await this.$store.dispatch('addTab', { query: stmt })
-      store.commit('setCurrentTabId', tabId)
+      this.$store.commit('setCurrentTabId', tabId)
     }
-    next()
   }
 }
 </script>