read-only statements that do not return data can now be executed with .run()

Author: JoshuaWise

src/objects/database/create-statement.cc

@@ -40,14 +40,13 @@ NAN_METHOD(Database::CreateStatement) {
 		return Nan::ThrowTypeError("The supplied SQL string contains more than one statement.");
 	}
 
-	// Determine if the sqlite3_stmt is read-only or not.
-	if (!sqlite3_stmt_readonly(stmt->st_handle)) {
+	// Determine if the sqlite3_stmt returns data or not.
+	int column_count = sqlite3_column_count(stmt->st_handle);
+	if (!sqlite3_stmt_readonly(stmt->st_handle) || column_count < 1) {
 		stmt->column_count = 0;
 	} else {
-		stmt->column_count = sqlite3_column_count(stmt->st_handle);
-		if (stmt->column_count < 1) {
-			return Nan::ThrowTypeError("This read-only SQL statement returns no result columns.");
-		}
+		stmt->column_count = column_count;
+		stmt->state |= RETURNS_DATA
 	}
 	Nan::ForceSet(statement, NEW_INTERNAL_STRING_FAST("source"), source, FROZEN);
 	Nan::ForceSet(statement, NEW_INTERNAL_STRING_FAST("database"),  info.This(), FROZEN);

src/objects/statement/all.cc

@@ -2,8 +2,8 @@
 
 NAN_METHOD(Statement::All) {
 	Statement* stmt = Nan::ObjectWrap::Unwrap<Statement>(info.This());
-	if (stmt->column_count == 0) {
-		return Nan::ThrowTypeError("This statement is not read-only. Use run() instead.");
+	if (!(stmt->state & RETURNS_DATA)) {
+		return Nan::ThrowTypeError("This statement does not return data. Use run() instead.");
 	}
 	QUERY_START(stmt, statement, STATEMENT_BIND, SQLITE_STATIC, info, info.Length());
 

src/objects/statement/each.cc

@@ -2,8 +2,8 @@
 
 NAN_METHOD(Statement::Each) {
 	Statement* stmt = Nan::ObjectWrap::Unwrap<Statement>(info.This());
-	if (stmt->column_count == 0) {
-		return Nan::ThrowTypeError("This statement is not read-only. Use run() instead.");
+	if (!(stmt->state & RETURNS_DATA)) {
+		return Nan::ThrowTypeError("This statement does not return data. Use run() instead.");
 	}
 	REQUIRE_LAST_ARGUMENT_FUNCTION(func_index, callback);
 	QUERY_START(stmt, statement, STATEMENT_BIND, SQLITE_TRANSIENT, info, func_index);

src/objects/statement/get.cc

@@ -2,8 +2,8 @@
 
 NAN_METHOD(Statement::Get) {
 	Statement* stmt = Nan::ObjectWrap::Unwrap<Statement>(info.This());
-	if (stmt->column_count == 0) {
-		return Nan::ThrowTypeError("This statement is not read-only. Use run() instead.");
+	if (!(stmt->state & RETURNS_DATA)) {
+		return Nan::ThrowTypeError("This statement does not return data. Use run() instead.");
 	}
 	QUERY_START(stmt, statement, STATEMENT_BIND, SQLITE_STATIC, info, info.Length());
 

src/objects/statement/pluck.cc

@@ -2,8 +2,8 @@
 
 NAN_METHOD(Statement::Pluck) {
 	Statement* stmt = Nan::ObjectWrap::Unwrap<Statement>(info.This());
-	if (stmt->column_count == 0) {
-		return Nan::ThrowTypeError("The pluck() method can only be used by read-only statements.");
+	if (!(stmt->state & RETURNS_DATA)) {
+		return Nan::ThrowTypeError("The pluck() method can only be used by statements that return data.");
 	}
 
 	if (info.Length() == 0 || info[0]->BooleanValue() == true) {

src/objects/statement/run.cc

@@ -2,8 +2,8 @@
 
 NAN_METHOD(Statement::Run) {
 	Statement* stmt = Nan::ObjectWrap::Unwrap<Statement>(info.This());
-	if (stmt->column_count != 0) {
-		return Nan::ThrowTypeError("This statement is read-only. Use get(), all(), or each() instead.");
+	if (stmt->state & RETURNS_DATA) {
+		return Nan::ThrowTypeError("This statement returns data. Use get(), all(), or each() instead.");
 	}
 	QUERY_START(stmt, statement, STATEMENT_BIND, SQLITE_STATIC, info, info.Length());
 

src/objects/statement/statement.cc

@@ -34,7 +34,7 @@ void Statement::Init() {
 	t->InstanceTemplate()->SetInternalFieldCount(1);
 	t->SetClassName(Nan::New("Statement").ToLocalChecked());
 
-	Nan::SetAccessor(t->InstanceTemplate(), Nan::New("readonly").ToLocalChecked(), Readonly);
+	Nan::SetAccessor(t->InstanceTemplate(), Nan::New("returnsData").ToLocalChecked(), ReturnsData);
 	Nan::SetPrototypeMethod(t, "safeIntegers", SafeIntegers);
 	Nan::SetPrototypeMethod(t, "bind", Bind);
 	Nan::SetPrototypeMethod(t, "pluck", Pluck);

src/objects/statement/statement.h

@@ -28,7 +28,7 @@ class Statement : public Nan::ObjectWrap, public Query {
 	private:
 		static CONSTRUCTOR(constructor);
 		static NAN_METHOD(New);
-		static NAN_GETTER(Readonly);
+		static NAN_GETTER(ReturnsData);
 		static NAN_METHOD(SafeIntegers);
 		static NAN_METHOD(Bind);
 		static NAN_METHOD(Pluck);
@@ -41,7 +41,7 @@ class Statement : public Nan::ObjectWrap, public Query {
 		// Sqlite3 interfacing and state
 		Database* db;
 		sqlite3_stmt* st_handle;
-		int column_count; // If this is 0, the statement is a write statement
+		int column_count;
 		uint8_t state;
 
 		// Unique Statement Id

src/objects/statement/util.cc

@@ -28,9 +28,9 @@ v8::Local<v8::Object> Statement::GetBindMap() {
 	return namedParams;
 }
 
-// get .readonly -> boolean
-NAN_GETTER(Statement::Readonly) {
-	info.GetReturnValue().Set(Nan::ObjectWrap::Unwrap<Statement>(info.This())->column_count != 0);
+// get .returnsData -> boolean
+NAN_GETTER(Statement::ReturnsData) {
+	info.GetReturnValue().Set((Nan::ObjectWrap::Unwrap<Statement>(info.This())->state & RETURNS_DATA) ? true : false);
 }
 
 // .safeIntegers(boolean) -> this

src/util/macros.h

@@ -15,6 +15,7 @@
 #define HAS_BIND_MAP 0x8
 #define SAFE_INTS 0x10
 #define PLUCK_COLUMN 0x20
+#define RETURNS_DATA 0x40
 
 // Given a v8::String, returns a pointer to a heap-allocated C-String clone.
 inline char* C_STRING(v8::Local<v8::String> string) {