upgrade jsstore version, rm isDbExist

ujjwalguptaofficial · May 19, 2021 · 1c40614 · 1c40614
1 parent 93df0b9
commit 1c40614
Show file tree

Hide file tree

Showing 8 changed files with 187 additions and 213 deletions.
diff --git a/build_helper/build.js b/build_helper/build.js
@@ -44,7 +44,6 @@ generateParser = function () {
             'src/grammar/select_join.pegjs',
             'src/grammar/update.pegjs',
             'src/grammar/open.pegjs',
-            'src/grammar/is_db_exist.pegjs',
             'src/grammar/common.pegjs',
             'src/grammar/constant.pegjs'
         ]);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
   "devDependencies": {
     "chai": "^4.2.0",
     "fs-extra": "^7.0.1",
-    "jsstore": "^3.11.0",
+    "jsstore": "^4.0.4",
     "karma": "^4.1.0",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.2.0",
@@ -57,6 +57,6 @@
     "webpack-merge": "^4.2.1"
   },
   "peerDependencies": {
-    "jsstore": ">=3.11.0"
+    "jsstore": ">=4.0.3"
   }
 }
diff --git a/src/grammar/index.pegjs b/src/grammar/index.pegjs
@@ -1,2 +1,2 @@
-query = selectQuery/countQuery/insertQuery/updateQuery/removeQuery/createQuery/openQuery/isDbExistQuery ;
+query = selectQuery/countQuery/insertQuery/updateQuery/removeQuery/createQuery/openQuery ;
 
diff --git a/src/grammar/is_db_exist.pegjs b/src/grammar/is_db_exist.pegjs
diff --git a/test/cases/create/demo.js b/test/cases/create/demo.js
@@ -1,24 +1,15 @@
 describe('create demo database', function () {
     it('use isexist and then open/create db', function (done) {
         console.log('initiate database');
-        con.$sql.run('isDbExist Demo').then(function (isExist) {
-            console.log('db exist :' + isExist);
-            if (isExist) {
-                con.$sql.run('openDb Demo').then(function () {
-                    console.log('Database opened');
-                    done();
-                });
-            } else {
-                var query = getDbSchema();
-                con.$sql.run(query).then(function () {
-                    console.log('Database created');
-                    done();
-                });
-            }
+        var query = getDbSchema();
+        con.$sql.run(query).then(function (isDbCreated) {
+            console.log('Database created');
+            expect(isDbCreated).equal(true);
+            done();
         }).catch(function (err) {
             done(err);
         });
-    });
+    })
 });
 
 // con.jsStoreCon_.isDbExist('Demo').then(function (exist) {