Update to support migrate

NathanaelA · NathanaelA · commit 57ad66d2c62f · 2019-03-05T18:40:24.000-06:00
diff --git a/demo/README.md b/demo/README.md
@@ -3,10 +3,10 @@
 If you want to test the Encryption or Commercial features in the demo app; then drop the plugins in the root of the github folder, and then do:
 
 ### Commercial:
-`tns plugin add ../nativescript-commercial-1.3.0.tgz` in this folder.   
+`tns plugin add ../nativescript-commercial-1.3.2.tgz` in this folder.   
 
 ### Encryption:
-`tns plugin add ../nativescript-encryption-1.3.0.tgz` in this folder.   
+`tns plugin add ../nativescript-encryption-1.3.1.tgz` in this folder.   
 
 ## Developed by
 [![MasterTech](https://plugins.nativescript.rocks/i/mtns.png)](https://plugins.nativescript.rocks/mastertech-nstudio)
@@ -21,4 +21,6 @@ The [commercial version](http://nativescript.tools/product/10) comes with the fo
 - Prepared statements
 - Multilevel transaction support
 - Encryption
-- **Multi-threading**
+- Multi-threading
+- Encrypted Drivers is using latest SQLite that fixes multiple CVE's
+ 
diff --git a/demo/app/main-page.js b/demo/app/main-page.js
@@ -38,7 +38,7 @@ exports.pageLoaded = function(args) {
 	if (!sqlite.exists(dbname)) {
 		sqlite.copyDatabase(dbname);
 	}
-	new sqlite(dbname, {key: 'testing', multithreading: !!sqlite.HAS_COMMERCIAL}, function(err, dbConnection) {
+	new sqlite(dbname, {key: 'testing', multithreading: !!sqlite.HAS_COMMERCIAL, migrate: true}, function(err, dbConnection) {
 		if (err) {
 			console.log(err, err.stack);
 		}
diff --git a/demo/package.json b/demo/package.json
@@ -1,23 +1,23 @@
-{ 
+{
     "nativescript": {
         "id": "org.nativescript.demo",
         "tns-android": {
-            "version": "5.1.0"
+            "version": "5.2.1"
         },
         "tns-ios": {
-            "version": "5.1.0"
+            "version": "5.2.0"
         }
     },
-    "description": "NativeScript Application",
-    "license": "SEE LICENSE IN <your-license-filename>",
+    "description": "SQLite Demo Application",
+    "license": "MIT",
     "repository": "<fill-your-repository-here>",
     "dependencies": {
+        "nativescript-sqlite": "file:../src",
         "nativescript-theme-core": "~1.0.4",
-        "tns-core-modules": "~5.1.0",
-        "nativescript-sqlite": "file:..\\src"
+        "tns-core-modules": "^5.2.2"
     },
     "devDependencies": {
-        "nativescript-dev-webpack": "~0.19.0"
+        "nativescript-dev-webpack": "^0.20.2"
     },
-    "readme": "NativeScript Application"
+    "readme": "SQLite Demo Application"
 }
diff --git a/demo/webpack.config.js b/demo/webpack.config.js
@@ -207,6 +207,7 @@ module.exports = env => {
                 { from: { glob: "fonts/**" } },
                 { from: { glob: "**/*.jpg" } },
                 { from: { glob: "**/*.png" } },
+                { from: { glob: "**/*.sqlite" } },
             ], { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }),
             // Generate a bundle starter script and activate it in package.json
             new nsWebpack.GenerateBundleStarterPlugin([
diff --git a/src/README.md b/src/README.md
@@ -82,7 +82,7 @@ a section that looks like so:
                 { from: "**/*.png" },
 ```
 
-Add a new line `{from: "**/*.sqlite"}` so that it will pick up your sqlite file while bundling the application.
+Add a new line `{ from: { glob: "**/*.sqlite" } },` so that it will pick up your sqlite file while bundling the application.
 
 In addition if you are not using the Commercial or Encrypted plugin; you would need to add:
 
@@ -135,7 +135,8 @@ If you are planning on shipping a database with the application; drop the file i
 * options 
   * "readOnly", which if set to true will make the db read only when it opens it
   * "key", used for using/opening encrypted databases (See Encryption at bottom of document)
-  * "multithreading", enable background multitasking.  All SQL is ran on a background worker thread.  
+  * "multithreading", enable background multitasking.  All SQL is ran on a background worker thread.
+  * "migrate", migrates a Encrypted Sql database from v3 to the new v4.  If you are a new user you do not need to set this flag as new created databases will already be in v4.  If you are upgrading a app that used v1.3.0 or earlier of NS-Sqlite-Encrypted; then you will probably want to set this flag to true.  
 * (optional) callback (error, db): db is the fully OPEN database object that allows interacting with the db.
 * RETURNS: promise of the DB object
 
@@ -361,7 +362,24 @@ To enable commercial: `tns plugin add nativescript-sqlite-commercial-1.2.0.tgz`
 Pass the encryption key into database open function using the `options.key` and it will be applied.  Please note the database itself MUST be created with encryption to use encryption.  So if you create a plain database, you can not retroactively add encryption to it.  
 If you pass a blank (**""**) empty key, then it will treat it as no key.   But, it will still use the encrypted driver in case you need certain features from the more modern sqlite driver; but don't need encryption.  
 
-Note: Enabling/Compiling in the encryption driver adds about 3 megs to the size to the application APK on android and about 2 megs to a iOS application.  
+Note: Enabling/Compiling in the encryption driver adds about 3 megs to the size to the application APK on android and about 2 megs to a iOS application.
+
+#### Encryption Upgrade
+There is a NEW upgrade option you can pass to the database constructor.   if you were using an older version (1.3.0 or earlier) of this NS-Sqlite-Encryption.   
+* "migrate", migrates a Encrypted Sql database from v3 to the new v4.  If you are a new user you do not need to set this flag as new created databases will already be in v4.  If you are upgrading a app that used v1.3.0 or earlier of NS-Sqlite-Encrypted; then you will probably want to set this flag to true.  
+
+#### iOS Encryption Notes
+  
+  If you see `SQLCipher does not seem to be linked into the application`
+  
+  Sometimes iOS decides it really wants to bring in the native SQLite over the encrypted version.
+  A couple things you can try:
+  - Delete some files that aren't needed when using encryption that might bring in the standard sqlite plugin.
+    - `rm node_modules/nativescript-sqlite/platforms/ios/build.xcconfig`
+    - `rm node_modules/nativescript-sqlite/platforms/ios/module.modulemap`
+    - Then `tns platform clean ios`
+
+        
     
 ### Multitasking / Multithreading
 The commercial version supports putting all SQL access into a background thread, so your UI doesn't freeze while doing data access.  To enable; just pass in {multithreading: true} as an option when creating a new Sqlite connection.        

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ exports.pageLoaded = function(args) {`
`38`	`38`	`if (!sqlite.exists(dbname)) {`
`39`	`39`	`sqlite.copyDatabase(dbname);`
`40`	`40`	`}`
`41`		`- new sqlite(dbname, {key: 'testing', multithreading: !!sqlite.HAS_COMMERCIAL}, function(err, dbConnection) {`
	`41`	`+ new sqlite(dbname, {key: 'testing', multithreading: !!sqlite.HAS_COMMERCIAL, migrate: true}, function(err, dbConnection) {`
`42`	`42`	`if (err) {`
`43`	`43`	`console.log(err, err.stack);`
`44`	`44`	`}`