fixed bug

Author: Joshua Wise

src/binder/bind-buffer.cc

@@ -5,7 +5,7 @@
 void Binder::BindBuffer(v8::Local<v8::Object> value, int index) {
 	if (!index) {index = NextAnonIndex();}
 
-	int status = sqlite3_bind_blob(handle, index, node::Buffer::Data(value), node::Buffer::Length(value), transient_buffers ? SQLITE_TRANSIENT : bind_type);
+	int status = sqlite3_bind_blob(handle, index, node::Buffer::Data(value), node::Buffer::Length(value), bind_type);
 
 	SetBindingError(status);
 }

src/binder/bind-string.cc

@@ -6,7 +6,7 @@ void Binder::BindString(v8::Local<v8::String> value, int index) {
 	if (!index) {index = NextAnonIndex();}
 
 	v8::String::Utf8Value utf8(value);
-	int status = sqlite3_bind_text(handle, index, *utf8, utf8.length(), bind_type);
+	int status = sqlite3_bind_text(handle, index, *utf8, utf8.length(), SQLITE_TRANSIENT);
 
 	SetBindingError(status);
 }

src/binder/binder.cc

@@ -23,15 +23,14 @@
 #include "bind-object.cc"
 #include "bind.cc"
 
-Binder::Binder(sqlite3_stmt* handle, sqlite3_destructor_type bind_type, bool transient_buffers)
+Binder::Binder(sqlite3_stmt* handle, sqlite3_destructor_type bind_type)
 	: handle(handle)
 	, param_count(sqlite3_bind_parameter_count(handle))
 	, anon_index(0)
 	, error(NULL)
 	, error_extra(NULL)
 	, error_full(NULL)
-	, bind_type(bind_type)
-	, transient_buffers(transient_buffers) {}
+	, bind_type(bind_type) {}
 
 Binder::~Binder() {
 	delete[] error_extra;

src/binder/binder.h

@@ -8,7 +8,7 @@ class Int64;
 
 class Binder {
 	public:
-		explicit Binder(sqlite3_stmt*, sqlite3_destructor_type, bool = false);
+		explicit Binder(sqlite3_stmt*, sqlite3_destructor_type);
 		~Binder();
 		virtual void Bind(Nan::NAN_METHOD_ARGS_TYPE, int, Query*);
 		const char* GetError();
@@ -37,7 +37,6 @@ class Binder {
 		const char* error_full;
 
 		sqlite3_destructor_type bind_type;
-		bool transient_buffers;
 };
 
 #endif

src/objects/statement/all.cc

@@ -5,7 +5,7 @@ NAN_METHOD(Statement::All) {
 	if (stmt->column_count == 0) {
 		return Nan::ThrowTypeError("This statement is not read-only. Use run() instead.");
 	}
-	QUERY_START(stmt, statement, STATEMENT_BIND, info, info.Length());
+	QUERY_START(stmt, statement, STATEMENT_BIND, SQLITE_STATIC, info, info.Length());
 
 	unsigned int row_count = 0;
 	List<v8::Local<v8::Value>> rows;

src/objects/statement/each.cc

@@ -6,7 +6,7 @@ NAN_METHOD(Statement::Each) {
 		return Nan::ThrowTypeError("This statement is not read-only. Use run() instead.");
 	}
 	REQUIRE_LAST_ARGUMENT_FUNCTION(func_index, callback);
-	QUERY_START(stmt, statement, STATEMENT_BIND_T_BUFFERS, info, func_index);
+	QUERY_START(stmt, statement, STATEMENT_BIND, SQLITE_TRANSIENT, info, func_index);
 	stmt->db->in_each = true;
 
 	// Retrieve and feed rows.

src/objects/statement/get.cc

@@ -5,7 +5,7 @@ NAN_METHOD(Statement::Get) {
 	if (stmt->column_count == 0) {
 		return Nan::ThrowTypeError("This statement is not read-only. Use run() instead.");
 	}
-	QUERY_START(stmt, statement, STATEMENT_BIND, info, info.Length());
+	QUERY_START(stmt, statement, STATEMENT_BIND, SQLITE_STATIC, info, info.Length());
 
 	int status = sqlite3_step(stmt->st_handle);
 	if (status == SQLITE_ROW) {

src/objects/statement/run.cc

@@ -5,7 +5,7 @@ NAN_METHOD(Statement::Run) {
 	if (stmt->column_count != 0) {
 		return Nan::ThrowTypeError("This statement is read-only. Use get(), all(), or each() instead.");
 	}
-	QUERY_START(stmt, statement, STATEMENT_BIND, info, info.Length());
+	QUERY_START(stmt, statement, STATEMENT_BIND, SQLITE_STATIC, info, info.Length());
 
 	sqlite3* db_handle = stmt->db->db_handle;
 	int total_changes_before = sqlite3_total_changes(db_handle);

src/objects/transaction/run.cc

@@ -2,7 +2,7 @@
 
 NAN_METHOD(Transaction::Run) {
 	Transaction* trans = Nan::ObjectWrap::Unwrap<Transaction>(info.This());
-	QUERY_START(trans, transaction, TRANSACTION_BIND, info, info.Length());
+	QUERY_START(trans, transaction, TRANSACTION_BIND, SQLITE_STATIC, info, info.Length());
 
 	sqlite3* db_handle = trans->db->db_handle;
 	TransactionHandles* t_handles = trans->db->t_handles;

src/util/macros.h

@@ -165,16 +165,6 @@ inline bool IS_32BIT_INT(double num) {
 		return Nan::ThrowError(_err);                                          \
 	}
 
-// Should be the same as STATEMENT_BIND, but uses the transient_buffers option.
-#define STATEMENT_BIND_T_BUFFERS(stmt, info, info_length, bind_type)           \
-	Binder _binder(stmt->st_handle, bind_type, true);                          \
-	_binder.Bind(info, info_length, stmt);                                     \
-	const char* _err = _binder.GetError();                                     \
-	if (_err) {                                                                \
-		STATEMENT_CLEAR_BINDINGS(stmt);                                        \
-		return Nan::ThrowError(_err);                                          \
-	}
-
 // Common bind logic for transactions.
 #define TRANSACTION_BIND(trans, info, info_length, bind_type)                  \
 	MultiBinder _binder(trans->handles, trans->handle_count, bind_type);       \
@@ -186,7 +176,7 @@ inline bool IS_32BIT_INT(double num) {
 	}
 
 // The macro-instruction that runs before an SQLite request.
-#define QUERY_START(obj, object_name, BIND_MACRO, info, info_length)           \
+#define QUERY_START(obj, object_name, BIND_MACRO, bind_type, info, info_length)\
 	if (obj->db->in_each) {                                                    \
 		return Nan::ThrowTypeError(                                            \
 			"This database connection is busy executing a query.");            \
@@ -197,7 +187,7 @@ inline bool IS_32BIT_INT(double num) {
 	}                                                                          \
 	if (!(obj->state & CONFIG_LOCKED)) {obj->state |= CONFIG_LOCKED;}          \
 	if (!(obj->state & BOUND)) {                                               \
-		BIND_MACRO(obj, info, info_length, SQLITE_STATIC);                     \
+		BIND_MACRO(obj, info, info_length, bind_type);                         \
 	} else if (info_length > 0) {                                              \
 		return Nan::ThrowTypeError(                                            \
 			"This " #object_name " already has bound parameters.");            \