Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return proper error messages when running parallel queries #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Return proper error messages when running parallel queries #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 39 additions & 0 deletions sqlite.js
View file
Open in desktop
Expand Up @@ -225,3 +225,42 @@ Database.prototype.insertMany = function (table, columns, rows, callback) {
});
}


exports.fromErrorCode = function(code) {
switch (code) {
case 0: return "SQLITE_OK";
case 1: return "SQLITE_ERROR";
case 2: return "SQLITE_INTERNAL";
case 3: return "SQLITE_PERM";
case 4: return "SQLITE_ABORT";
case 5: return "SQLITE_BUSY";
case 6: return "SQLITE_LOCKED";
case 7: return "SQLITE_NOMEM";
case 8: return "SQLITE_READONLY";
case 9: return "SQLITE_INTERRUPT";
case 10: return "SQLITE_IOERR";
case 11: return "SQLITE_CORRUPT";
case 12: return "SQLITE_NOTFOUND";
case 13: return "SQLITE_FULL";
case 14: return "SQLITE_CANTOPEN";
case 15: return "SQLITE_PROTOCOL";
case 16: return "SQLITE_EMPTY";
case 17: return "SQLITE_SCHEMA";
case 18: return "SQLITE_TOOBIG";
case 19: return "SQLITE_CONSTRAINT";
case 20: return "SQLITE_MISMATCH";
case 21: return "SQLITE_MISUSE";
case 22: return "SQLITE_NOLFS";
case 23: return "SQLITE_AUTH";
case 24: return "SQLITE_FORMAT";
case 25: return "SQLITE_RANGE";
case 26: return "SQLITE_NOTADB";
}
};

exports.sanitizeError = function(err, data) {
err.message = exports.fromErrorCode(err.errno) + ', ' + err.message +
' in query "' + err.query +
'" with values ' + JSON.stringify(data, false, 4);
return err;
};
22 changes: 17 additions & 5 deletions src/statement.cc
View file
Open in desktop
Expand Up @@ -485,8 +485,11 @@ int Statement::EIO_AfterStep(eio_req *req) {
Local<Value> argv[2];

if (sto->error_) {
argv[0] = Exception::Error(
String::New(sqlite3_errmsg(db)));
Local<Value> e = Exception::Error(sto->error_msg_);
Local<Object> obj = e->ToObject();
obj->Set(NODE_PSYMBOL("errno"), Integer::New(sto->error_));
obj->Set(NODE_PSYMBOL("query"), String::NewSymbol(sqlite3_sql(sto->stmt_)));
argv[0] = e;
}
else {
argv[0] = Local<Value>::New(Undefined());
Expand Down Expand Up @@ -586,6 +589,7 @@ int Statement::EIO_Step(eio_req *req) {
sqlite3_stmt *stmt = sto->stmt_;
assert(stmt);
int rc;
const char *msg;

// check if we have already taken a step immediately after prepare
if (sto->first_rc_ != -1) {
Expand All @@ -597,10 +601,16 @@ int Statement::EIO_Step(eio_req *req) {
sto->first_rc_ = -1;
}
else {
rc = req->result = sqlite3_step(stmt);
sqlite3* db = sqlite3_db_handle(stmt);
sqlite3_mutex* mtx = sqlite3_db_mutex(db);
sqlite3_mutex_enter(mtx);
rc = sqlite3_step(stmt);
if (rc != SQLITE_ROW && rc != SQLITE_DONE) msg = sqlite3_errmsg(db);
sqlite3_mutex_leave(mtx);
req->result = rc;
}

sto->error_ = false;
sto->error_ = SQLITE_OK;

if (rc == SQLITE_ROW) {
// If this pointer is NULL, look up and store the columns names.
Expand Down Expand Up @@ -667,7 +677,9 @@ int Statement::EIO_Step(eio_req *req) {
// nothing to do in this case
}
else {
sto->error_ = true;
HandleScope scope;
sto->error_ = rc;
sto->error_msg_ = scope.Close(String::NewSymbol(msg));
sto->cells = NULL;
}

Expand Down
3 changes: 2 additions & 1 deletion src/statement.h
View file
Open in desktop
Expand Up @@ -102,7 +102,8 @@ class Statement : public EventEmitter {

int column_count_;
char **column_names_;
bool error_;
int error_;
Local<String> error_msg_;

int first_rc_;
int mode_;
Expand Down