- allow "exec" commmand to pass dictionary-params to webworker

- add test passing dictionary-params to webworker

Author: kai.zhu

src/api.js

@@ -685,7 +685,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
     * @param {string} sql a string containing some SQL text to execute
     * @return {Database.QueryExecResult[]} The results of each statement
     */
-    Database.prototype["exec"] = function exec(sql) {
+    Database.prototype["exec"] = function exec(sql, params) {
         var curresult;
         var stmt;
         if (!this.db) {
@@ -713,6 +713,9 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
                 if (pStmt !== NULL) {
                     curresult = null;
                     stmt = new Statement(pStmt, this);
+                    if (params != null) {
+                        stmt.bind(params);
+                    }
                     while (stmt["step"]()) {
                         if (curresult === null) {
                             curresult = {

src/worker.js

@@ -31,7 +31,7 @@ function onModuleReady(SQL) {
             }
             return postMessage({
                 id: data["id"],
-                results: db.exec(data["sql"])
+                results: db.exec(data["sql"], data["params"])
             });
         case "each":
             if (db === null) {

test/test_worker.js

@@ -1,8 +1,8 @@
-// TODO: Instead of using tiny-worker, we could use the new Node 11 workers via
-// node --experimental-worker test/all.js 
+// TODO: Instead of using puppeteer, we could use the new Node 11 workers via
+// node --experimental-worker test/all.js
 // Then we could do this:
 //const { Worker } = require('worker_threads');
-// But it turns out that the worker_threads interface is just different enough not to work. 
+// But it turns out that the worker_threads interface is just different enough not to work.
 var puppeteer = require("puppeteer");
 var path = require("path");
 var fs = require("fs");
@@ -40,7 +40,7 @@ exports.test = async function test(SQL, assert) {
     console.error("Skipping worker test for " + file + ". Not implemented yet");
     return;
   };
-  // If we use tiny-worker, we need to pass in this new cwd as the root of the file being loaded:
+  // If we use puppeteer, we need to pass in this new cwd as the root of the file being loaded:
   const filename = "../dist/worker." + file + ".js";
   var worker = await Worker.fromFile(path.join(__dirname, filename));
   var data = await worker.postMessage({ id: 1, action: 'open' });
@@ -50,20 +50,41 @@ exports.test = async function test(SQL, assert) {
   data = await worker.postMessage({
     id: 2,
     action: 'exec',
+    params: {
+        ":num2": 2,
+        "@str2": 'b',
+        // test_worker.js has issue message-passing Uint8Array
+        // but it works fine in real-world browser-usage
+        // "$hex2": new Uint8Array([0x00, 0x42]),
+        ":num3": 3,
+        "@str3": 'c'
+        // "$hex3": new Uint8Array([0x00, 0x44])
+    },
     sql: "CREATE TABLE test (num, str, hex);" +
       "INSERT INTO test VALUES (1, 'a', x'0042');" +
+      "INSERT INTO test VALUES (:num2, @str2, x'0043');" +
+      // test passing params split across multi-statement "exec"
+      "INSERT INTO test VALUES (:num3, @str3, x'0044');" +
       "SELECT * FROM test;"
   });
   assert.strictEqual(data.id, 2, "Correct id");
+  // debug error
+  assert.strictEqual(data.error, undefined, data.error);
   var results = data.results;
   assert.ok(Array.isArray(results), 'Correct result type');
-  assert.strictEqual(results.length, 1, 'Expected exactly 1 row');
-  var row = results[0];
-  assert.strictEqual(typeof row, 'object', 'Type of the returned row');
-  assert.deepEqual(row.columns, ['num', 'str', 'hex'], 'Reading column names');
-  assert.strictEqual(row.values[0][0], 1, 'Reading number');
-  assert.strictEqual(row.values[0][1], 'a', 'Reading string');
-  assert.deepEqual(obj2array(row.values[0][2]), [0x00, 0x42], 'Reading BLOB byte');
+  assert.strictEqual(results.length, 1, 'Expected exactly 1 table');
+  var table = results[0];
+  assert.strictEqual(typeof table, 'object', 'Type of the returned table');
+  assert.deepEqual(table.columns, ['num', 'str', 'hex'], 'Reading column names');
+  assert.strictEqual(table.values[0][0], 1, 'Reading number');
+  assert.strictEqual(table.values[0][1], 'a', 'Reading string');
+  assert.deepEqual(obj2array(table.values[0][2]), [0x00, 0x42], 'Reading BLOB byte');
+  assert.strictEqual(table.values[1][0], 2, 'Reading number');
+  assert.strictEqual(table.values[1][1], 'b', 'Reading string');
+  assert.deepEqual(obj2array(table.values[1][2]), [0x00, 0x43], 'Reading BLOB byte');
+  assert.strictEqual(table.values[2][0], 3, 'Reading number');
+  assert.strictEqual(table.values[2][1], 'c', 'Reading string');
+  assert.deepEqual(obj2array(table.values[2][2]), [0x00, 0x44], 'Reading BLOB byte');
 
   data = await worker.postMessage({ action: 'export' });
   var header = "SQLite format 3\0";