Commit 113c3719 by Konstantin Käfer

Merge branch 'master' of github.com:developmentseed/node-sqlite3

Conflicts:
	test/fts-content.test.js
	test/scheduling.test.js
parents ad321167 6e47b2dd
...@@ -5,7 +5,7 @@ describe('scheduling', function() { ...@@ -5,7 +5,7 @@ describe('scheduling', function() {
it('scheduling after the database was closed', function(done) { it('scheduling after the database was closed', function(done) {
var db = new sqlite3.Database(':memory:'); var db = new sqlite3.Database(':memory:');
db.on('error', function(err) { db.on('error', function(err) {
assert.equal(err.message, "SQLITE_MISUSE: Database handle is closed"); assert.ok(err.message && err.message.indexOf("SQLITE_MISUSE: Database handle is closed") > -1);
done(); done();
}); });
...@@ -22,7 +22,7 @@ describe('scheduling', function() { ...@@ -22,7 +22,7 @@ describe('scheduling', function() {
db.close(); db.close();
db.run("CREATE TABLE foo (id int)", function(err) { db.run("CREATE TABLE foo (id int)", function(err) {
assert.ok(err.message, "SQLITE_MISUSE: Database handle is closed"); assert.ok(err.message && err.message.indexOf("SQLITE_MISUSE: Database handle is closed") > -1);
done(); done();
}); });
}); });
...@@ -34,7 +34,7 @@ describe('scheduling', function() { ...@@ -34,7 +34,7 @@ describe('scheduling', function() {
if (err) throw err; if (err) throw err;
db.close(function(err) { db.close(function(err) {
assert.ok(err); assert.ok(err);
assert.equal(err.message, "SQLITE_BUSY: unable to close due to unfinalised statements"); assert.ok(err.message && err.message.indexOf("SQLITE_BUSY: unable to close due to") > -1);
// Running a statement now should not fail. // Running a statement now should not fail.
stmt.run(done); stmt.run(done);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment