Pull the Statement class into its own file, and move all source files to src/

src/sqlite3_bindings.h

+/*
+Copyright (c) 2010, Orlando Vazquez <ovazquez@gmail.com>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#ifndef SQLITE3_BINDINGS_H
+#define SQLITE3_BINDINGS_H
+
+#define CHECK(rc) { if ((rc) != SQLITE_OK)                              \
+      return ThrowException(Exception::Error(String::New(               \
+                                             sqlite3_errmsg(*db)))); }
+
+#define SCHECK(rc) { if ((rc) != SQLITE_OK)                             \
+      return ThrowException(Exception::Error(String::New(               \
+                        sqlite3_errmsg(sqlite3_db_handle(sto->stmt_))))); }
+
+#define REQ_ARGS(N)                                                     \
+  if (args.Length() < (N))                                              \
+    return ThrowException(Exception::TypeError(                         \
+                             String::New("Expected " #N "arguments")));
+
+#define REQ_STR_ARG(I, VAR)                                             \
+  if (args.Length() <= (I) || !args[I]->IsString())                     \
+    return ThrowException(Exception::TypeError(                         \
+                  String::New("Argument " #I " must be a string")));    \
+  String::Utf8Value VAR(args[I]->ToString());
+
+#define REQ_FUN_ARG(I, VAR)                                             \
+  if (args.Length() <= (I) || !args[I]->IsFunction())                   \
+    return ThrowException(Exception::TypeError(                         \
+                  String::New("Argument " #I " must be a function")));  \
+  Local<Function> VAR = Local<Function>::Cast(args[I]);
+
+#define REQ_EXT_ARG(I, VAR)                                             \
+  if (args.Length() <= (I) || !args[I]->IsExternal())                   \
+    return ThrowException(Exception::TypeError(                         \
+                              String::New("Argument " #I " invalid"))); \
+  Local<External> VAR = Local<External>::Cast(args[I]);
+
+#define OPT_INT_ARG(I, VAR, DEFAULT)                                    \
+  int VAR;                                                              \
+  if (args.Length() <= (I)) {                                           \
+    VAR = (DEFAULT);                                                    \
+  } else if (args[I]->IsInt32()) {                                      \
+    VAR = args[I]->Int32Value();                                        \
+  } else {                                                              \
+    return ThrowException(Exception::TypeError(                         \
+              String::New("Argument " #I " must be an integer")));      \
+  }
+
+enum ExecMode
+{
+    EXEC_EMPTY = 0,
+    EXEC_LAST_INSERT_ID = 1,
+    EXEC_AFFECTED_ROWS = 2
+};
+
+#endif

src/statement.h

+/*
+Copyright (c) 2010, Orlando Vazquez <ovazquez@gmail.com>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#ifndef STATEMENT_H
+#define STATEMENT_H
+
+#include <v8.h>
+#include <node.h>
+#include <node_events.h>
+#include <sqlite3.h>
+
+using namespace v8;
+using namespace node;
+
+
+class Statement : public EventEmitter {
+  public:
+  
+  static Persistent<FunctionTemplate> constructor_template;
+  
+  static void Init(v8::Handle<Object> target);
+  static Handle<Value> New(const Arguments& args);
+  
+  protected:
+  
+  Statement(sqlite3_stmt* stmt, int first_rc = -1)
+  : EventEmitter(), first_rc_(first_rc), stmt_(stmt) {
+    column_count_ = -1;
+    column_types_ = NULL;
+    column_names_ = NULL;
+    column_data_ = NULL;
+  }
+  
+  ~Statement() {
+    if (stmt_) sqlite3_finalize(stmt_);
+    if (column_types_) free(column_types_);
+    if (column_names_) free(column_names_);
+    if (column_data_) FreeColumnData();
+  }
+  
+  
+  static int EIO_AfterBind(eio_req *req);
+  static int EIO_Bind(eio_req *req);
+  static Handle<Value> Bind(const Arguments& args);
+  
+  static int EIO_AfterFinalize(eio_req *req);
+  static int EIO_Finalize(eio_req *req);
+  static Handle<Value> Finalize(const Arguments& args);
+  
+  static Handle<Value> Reset(const Arguments& args);
+  
+  static int EIO_AfterStep(eio_req *req);
+  static int EIO_Step(eio_req *req);
+  static Handle<Value> Step(const Arguments& args);
+  void FreeColumnData(void);
+  
+  bool HasCallback();
+  void SetCallback(Local<Function> cb);
+  
+  Local<Function> GetCallback();
+  
+  private:
+  int  column_count_;
+  int  *column_types_;
+  char **column_names_;
+  void **column_data_;
+  bool error_;
+  
+  int first_rc_;
+  sqlite3_stmt* stmt_;
+};
+
+// indicates the key type (integer index or name string)
+enum BindKeyType {
+  KEY_INT,
+  KEY_STRING
+};
+
+// indicate the parameter type
+enum BindValueType {
+  VALUE_INT,
+  VALUE_DOUBLE,
+  VALUE_STRING,
+  VALUE_NULL
+};
+
+struct bind_request {
+  Persistent<Function> cb;
+  Statement *sto;
+
+  enum BindKeyType   key_type;
+  enum BindValueType value_type;
+
+  void *key;   // char * | int *
+  void *value; // char * | int * | double * | 0
+  size_t value_size;
+};
+
+#endif

wscript

@@ -24,8 +24,7 @@ def build(bld):
   obj = bld.new_task_gen("cxx", "shlib", "node_addon")
   obj.cxxflags = ["-g", "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE_SOURCE", "-Wall"]
   obj.target = "sqlite3_bindings"
-  obj.source = "sqlite3_bindings.cc"
-  #obj.lib = "sqlite3"
+  obj.source = "src/sqlite3_bindings.cc src/statement.cc"
   obj.uselib = "SQLITE3 PROFILER"
 
 t = 'sqlite3_bindings.node'