Upgrade to Sqlite 3.28.0

Download sqlite on demand when building.
Remove old unused static sqlite source files.
No longer use keyword "nothing" in examples or tests because it leads to a SQL error. (NOTHING is now a reserved word in Sqlite)

Author: Taytay

LICENSE

@@ -20,3 +20,25 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+
+
+# Some portions of the Makefile taken from:
+Copyright 2017 Ryusei Yamaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Makefile

@@ -1,10 +1,20 @@
 # Note: Last built with version 1.38.30 of Emscripten
 
 # TODO: Emit a file showing which version of emcc and SQLite was used to compile the emitted output.
-# TODO: Make it easier to use a newer version of Sqlite.
 # TODO: Create a release on Github with these compiled assets rather than checking them in
 # TODO: Consider creating different files based on browser vs module usage: https://github.com/vuejs/vue/tree/dev/dist
 
+# I got this handy makefile syntax from : https://github.com/mandel59/sqlite-wasm (MIT License) Credited in LICENSE
+# To use another version of Sqlite, visit https://www.sqlite.org/download.html and copy the appropriate values here:
+SQLITE_AMALGAMATION = sqlite-amalgamation-3280000
+SQLITE_AMALGAMATION_ZIP_URL = https://www.sqlite.org/2019/sqlite-amalgamation-3280000.zip
+SQLITE_AMALGAMATION_ZIP_SHA1 = eb82fcc95104c8e2d9550ab023c1054b9cc40a76
+
+# Note that extension-functions.c hasn't been updated since 2010-02-06, so likely doesn't need to be updated 
+EXTENSION_FUNCTIONS = extension-functions.c
+EXTENSION_FUNCTIONS_URL = https://www.sqlite.org/contrib/download/extension-functions.c?get=25
+EXTENSION_FUNCTIONS_SHA1 = c68fa706d6d9ff98608044c00212473f9c14892f
+
 EMCC=emcc
 
 CFLAGS=-O2 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_DISABLE_LFS -DLONGDOUBLE_TYPE=double -DSQLITE_THREADSAFE=0 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
@@ -117,19 +127,61 @@ out/api.js: src/output-pre.js src/api.coffee src/exports.coffee src/api-data.cof
 	cat src/output-pre.js $@ src/output-post.js > out/api-wrapped.js
 	mv out/api-wrapped.js $@
 
-out/sqlite3.bc: sqlite/sqlite3.c
+out/sqlite3.bc: sqlite-src/$(SQLITE_AMALGAMATION)
 	# Generate llvm bitcode
-	$(EMCC) $(CFLAGS) sqlite/sqlite3.c -o out/sqlite3.bc
+	$(EMCC) $(CFLAGS) sqlite-src/$(SQLITE_AMALGAMATION)/sqlite3.c -o $@
 
-out/extension-functions.bc: sqlite/extension-functions.c
-	$(EMCC) $(CFLAGS) -s LINKABLE=1 sqlite/extension-functions.c -o out/extension-functions.bc
+out/extension-functions.bc: sqlite-src/$(SQLITE_AMALGAMATION)/$(EXTENSION_FUNCTIONS)
+	$(EMCC) $(CFLAGS) -s LINKABLE=1 sqlite-src/$(SQLITE_AMALGAMATION)/extension-functions.c -o $@
 
 # TODO: This target appears to be unused. If we re-instatate it, we'll need to add more files inside of the JS folder
 # module.tar.gz: test package.json AUTHORS README.md dist/sql-asm.js
 # 	tar --create --gzip $^ > $@
 
