Fix bug in db.exec with queries that contain ';'

lovasoa · lovasoa · commit 707291d47b5c · 2014-11-10T17:20:26.000+01:00
db.exec used the character ';' to split queries. But a single statement can contain a ';' character. Since the js string is not split anymore, you might also notice a small performance improvement while using db.exec with many different queries. Fix sql-js#73
diff --git a/coffee/api.coffee b/coffee/api.coffee
@@ -307,12 +307,25 @@ class Database
 	###
 	'exec': (sql) ->
 		if not @db then throw "Database closed"
+
+		stack = Runtime.stackSave()
+		# Store the SQL string in memory. The string will be consumed, one statement
+		# at a time, by sqlite3_prepare_v2_sqlptr.
+		# Allocate at most 4 bytes per UTF8 char, +1 for the trailing '\0'
+		nextSqlPtr = Runtime.stackAlloc(sql.length<<2 + 1)
+		writeStringToMemory sql, nextSqlPtr
+		# Used to store a pointer to the next SQL statement in the string
+		pzTail = Runtime.stackAlloc(4)
+
 		results = []
-		for sqlstr in sql.split ';'
-			try stmt = @['prepare'] sqlstr
-			catch err
-				if err is 'Nothing to prepare' then continue
-				else throw err
+		while getValue(nextSqlPtr,'i8') isnt NULL
+			setValue apiTemp, 0, 'i32'
+			setValue pzTail, 0, 'i32'
+			@handleError sqlite3_prepare_v2_sqlptr @db, nextSqlPtr, -1, apiTemp, pzTail
+			pStmt = getValue apiTemp, 'i32' #  pointer to a statement, or null
+			nextSqlPtr = getValue pzTail, 'i32'
+			if pStmt is NULL then continue # Empty statement
+			stmt = new Statement pStmt, this
 			curresult = null
 			while stmt['step']()
 				if curresult is null
@@ -322,6 +335,7 @@ class Database
 					results.push curresult
 				curresult['values'].push stmt['get']()
 			stmt['free']()
+		Runtime.stackRestore stack
 		return results
 
 	### Execute an sql statement, and call a callback for each row of result.
diff --git a/coffee/exports.coffee b/coffee/exports.coffee
@@ -6,6 +6,9 @@ sqlite3_free = Module['cwrap'] 'sqlite3_free', '', ['number']
 # Prepared statements
 ## prepare
 sqlite3_prepare_v2 = Module['cwrap'] 'sqlite3_prepare_v2', 'number', ['number', 'string', 'number', 'number', 'number']
+# Version of sqlite3_prepare_v2 to which a pointer to a string that is already
+# in memory is passed.
+sqlite3_prepare_v2_sqlptr = Module['cwrap'] 'sqlite3_prepare_v2', 'number', ['number', 'number', 'number', 'number', 'number']
 ## Bind parameters
 
 #int sqlite3_bind_text(sqlite3_stmt*, int, const char*, int n, void(*)(void*));
