From 0df20237bb814af5e26cc3141e93972e55c6be12 Mon Sep 17 00:00:00 2001
From: Alexey Kasyanchuk <degitx@gmail.com>
Date: Wed, 4 Apr 2018 08:13:29 +0300
Subject: [PATCH] fix(db): ignore patching already created db

---
 src/background/background.js | 9 ++++++++-
 src/background/dbPatcher.js  | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/background/background.js b/src/background/background.js
index eb0f833..598101e 100644
--- a/src/background/background.js
+++ b/src/background/background.js
@@ -193,8 +193,11 @@ const writeSphinxConfig = (path, dbPath) => {
     }
   }
 
+  let isInitDb = false
+
   if (!fs.existsSync(`${dbPath}/database`)){
     fs.mkdirSync(`${dbPath}/database`);
+    isInitDb = true
   }
 
   if(/^win/.test(process.platform))
@@ -203,6 +206,8 @@ const writeSphinxConfig = (path, dbPath) => {
   fs.writeFileSync(`${path}/sphinx.conf`, config)
   console.log(`writed sphinx config to ${path}`)
   console.log('db path:', dbPath)
+
+  return {isInitDb}
 }
 
 const sphinxPath = path.resolve(appPath('searchd'))
@@ -217,7 +222,7 @@ const startSphinx = (callback) => {
     appConfig['dbPath'] = sphinxConfigDirectory
   }
 
-  writeSphinxConfig(sphinxConfigDirectory, appConfig.dbPath)
+  const { isInitDb } = writeSphinxConfig(sphinxConfigDirectory, appConfig.dbPath)
 
   const config = `${sphinxConfigDirectory}/sphinx.conf`
   const options = ['--config', config]
@@ -226,6 +231,8 @@ const startSphinx = (callback) => {
   	options.push('--nodetach')
   }
   sphinx = spawn(sphinxPath, options)
+  // remeber initizalizing of db
+  sphinx.isInitDb = isInitDb
 
   const optimizeResolvers = {}
 
diff --git a/src/background/dbPatcher.js b/src/background/dbPatcher.js
index 4ddb673..88d1d87 100644
--- a/src/background/dbPatcher.js
+++ b/src/background/dbPatcher.js
@@ -179,13 +179,20 @@ module.exports = (callback, mainWindow, sphinxApp) => {
         callback()
     }
 
-    sphinx.connect((mysqlError) => {
+    sphinx.connect(async (mysqlError) => {
         if(mysqlError)
         {
             console.log('error on sphinx connecting on db patching', mysqlError)
             return
         }
 
+        // init of db, we can set version to last
+        if(sphinxApp && sphinxApp.isInitDb)
+        {
+            console.log('new db, set version to last')
+            await query('insert into version(id, version) values(1, 3)')
+        }
+
         sphinx.query('select * from version', (err, version) => {
             if(err)
             {