-.PHONY: clean
-clean:
-	rm -f out/* dist/*	
+## cache
+
+.PHONY: clean-cache
+clean-cache:
+	rm -rf cache
+
+cache/$(SQLITE_AMALGAMATION).zip:
+	mkdir -p cache
+	curl -LsSf '$(SQLITE_AMALGAMATION_ZIP_URL)' -o $@
+
+cache/$(EXTENSION_FUNCTIONS):
+	mkdir -p cache
+	curl -LsSf '$(EXTENSION_FUNCTIONS_URL)' -o $@
+
+## sqlite-src
+
+.PHONY: clean-sqlite-src
+clean-sqlite-src:
+	rm -rf sqlite
+
+.PHONY: sqlite-src
+sqlite-src: sqlite-src/$(SQLITE_AMALGAMATION) sqlite-src/$(EXTENSION_FUNCTIONS)
+
+sqlite-src/$(SQLITE_AMALGAMATION): cache/$(SQLITE_AMALGAMATION).zip
+	mkdir -p sqlite-src
+	echo '$(SQLITE_AMALGAMATION_ZIP_SHA1)  ./cache/$(SQLITE_AMALGAMATION).zip' > cache/check.txt
+	sha1sum -c cache/check.txt
+	rm -rf $@
+	unzip 'cache/$(SQLITE_AMALGAMATION).zip' -d sqlite-src/
+	touch $@
+
+sqlite-src/$(SQLITE_AMALGAMATION)/$(EXTENSION_FUNCTIONS): cache/$(EXTENSION_FUNCTIONS)
+	mkdir -p sqlite-src
+	echo '$(EXTENSION_FUNCTIONS_SHA1)  ./cache/$(EXTENSION_FUNCTIONS)' > cache/check.txt
+	sha1sum -c cache/check.txt
+	cp 'cache/$(EXTENSION_FUNCTIONS)' $@
+
+
+.PHONY: clean 
+clean: 
+	rm -rf out/* dist/*	
 
+.PHONY: clean-all
+clean-all: 
+	rm -f out/* dist/* cache/*
+	rm -rf sqlite-src/
 

README.md

@@ -1,7 +1,7 @@
 # SQLite compiled to javascript
 [![Build Status](https://travis-ci.org/kripken/sql.js.svg?branch=master)](http://travis-ci.org/kripken/sql.js) [![CDNJS version](https://img.shields.io/cdnjs/v/sql.js.svg)](https://cdnjs.com/libraries/sql.js)
 
-For the impatients, try the demo here: http://kripken.github.io/sql.js/GUI/
+For the impatients, try the demo here: http://kripken.github.io/sql.js/examples/GUI
 
 *sql.js* is a port of [SQLite](http://sqlite.org/about.html) to Webassembly, by compiling the SQLite C code with [Emscripten](http://kripken.github.io/emscripten-site/docs/introducing_emscripten/about_emscripten.html). It uses a [virtual database file stored in memory](https://kripken.github.io/emscripten-site/docs/porting/files/file_systems_overview.html), and thus **doesn't persist the changes** made to the database. However, it allows you to **import** any existing sqlite file, and to **export** the created database as a [javascript typed array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Typed_arrays).
 
@@ -11,6 +11,11 @@ SQLite is public domain, sql.js is MIT licensed.
 
 Sql.js predates WebAssembly, and thus started as an [asm.js](https://en.wikipedia.org/wiki/Asm.js) project. It still supports asm.js for backwards compatability.
 
+## Version of binaries
+Sql.js was last built with:
+Emscripten version 1.38.30 (2019-04-16) [Release History](https://emscripten.org/docs/introducing_emscripten/release_notes.html)
+SqlLite version: 3.28.0 (2019-04-16) [Release History](https://www.sqlite.org/changes.html)
+
 ## Documentation
 A [full documentation](http://kripken.github.io/sql.js/documentation/#http://kripken.github.io/sql.js/documentation/class/Database.html) generated from comments inside the source code, is available.
 
@@ -219,7 +224,7 @@ This library includes both WebAssembly and asm.js versions of Sqlite. (WebAssemb
 
 ## Upgrading from 0.x to 1.x
 
-Version 1.0 of sql.js introduces a number of breaking changes due primarily to the fact that WebAssembly must be loaded asynchronously, whereas asm.js was able to be loaded synchronously. 
+Version 1.0 of sql.js must be loaded asynchronously, whereas asm.js was able to be loaded synchronously. 
 
 So in the past, you would:
 ```html
@@ -255,9 +260,7 @@ initSqlJs().then(function(SQL){
 });
 ```
 
-
-
-
+`NOTHING` is now a reserved word in SQLite, whereas previously it was not. This could cause errors like `Error: near "nothing": syntax error`
 
 ### Downloading/Using: ###
 Although asm.js files were distributed as a single Javascript file, WebAssembly libraries are most efficiently distributed as a pair of files, the `.js`  loader and the `.wasm` file, like [dist/sql-wasm.js]([dist/sql-wasm.js]) and [dist/sql-wasm.wasm]([dist/sql-wasm.wasm]). The `.js` file is reponsible for wrapping/loading the `.wasm` file.