Convert a callback test into a promise test to fully test execSQL

NathanaelA · NathanaelA · commit 47102b99d8d6 · 2019-02-08T12:34:08.000-06:00
diff --git a/demo/app/main-page.js b/demo/app/main-page.js
@@ -118,7 +118,16 @@ function setupTests(callback) {
 					console.log("!---- Insert err", err);
 					return;
 				}
-				db.execSQL('insert into tests (int_field, num_field, real_field, text_field) values (2,4.8,5.6,"Text2")', callback);
+				db.execSQL('insert into tests (int_field, num_field, real_field, text_field) values (2,4.8,5.6,"Text2")').then(() => {
+					callback();
+				}).catch((err) => {
+					if (err) {
+						data.push({name: 'Failed to insert data into tests', css: 'one'}); 
+						console.log("!---- Insert err2:", err);
+						return;
+					}
+					callback(err);
+				});
 			});
 		});
 	});
@@ -249,6 +258,14 @@ function runATest(options, callback) {
 				db.each(options.sql, options.values, checkEachResults).then(checkFinalResults).catch(promiseFailed);
 				break;
 
+			case 6:
+				db.execSQL(options.sql, options.params, checkResults);
+				break;
+
+			case 7:
+				db.execSQL(options.sql, options.params).then(promiseResults).catch(promiseFailed);
+				break;
+
 			default:
 				callback(false);
 		}
@@ -268,12 +285,20 @@ function runATest(options, callback) {
 				db.get(options.sql).then(promiseResults).catch(promiseFailed);
 				break;
 			case 4:
-				let p = db.all(options.sql).then(promiseResults).catch(promiseFailed);
+				db.all(options.sql).then(promiseResults).catch(promiseFailed);
 				break;
 			case 5:
 				db.each(options.sql, checkEachResults).then(checkFinalResults).catch(promiseFailed);
 				break;
 
+			case 6:
+				db.execSQL(options.sql, checkResults);
+				break;
+
+			case 7:
+				db.execSQL(options.sql).then(promiseResults).catch(promiseFailed);
+				break;
+
 
 			default:
 				callback(false);
diff --git a/src/changelog b/src/changelog
@@ -26,4 +26,5 @@ v2.2.4  - Fix CopyDatabase on Android to respect the app version (for livesync)
 v2.2.5  - Fix CopyDatabase indexOf to lastIndexOf - Thanks Webleaf
 v2.2.6  - Forgot to include the ios sqlite helper in v2.2.4/v2.2.5
 v2.3.0  - Several minor issues fixed, Multi-threading added to Sqlite
-v2.3.1  - iOS SQLExec bind returns the wrong error value
+v2.3.1  - iOS SQLExec bind returns the wrong error value
+v2.3.2  - Added Promise tests, started ES6 updated.
