Merge branch 'master' into gh-pages

Author: lovasoa

examples/GUI/gui.js

@@ -10,93 +10,93 @@ var worker = new Worker("../../dist/worker.sql-wasm.js");
 worker.onerror = error;
 
 // Open a database
-worker.postMessage({action:'open'});
+worker.postMessage({ action: 'open' });
 
 // Connect to the HTML element we 'print' to
 function print(text) {
-    outputElm.innerHTML = text.replace(/\n/g, '<br>');
+	outputElm.innerHTML = text.replace(/\n/g, '<br>');
 }
 function error(e) {
-  console.log(e);
+	console.log(e);
 	errorElm.style.height = '2em';
 	errorElm.textContent = e.message;
 }
 
 function noerror() {
-		errorElm.style.height = '0';
+	errorElm.style.height = '0';
 }
 
 // Run a command in the database
 function execute(commands) {
 	tic();
-	worker.onmessage = function(event) {
+	worker.onmessage = function (event) {
 		var results = event.data.results;
 		toc("Executing SQL");
 
 		tic();
 		outputElm.innerHTML = "";
-		for (var i=0; i<results.length; i++) {
+		for (var i = 0; i < results.length; i++) {
 			outputElm.appendChild(tableCreate(results[i].columns, results[i].values));
 		}
 		toc("Displaying results");
 	}
-	worker.postMessage({action:'exec', sql:commands});
+	worker.postMessage({ action: 'exec', sql: commands });
 	outputElm.textContent = "Fetching results...";
 }
 
 // Create an HTML table
 var tableCreate = function () {
-  function valconcat(vals, tagName) {
-    if (vals.length === 0) return '';
-    var open = '<'+tagName+'>', close='</'+tagName+'>';
-    return open + vals.join(close + open) + close;
-  }
-  return function (columns, values){
-    var tbl  = document.createElement('table');
-    var html = '<thead>' + valconcat(columns, 'th') + '</thead>';
-    var rows = values.map(function(v){ return valconcat(v, 'td'); });
-    html += '<tbody>' + valconcat(rows, 'tr') + '</tbody>';
-	  tbl.innerHTML = html;
-    return tbl;
-  }
+	function valconcat(vals, tagName) {
+		if (vals.length === 0) return '';
+		var open = '<' + tagName + '>', close = '</' + tagName + '>';
+		return open + vals.join(close + open) + close;
+	}
+	return function (columns, values) {
+		var tbl = document.createElement('table');
+		var html = '<thead>' + valconcat(columns, 'th') + '</thead>';
+		var rows = values.map(function (v) { return valconcat(v, 'td'); });
+		html += '<tbody>' + valconcat(rows, 'tr') + '</tbody>';
+		tbl.innerHTML = html;
+		return tbl;
+	}
 }();
 
 // Execute the commands when the button is clicked
-function execEditorContents () {
+function execEditorContents() {
 	noerror()
-	execute (editor.getValue() + ';');
+	execute(editor.getValue() + ';');
 }
 execBtn.addEventListener("click", execEditorContents, true);
 
 // Performance measurement functions
 var tictime;
-if (!window.performance || !performance.now) {window.performance = {now:Date.now}}
-function tic () {tictime = performance.now()}
+if (!window.performance || !performance.now) { window.performance = { now: Date.now } }
+function tic() { tictime = performance.now() }
 function toc(msg) {
-	var dt = performance.now()-tictime;
-	console.log((msg||'toc') + ": " + dt + "ms");
+	var dt = performance.now() - tictime;
+	console.log((msg || 'toc') + ": " + dt + "ms");
 }
 
 // Add syntax highlihjting to the textarea
 var editor = CodeMirror.fromTextArea(commandsElm, {
-    mode: 'text/x-mysql',
-    viewportMargin: Infinity,
-    indentWithTabs: true,
-    smartIndent: true,
-    lineNumbers: true,
-    matchBrackets : true,
-    autofocus: true,
-		extraKeys: {
-			"Ctrl-Enter": execEditorContents,
-			"Ctrl-S": savedb,
-		}
+	mode: 'text/x-mysql',
+	viewportMargin: Infinity,
+	indentWithTabs: true,
+	smartIndent: true,
+	lineNumbers: true,
+	matchBrackets: true,
+	autofocus: true,
+	extraKeys: {
+		"Ctrl-Enter": execEditorContents,
+		"Ctrl-S": savedb,
+	}
 });
 
 // Load a db from a file
-dbFileElm.onchange = function() {
+dbFileElm.onchange = function () {
 	var f = dbFileElm.files[0];
 	var r = new FileReader();
-	r.onload = function() {
+	r.onload = function () {
 		worker.onmessage = function () {
 			toc("Loading database from file");
 			// Show the schema of the loaded database
@@ -105,32 +105,33 @@ dbFileElm.onchange = function() {
 		};
 		tic();
 		try {
-			worker.postMessage({action:'open',buffer:r.result}, [r.result]);
+			worker.postMessage({ action: 'open', buffer: r.result }, [r.result]);
 		}
-		catch(exception) {
-			worker.postMessage({action:'open',buffer:r.result});
+		catch (exception) {
+			worker.postMessage({ action: 'open', buffer: r.result });
 		}
 	}
 	r.readAsArrayBuffer(f);
 }
 
 // Save the db to a file
-function savedb () {
-	worker.onmessage = function(event) {
+function savedb() {
+	worker.onmessage = function (event) {
 		toc("Exporting the database");
 		var arraybuff = event.data.buffer;
 		var blob = new Blob([arraybuff]);
 		var a = document.createElement("a");
+		document.body.appendChild(a);
 		a.href = window.URL.createObjectURL(blob);
 		a.download = "sql.db";
-		a.onclick = function() {
-			setTimeout(function() {
+		a.onclick = function () {
+			setTimeout(function () {
 				window.URL.revokeObjectURL(a.href);
 			}, 1500);
 		};
 		a.click();
 	};
 	tic();
-	worker.postMessage({action:'export'});
+	worker.postMessage({ action: 'export' });
 }
 savedbElm.addEventListener("click", savedb, true);

examples/GUI/index.html

@@ -1,5 +1,6 @@
 <!doctype html>
 <html>
+
 <head>
   <meta charset="utf8">
   <title>sql.js demo: Online SQL interpreter</title>
@@ -8,13 +9,17 @@
   <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.46.0/codemirror.js"></script>
 
 </head>
+
 <body>
-<!-- Github ribbon -->
-<a href="https://github.com/kripken/sql.js"><img style="position: absolute; top: 0; left: 0; border: 0;" src="https://camo.githubusercontent.com/82b228a3648bf44fc1163ef44c62fcc60081495e/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f6c6566745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_left_red_aa0000.png"></a>
+  <!-- Github ribbon -->
+  <a href="https://github.com/kripken/sql.js"><img style="position: absolute; top: 0; left: 0; border: 0;"
+      src="https://camo.githubusercontent.com/82b228a3648bf44fc1163ef44c62fcc60081495e/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f6c6566745f7265645f6161303030302e706e67"
+      alt="Fork me on GitHub"
+      data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_left_red_aa0000.png"></a>
 
-<h1>Online SQL interpreter</h1>
+  <h1>Online SQL interpreter</h1>
 
-<main>
+  <main>
     <label for='commands'>Enter some SQL</label>
     <br>
 
@@ -42,23 +47,24 @@ <h1>Online SQL interpreter</h1>
 SELECT designation,COUNT(*) AS nbr, (AVG(salary)) AS avg_salary FROM employees GROUP BY designation ORDER BY avg_salary DESC;
 SELECT name,hired_on FROM employees ORDER BY hired_on;</textarea>
 
-<button id="execute" class="button">Execute</button>
-<button id='savedb'  class="button">Save the db</button>
-<label class="button">Load an SQLite database file: <input type='file' id='dbfile' ></label>
+    <button id="execute" class="button">Execute</button>
+    <button id='savedb' class="button">Save the db</button>
+    <label class="button">Load an SQLite database file: <input type='file' id='dbfile'></label>
 
-<div id="error" class="error"></div>
+    <div id="error" class="error"></div>
 
-<pre id="output">Results will be displayed here</pre>
-</main>
+    <pre id="output">Results will be displayed here</pre>
+  </main>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.46.0/mode/sql/sql.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.46.0/mode/sql/sql.min.js"></script>
 
-<footer>
-Original work by kripken (<a href='https://github.com/kripken/sql.js'>sql.js</a>).
-C to Javascript compiler by kripken (<a href='https://github.com/kripken/emscripten'>emscripten</a>).
-Project now maintained by <a href='https://github.com/lovasoa'>lovasoa</a>
-</footer>
+  <footer>
+    Original work by kripken (<a href='https://github.com/kripken/sql.js'>sql.js</a>).
+    C to Javascript compiler by kripken (<a href='https://github.com/kripken/emscripten'>emscripten</a>).
+    Project now maintained by <a href='https://github.com/lovasoa'>lovasoa</a>
+  </footer>
 
-<script type="text/javascript" src="gui.js"></script>
+  <script type="text/javascript" src="gui.js"></script>
 </body>
-</html>
+
+</html>

examples/persistent.html

@@ -1,67 +1,70 @@
 <!doctype html>
 <html>
+
 <head>
 	<meta charset="utf8">
 	<title>Persistent sqlite</title>
 	<script src="../dist/sql-wasm.js"></script>
 </head>
+
 <body>
 	<p>You have seen this page <span id="views">0</span> times.</p>
 	<div>
 		You have been here on the following dates: <ol id="dates"></ol>
 	</div>
 	<script>
-  var baseUrl = '../dist/';
+		var baseUrl = '../dist/';
 
-	function toBinArray (str) {
-		var l = str.length,
+		function toBinArray(str) {
+			var l = str.length,
 				arr = new Uint8Array(l);
-		for (var i=0; i<l; i++) arr[i] = str.charCodeAt(i);
-		return arr;
-	}
+			for (var i = 0; i < l; i++) arr[i] = str.charCodeAt(i);
+			return arr;
+		}
 
-	function toBinString (arr) {
-		var uarr = new Uint8Array(arr);
-		var strings = [], chunksize = 0xffff;
-		// There is a maximum stack size. We cannot call String.fromCharCode with as many arguments as we want
-		for (var i=0; i*chunksize < uarr.length; i++){
-			strings.push(String.fromCharCode.apply(null, uarr.subarray(i*chunksize, (i+1)*chunksize)));
+		function toBinString(arr) {
+			var uarr = new Uint8Array(arr);
+			var strings = [], chunksize = 0xffff;
+			// There is a maximum stack size. We cannot call String.fromCharCode with as many arguments as we want
+			for (var i = 0; i * chunksize < uarr.length; i++) {
+				strings.push(String.fromCharCode.apply(null, uarr.subarray(i * chunksize, (i + 1) * chunksize)));
+			}
+			return strings.join('');
 		}
-		return strings.join('');
-	}
 
-	// Normally Sql.js tries to load sql-wasm.wasm relative to the page, not relative to the javascript
-	// doing the loading. So, we help it find the .wasm file with this function.
-	var config = { 
-		locateFile: filename => `${baseUrl}/${filename}` 
-	}
-	initSqlJs(config).then(function(SQL){
-		var dbstr = window.localStorage.getItem("viewcount.sqlite");
-		if (dbstr) {
-			var db = new SQL.Database(toBinArray(dbstr));
-		} else {
-			var db = new SQL.Database();
-			db.run("CREATE TABLE views (date INTEGER PRIMARY KEY)");
+		// Normally Sql.js tries to load sql-wasm.wasm relative to the page, not relative to the javascript
+		// doing the loading. So, we help it find the .wasm file with this function.
+		var config = {
+			locateFile: filename => `${baseUrl}/${filename}`
 		}
-		db.run("INSERT INTO views(date) VALUES (?)", [Date.now()]);
+		initSqlJs(config).then(function (SQL) {
+			var dbstr = window.localStorage.getItem("viewcount.sqlite");
+			if (dbstr) {
+				var db = new SQL.Database(toBinArray(dbstr));
+			} else {
+				var db = new SQL.Database();
+				db.run("CREATE TABLE views (date INTEGER PRIMARY KEY)");
+			}
+			db.run("INSERT INTO views(date) VALUES (?)", [Date.now()]);
 
-		document.getElementById('views').textContent = db.exec("SELECT COUNT(*) FROM views")[0].values[0][0];
+			document.getElementById('views').textContent = db.exec("SELECT COUNT(*) FROM views")[0].values[0][0];
 
-		var count = 0,
+			var count = 0,
 				dates = document.getElementById("dates");
 
-		db.each("SELECT date FROM views ORDER BY date ASC",
-				function callback (row) {
+			db.each("SELECT date FROM views ORDER BY date ASC",
+				function callback(row) {
 					var li = document.createElement("li");
 					li.textContent = new Date(row.date);
 					dates.appendChild(li);
-				}, function done () {
+				}, function done() {
 					var dbstr = toBinString(db.export());
 					window.localStorage.setItem("viewcount.sqlite", dbstr);
 				}
-		);
-	});
+			);
+		});
 
 	</script>
-	</body>
-</html>
+</body>
+
+</html>