simplified .all and added tests for it

JoshuaWise · JoshuaWise · commit 70cfc053386c · 2016-09-17T20:02:18.000-04:00
diff --git a/src/objects/statement/all.cc b/src/objects/statement/all.cc
@@ -28,9 +28,8 @@ NAN_METHOD(Statement::All) {
 		v8::Local<v8::Array> returnedArray = Nan::New<v8::Array>(row_count);
 		
 		if (row_count > 0) {
-			unsigned int i = 0;
-			rows.Flush([&returnedArray, &i] (v8::Local<v8::Value> value) {
-				Nan::Set(returnedArray, i++, value);
+			rows.Flush([&returnedArray, &row_count] (v8::Local<v8::Value> value) {
+				Nan::Set(returnedArray, --row_count, value);
 			});
 		}
 		QUERY_RETURN(stmt, STATEMENT_CLEAR_BINDINGS, returnedArray);
diff --git a/src/util/list.h b/src/util/list.h
@@ -9,10 +9,9 @@ class List {
 			Node* next;
 		} Node;
 		Node* first;
-		Node* last;
 		
 	public:
-		explicit List() : first(NULL), last(NULL) {}
+		explicit List() : first(NULL) {}
 		
 		~List() {
 			while (first != NULL) {
@@ -22,30 +21,24 @@ class List {
 			}
 		}
 		
-		// Pushes an item onto the list.
+		// Unshifts an item onto the list.
 		void Add(T item) {
 			Node* new_node = new Node;
 			new_node->item = item;
-			new_node->next = NULL;
-			if (last == NULL) {
-				first = last = new_node;
-			} else {
-				last->next = new_node;
-				last = new_node;
-			}
+			new_node->next = first;
+			first = new_node;
 		}
 		
 		// Executes a function for each item in the list, and removes them all
 		// from the list. The passed function must not modify the list.
-		// The execution order goes from first-added to last-added.
+		// The execution order goes from last-added to first-added.
 		template <class F> void Flush(F fn) {
 			while (first != NULL) {
 				fn(first->item);
 				Node* next = first->next;
 				delete first;
 				first = next;
 			}
-			last = NULL;
 		}
 };
 
diff --git a/test/10.database.open.js b/test/10.database.open.js
@@ -1,7 +1,17 @@
 var expect = require('chai').expect;
 var fs = require('fs');
 var Database = require('../.');
-var util = require('../tools/test-util.js');
+var util = (function () {
+	var path = require('path');
+	var dbId = 0;
+	var obj;
+	return obj = {
+		current: function () {
+			return 'temp/' + path.basename(__filename).split('.')[0] + '.' + dbId + '.db';
+		},
+		next: function () {++dbId; return obj.current();}
+	};
+}());
 
 describe('new Database()', function () {
 	it('should throw an exception when file path is not a string', function () {
diff --git a/test/11.database.close.js b/test/11.database.close.js
@@ -1,6 +1,16 @@
 var expect = require('chai').expect;
 var Database = require('../.');
-var util = require('../tools/test-util.js');
+var util = (function () {
+	var path = require('path');
+	var dbId = 0;
+	var obj;
+	return obj = {
+		current: function () {
+			return 'temp/' + path.basename(__filename).split('.')[0] + '.' + dbId + '.db';
+		},
+		next: function () {++dbId; return obj.current();}
+	};
+}());
 
 describe('Database#close()', function () {
 	describe('before opening it', function () {
diff --git a/test/12.database.pragma.js b/test/12.database.pragma.js
@@ -1,6 +1,16 @@
 var expect = require('chai').expect;
 var Database = require('../.');
-var util = require('../tools/test-util.js');
+var util = (function () {
+	var path = require('path');
+	var dbId = 0;
+	var obj;
+	return obj = {
+		current: function () {
+			return 'temp/' + path.basename(__filename).split('.')[0] + '.' + dbId + '.db';
+		},
+		next: function () {++dbId; return obj.current();}
+	};
+}());
 
 describe('Database#pragma()', function () {
 	it('should throw an exception if a string is not provided', function (done) {
diff --git a/test/13.database.prepare.js b/test/13.database.prepare.js
@@ -1,6 +1,16 @@
 var expect = require('chai').expect;
 var Database = require('../.');
-var util = require('../tools/test-util.js');
+var util = (function () {
+	var path = require('path');
+	var dbId = 0;
+	var obj;
+	return obj = {
+		current: function () {
+			return 'temp/' + path.basename(__filename).split('.')[0] + '.' + dbId + '.db';
+		},
+		next: function () {++dbId; return obj.current();}
+	};
+}());
 
 describe('Database#prepare()', function () {
 	it('should throw an exception if a string is not provided', function (done) {
diff --git a/test/14.database.transaction.js b/test/14.database.transaction.js
@@ -1,6 +1,16 @@
 var expect = require('chai').expect;
 var Database = require('../.');
-var util = require('../tools/test-util.js');
+var util = (function () {
+	var path = require('path');
+	var dbId = 0;
+	var obj;
+	return obj = {
+		current: function () {
+			return 'temp/' + path.basename(__filename).split('.')[0] + '.' + dbId + '.db';
+		},
+		next: function () {++dbId; return obj.current();}
+	};
+}());
 
 describe('Database#transaction()', function () {
 	it('should throw an exception if an array of strings is not provided', function (done) {
diff --git a/test/20.statement.run.js b/test/20.statement.run.js
@@ -1,11 +1,10 @@
 'use strict';
 var expect = require('chai').expect;
 var Database = require('../.');
-var util = require('../tools/test-util.js');
 var db;
 
 before(function (done) {
-	db = new Database(util.next());
+	db = new Database('temp/' + require('path').basename(__filename).split('.')[0] + '.db');
 	db.on('open', done);
 });
 
diff --git a/test/21.statement.get.js b/test/21.statement.get.js
@@ -1,11 +1,10 @@
 'use strict';
 var expect = require('chai').expect;
 var Database = require('../.');
-var util = require('../tools/test-util.js');
 var db;
 
 before(function (done) {
-	db = new Database(util.next());
+	db = new Database('temp/' + require('path').basename(__filename).split('.')[0] + '.db');
 	db.on('open', done);
 });
 
diff --git a/test/22.statement.all.js b/test/22.statement.all.js
@@ -0,0 +1,84 @@
+'use strict';
+var expect = require('chai').expect;
+var Database = require('../.');
+var db;
+
+before(function (done) {
+	db = new Database('temp/' + require('path').basename(__filename).split('.')[0] + '.db');
+	db.on('open', done);
+});
+
+describe('Statement#all()', function () {
+	it('should throw an exception when used on a write statement', function () {
+		db.prepare('CREATE TABLE entries (a TEXT, b INTEGER, c REAL, d BLOB, e TEXT)').run();
+		var stmt = db.prepare("INSERT INTO entries VALUES ('foo', 1, 3.14, x'dddddddd', NULL)");
+		expect(stmt.readonly).to.be.false;
+		expect(function () {stmt.all();}).to.throw(TypeError);
+	});
+	it('should return the first matching row', function () {
+		db.prepare("INSERT INTO entries WITH RECURSIVE temp(a, b, c, d, e) AS (SELECT 'foo', 1, 3.14, x'dddddddd', NULL UNION ALL SELECT a, b + 1, c, d, e FROM temp LIMIT 10) SELECT * FROM temp").run();
+		var row = {a: 'foo', b: 1, c: 3.14, d: Buffer.alloc(4).fill(0xdd), e: null};
+		
+		var stmt = db.prepare("SELECT * FROM entries");
+		expect(stmt.readonly).to.be.true;
+		matchesFrom(stmt.all(), 1);
+		
+		stmt = db.prepare("SELECT * FROM entries WHERE b > 5");
+		matchesFrom(stmt.all(), 6);
+		
+		function matchesFrom(rows, i) {
+			for (var index = 0; i<=10; ++i, ++index) {
+				row.b = i;
+				expect(rows[index]).to.deep.equal(row);
+			}
+			expect(index).to.equal(rows.length);
+		}
+	});
+	it('should obey the current pluck setting', function () {
+		var stmt = db.prepare("SELECT * FROM entries");
+		var plucked = new Array(10).fill('foo');
+		expect(stmt.all()).to.not.deep.equal(plucked);
+		expect(stmt.pluck(true).all()).to.deep.equal(plucked);
+		expect(stmt.all()).to.deep.equal(plucked);
+		expect(stmt.pluck(false).all()).to.not.deep.equal(plucked);
+		expect(stmt.all()).to.not.deep.equal(plucked);
+		expect(stmt.pluck().all()).to.deep.equal(plucked);
+		expect(stmt.all()).to.deep.equal(plucked);
+	});
+	it('should return an empty array when no rows were found', function () {
+		var stmt = db.prepare("SELECT * FROM entries WHERE b == 999");
+		expect(stmt.all()).to.deep.equal([]);
+		expect(stmt.pluck().all()).to.deep.equal([]);
+	});
+	it('should accept bind parameters', function () {
+		var rows = [{a: 'foo', b: 1, c: 3.14, d: Buffer.alloc(4).fill(0xdd), e: null}];
+		var SQL1 = 'SELECT * FROM entries WHERE a=? AND b=? AND c=? AND d=? AND e IS ?';
+		var SQL2 = 'SELECT * FROM entries WHERE a=@a AND b=@b AND c=@c AND d=@d AND e IS @e';
+		var result = db.prepare(SQL1).all('foo', 1, 3.14, Buffer.alloc(4).fill(0xdd), null);
+		expect(result).to.deep.equal(rows);
+		
+		result = db.prepare(SQL1).all(['foo', 1, 3.14, Buffer.alloc(4).fill(0xdd), null]);
+		expect(result).to.deep.equal(rows);
+		
+		result = db.prepare(SQL1).all(['foo', 1], [3.14], Buffer.alloc(4).fill(0xdd), [,]);
+		expect(result).to.deep.equal(rows);
+		
+		result = db.prepare(SQL2).all({a: 'foo', b: 1, c: 3.14, d: Buffer.alloc(4).fill(0xdd), e: undefined});
+		expect(result).to.deep.equal(rows);
+		
+		result = db.prepare(SQL2).all({a: 'foo', b: 1, c: 3.14, d: Buffer.alloc(4).fill(0xaa), e: undefined});
+		expect(result).to.deep.equal([]);
+		
+		expect(function () {
+			db.prepare(SQL2).all({a: 'foo', b: 1, c: 3.14, d: Buffer.alloc(4).fill(0xdd)});
+		}).to.throw(Error);
+		
+		expect(function () {
+			db.prepare(SQL1).all();
+		}).to.throw(Error);
+		
+		expect(function () {
+			db.prepare(SQL2).all({});
+		}).to.throw(Error);
+	});
+});
diff --git a/test/99.database.checkpoint.js b/test/99.database.checkpoint.js
@@ -1,6 +1,5 @@
 var expect = require('chai').expect;
 var Database = require('../.');
-var util = require('../tools/test-util.js');
 
 describe('Database#checkpoint()', function () {
 	
diff --git a/tools/test-util.js b/tools/test-util.js
