swift 0.14.0 → 1.0.0

data/ext/attribute.h

@@ -1,8 +0,0 @@
-#ifndef SWIFT_ATTRIBUTE_H
-#define SWIFT_ATTRIBUTE_H
-
-#include "swift.h"
-
-void init_swift_attribute();
-
-#endif

data/ext/datetime.cc

@@ -1,96 +0,0 @@
-#include "datetime.h"
-
-extern VALUE dtformat;
-
-VALUE cSwiftDateTime, day_seconds;
-ID fcivil, fparse, fstrptime;
-
-// NOTE: only parses '%F %T.%N %z' format and falls back to the built-in DateTime#parse
-//       and is almost 2x faster than doing:
-//
-//       rb_funcall(klass, fstrptime, 2, rb_str_new(data, size), dtformat);
-//
-VALUE datetime_parse(VALUE klass, const char *data, uint64_t size) {
-  struct tm tm;
-  double seconds;
-  const char *ptr;
-  char tzsign = 0, fraction[32];
-  int  tzhour = 0, tzmin = 0, lastmatch = -1, offset = 0, idx;
-
-  memset(&tm, 0, sizeof(struct tm));
-  sscanf(data, "%04d-%02d-%02d %02d:%02d:%02d%n",
-      &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec, &lastmatch);
-
-  // fallback to default datetime parser, this is more expensive.
-  if (tm.tm_mday == 0)
-    return Qnil;
-
-  seconds = tm.tm_sec;
-
-  // parse millisecs if any -- tad faster than using %lf in sscanf above.
-  if (lastmatch > 0 && lastmatch < size && *(data + lastmatch) == '.') {
-      idx = 0;
-      ptr = data + ++lastmatch;
-      while (*ptr && isdigit(*ptr) && idx < 31) {
-        lastmatch++;
-        fraction[idx++] = *ptr++;
-      }
-
-      fraction[idx] = 0;
-      seconds += (double)atoll(fraction) / pow(10, idx);
-  }
-
-  // parse timezone offsets if any - matches +HH:MM +HH MM +HHMM
-  if (lastmatch > 0 && lastmatch < size) {
-    const char *ptr = data + lastmatch;
-    while(*ptr && *ptr != '+' && *ptr != '-') ptr++;
-    tzsign = *ptr++;
-    if (*ptr && isdigit(*ptr)) {
-      tzhour = *ptr++ - '0';
-      if (*ptr && isdigit(*ptr)) tzhour = tzhour * 10 + *ptr++ - '0';
-      while(*ptr && !isdigit(*ptr)) ptr++;
-      if (*ptr) {
-        tzmin = *ptr++ - '0';
-        if (*ptr && isdigit(*ptr)) tzmin = tzmin * 10 + *ptr++ - '0';
-      }
-    }
-  }
-
-  if (tzsign) {
-    offset = tzsign == '+'
-      ? (time_t)tzhour *  3600 + (time_t)tzmin *  60
-      : (time_t)tzhour * -3600 + (time_t)tzmin * -60;
-  }
-
-  return rb_funcall(klass, fcivil, 7,
-    INT2FIX(tm.tm_year), INT2FIX(tm.tm_mon), INT2FIX(tm.tm_mday),
-    INT2FIX(tm.tm_hour), INT2FIX(tm.tm_min), DBL2NUM(seconds),
-    offset == 0 ? INT2FIX(0) : rb_Rational(INT2FIX(offset), day_seconds)
-  );
-}
-
-VALUE rb_datetime_parse(VALUE self, VALUE string) {
-  const char *data = CSTRING(string);
-  int size = TYPE(string) == T_STRING ? RSTRING_LEN(string) : strlen(data);
-
-  if (NIL_P(string))
-    return Qnil;
-
-  VALUE datetime = datetime_parse(self, data, size);
-  return NIL_P(datetime) ? rb_call_super(1, &string) : datetime;
-}
-
-void init_swift_datetime() {
-  rb_require("date");
-
-  VALUE mSwift    = rb_define_module("Swift");
-  VALUE cDateTime = CONST_GET(rb_mKernel, "DateTime");
-  cSwiftDateTime  = rb_define_class_under(mSwift, "DateTime", cDateTime);
-  fcivil          = rb_intern("civil");
-  fparse          = rb_intern("parse");
-  fstrptime       = rb_intern("strptime");
-  day_seconds     = INT2FIX(86400);
-
-  rb_global_variable(&day_seconds);
-  rb_define_singleton_method(cSwiftDateTime, "parse", RUBY_METHOD_FUNC(rb_datetime_parse), 1);
-}

data/ext/datetime.h

@@ -1,12 +0,0 @@
-#ifndef SWIFT_DATETIME_H
-#define SWIFT_DATETIME_H
-
-#include "swift.h"
-#include <math.h>
-
-void init_swift_datetime();
-VALUE datetime_parse(VALUE klass, const char *data, uint64_t size);
-
-extern VALUE cSwiftDateTime;
-
-#endif

data/ext/extconf.rb

@@ -1,61 +0,0 @@
-#!/usr/bin/env ruby
-require 'mkmf'
-
-ConfigClass = defined?(RbConfig) ? RbConfig : Config
-
-ConfigClass::CONFIG['CC']  = 'g++'
-ConfigClass::CONFIG['CPP'] = 'g++'
-
-$CFLAGS  = '-fPIC -Os -I/usr/include -I/opt/local/include -I/usr/local/include'
-
-def apt_install_hint pkg
-  "sudo apt-get install #{pkg}"
-end
-
-def library_installed? name, hint
-  if find_library(name, 'main', *%w(/usr/lib /usr/local/lib /opt/lib /opt/local/lib /sw/lib))
-    true
-  else
-    $stderr.puts <<-ERROR
-
-      Unable to find required library: #{name}.
-      On debian systems, it can be installed as,
-
-      #{hint}
-
-      You may have to add the following ppa to your sources,
-
-      sudo add-apt-repository ppa:deepfryed
-
-      to install dbic++-dev and associated drivers dbic++-mysql or dbic++-pg
-
-    ERROR
-    false
-  end
-end
-
-def assert_dbicpp_version ver
-  passed  = false
-  header  = '/usr/include/dbic++.h'
-  message = "Swift needs dbic++ >= #{ver}. Please update your dbic++ installation."
-
-  if File.exists?(header) && match = File.read(header).match(/DBI_VERSION\s+(.*?)\n/mi)
-    rmajor, rminor, rbuild = ver.strip.split(/\./).map(&:to_i)
-    imajor, iminor, ibuild = match.captures.first.strip.split(/\./).map(&:to_i)
-    passed = (imajor >  rmajor) ||
-             (imajor == rmajor && iminor >  rminor) ||
-             (imajor == rmajor && iminor == rminor && ibuild >= rbuild)
-  else
-    message = "Cannot find #{header} or version number. You need to install dbic++ >= #{ver}"
-    passed  = false
-  end
-
-  raise message unless passed
-end
-
-exit 1 unless library_installed? 'pcrecpp', apt_install_hint('libpcre3-dev')
-exit 1 unless library_installed? 'uuid',    apt_install_hint('uuid-dev')
-exit 1 unless library_installed? 'dbic++',  apt_install_hint('dbic++-dev')
-
-assert_dbicpp_version '0.6.0'
-create_makefile 'swift'

data/ext/query.cc

@@ -1,104 +0,0 @@
-#include "query.h"
-#include <math.h>
-
-ID fstrftime;
-VALUE dtformat, utf8;
-VALUE cDateTime;
-
-VALUE query_execute(Query *query) {
-  try {
-    return UINT2NUM(
-      query->bind.size() == 0
-        ? query->handle->conn()->execute(query->sql)
-        : query->handle->conn()->execute(query->sql, query->bind)
-    );
-  }
-  catch (dbi::ConnectionError &e) {
-    query->error_klass = eSwiftConnectionError;
-    snprintf(query->error_message, 8192, "%s", e.what());
-  }
-  catch (dbi::Error &e) {
-    query->error_klass = eSwiftRuntimeError;
-    snprintf(query->error_message, 8192, "%s", e.what());
-  }
-  catch (std::bad_alloc &e) {
-    query->error_klass = rb_eNoMemError;
-    snprintf(query->error_message, 8192, "%s", e.what());
-  }
-  catch (std::exception &e) {
-    query->error_klass = rb_eRuntimeError;
-    snprintf(query->error_message, 8192, "%s", e.what());
-  }
-
-  return Qfalse;
-}
-
-VALUE query_execute_statement(Query *query) {
-  try {
-    return UINT2NUM(
-      query->bind.size() == 0
-        ? query->statement->execute()
-        : query->statement->execute(query->bind)
-    );
-  }
-  catch (dbi::ConnectionError &e) {
-    query->error_klass = eSwiftConnectionError;
-    snprintf(query->error_message, 8192, "%s", e.what());
-  }
-  catch (dbi::Error &e) {
-    query->error_klass = eSwiftRuntimeError;
-    snprintf(query->error_message, 8192, "%s", e.what());
-  }
-  catch (std::bad_alloc &e) {
-    query->error_klass = rb_eNoMemError;
-    snprintf(query->error_message, 8192, "%s", e.what());
-  }
-  catch (std::exception &e) {
-    query->error_klass = rb_eRuntimeError;
-    snprintf(query->error_message, 8192, "%s", e.what());
-  }
-
-  return Qfalse;
-}
-
-void query_bind_values(Query *query, VALUE bind_values) {
-  for (int i = 0; i < RARRAY_LEN(bind_values); i++) {
-    VALUE bind_value = rb_ary_entry(bind_values, i);
-
-    if (bind_value == Qnil) {
-      query->bind.push_back(dbi::PARAM(dbi::null()));
-    }
-    else if (bind_value == Qtrue) {
-      query->bind.push_back(dbi::PARAM("1"));
-    }
-    else if (bind_value == Qfalse) {
-      query->bind.push_back(dbi::PARAM("0"));
-    }
-    else if (rb_obj_is_kind_of(bind_value, rb_cIO) ==  Qtrue || rb_obj_is_kind_of(bind_value, cStringIO) ==  Qtrue) {
-      bind_value = rb_funcall(bind_value, rb_intern("read"), 0);
-      query->bind.push_back(dbi::PARAM_BINARY((unsigned char*)RSTRING_PTR(bind_value), RSTRING_LEN(bind_value)));
-    }
-    else if (rb_obj_is_kind_of(bind_value, rb_cTime) || rb_obj_is_kind_of(bind_value, cDateTime)) {
-      std::string timestamp = RSTRING_PTR(rb_funcall(bind_value, fstrftime, 1, dtformat));
-      query->bind.push_back(dbi::PARAM(timestamp));
-    }
-    else {
-      bind_value = TO_S(bind_value);
-      if (strcmp(rb_enc_get(bind_value)->name, "UTF-8") != 0)
-        bind_value = rb_str_encode(bind_value, utf8, 0, Qnil);
-      query->bind.push_back(dbi::PARAM((unsigned char*)RSTRING_PTR(bind_value), RSTRING_LEN(bind_value)));
-    }
-  }
-}
-
-void init_swift_query() {
-  rb_require("date");
-
-  utf8      = rb_str_new2("UTF-8");
-  fstrftime = rb_intern("strftime");
-  dtformat  = rb_str_new2("%F %T.%N %z");
-  cDateTime = CONST_GET(rb_mKernel, "DateTime");
-
-  rb_global_variable(&utf8);
-  rb_global_variable(&dtformat);
-}

data/ext/query.h

@@ -1,20 +0,0 @@
-#ifndef SWIFT_QUERY_H
-#define SWIFT_QUERY_H
-
-#include "swift.h"
-
-struct Query {
-  char                    *sql;
-  dbi::Handle             *handle;
-  dbi::AbstractStatement  *statement;
-  std::vector<dbi::Param> bind;
-  char                    error_message[8192];
-  VALUE                   error_klass;
-};
-
-VALUE query_execute(Query*);
-VALUE query_execute_statement(Query*);
-void query_bind_values(Query*, VALUE);
-void init_swift_query();
-
-#endif

data/ext/result.cc

@@ -1,229 +0,0 @@
-#include "result.h"
-#include "datetime.h"
-#include <math.h>
-
-#define date_parse(klass, data,len) rb_funcall(datetime_parse(klass, data, len), fto_date, 0)
-
-VALUE cBigDecimal, cStringIO, cSwiftResult;
-ID fnew, fload, fto_date;
-
-void result_mark(ResultWrapper *handle) {
-  if (handle)
-    rb_gc_mark(handle->adapter);
-}
-
-void result_free(ResultWrapper *handle) {
-  if (handle) {
-    if (handle->free) delete handle->result;
-    delete handle;
-  }
-}
-
-VALUE result_alloc(VALUE klass) {
-  ResultWrapper *handle = 0;
-  return Data_Wrap_Struct(klass, result_mark, result_free, handle);
-}
-
-VALUE result_wrap_handle(VALUE klass, VALUE adapter, dbi::AbstractResult *result, bool free) {
-  ResultWrapper *handle = new ResultWrapper;
-  handle->result  = result;
-  handle->adapter = adapter;
-  handle->free    = free;
-
-  VALUE obj = Data_Wrap_Struct(klass, result_mark, result_free, handle);
-  if (!NIL_P(adapter))
-    rb_iv_set(obj, "@timezone", rb_iv_get(adapter, "@timezone"));
-
-  return obj;
-}
-
-dbi::AbstractResult* result_handle(VALUE self) {
-  ResultWrapper *handle;
-  Data_Get_Struct(self, ResultWrapper, handle);
-  if (!handle) rb_raise(eSwiftRuntimeError, "Invalid object, did you forget to call #super?");
-
-  return handle->result;
-}
-
-// NOTE clone and dup cannot be allowed since the underlying c++ object needs to be cloned, which
-//      frankly is too much work :)
-static VALUE result_clone(VALUE self) {
-  rb_raise(eSwiftRuntimeError, "clone is not allowed.");
-}
-
-static VALUE result_dup(VALUE self) {
-  rb_raise(eSwiftRuntimeError, "dup is not allowed.");
-}
-
-VALUE result_each(VALUE self) {
-  uint64_t length;
-  const char *data;
-
-  dbi::AbstractResult *result = result_handle(self);
-  VALUE scheme   = rb_iv_get(self, "@scheme");
-
-  try {
-    std::vector<string> result_fields = result->fields();
-    std::vector<int>    result_types  = result->types();
-    std::vector<VALUE>  fields;
-    for (uint32_t i = 0; i < result_fields.size(); i++)
-      fields.push_back(ID2SYM(rb_intern(result_fields[i].c_str())));
-
-    result->seek(0);
-    for (uint32_t row = 0; row < result->rows(); row++) {
-      VALUE tuple = rb_hash_new();
-      for (uint32_t column = 0; column < result->columns(); column++) {
-        data = (const char*)result->read(row, column, &length);
-        if (data) {
-          rb_hash_aset(
-            tuple,
-            fields[column],
-            typecast_field(result_types[column], data, length)
-          );
-        }
-        else {
-          rb_hash_aset(tuple, fields[column], Qnil);
-        }
-      } // column loop
-      NIL_P(scheme) ? rb_yield(tuple) : rb_yield(rb_funcall(scheme, fload, 1, tuple));
-    } // row loop
-  }
-  CATCH_DBI_EXCEPTIONS();
-
-  return Qnil;
-}
-
-VALUE typecast_field(int type, const char *data, uint64_t length) {
-  switch(type) {
-    case DBI_TYPE_BOOLEAN:
-      return (data && (data[0] =='t' || data[0] == '1')) ? Qtrue : Qfalse;
-    case DBI_TYPE_INT:
-      return rb_cstr2inum(data, 10);
-    case DBI_TYPE_BLOB:
-      return rb_funcall(cStringIO, fnew, 1, rb_str_new(data, length));
-    case DBI_TYPE_TIMESTAMP:
-      return datetime_parse(cSwiftDateTime, data, length);
-    case DBI_TYPE_DATE:
-      return date_parse(cSwiftDateTime, data, length);
-    case DBI_TYPE_NUMERIC:
-      return rb_funcall(cBigDecimal, fnew, 1, rb_str_new2(data));
-    case DBI_TYPE_FLOAT:
-      return rb_float_new(atof(data));
-
-    // DBI_TYPE_TIME
-    // DBI_TYPE_TEXT
-    default:
-      return rb_enc_str_new(data, length, rb_utf8_encoding());
-  }
-}
-
-VALUE result_insert_id(VALUE self) {
-  dbi::AbstractResult *result = result_handle(self);
-  try {
-    return SIZET2NUM(result->lastInsertID());
-  }
-  CATCH_DBI_EXCEPTIONS();
-  return Qnil;
-}
-
-VALUE result_rows(VALUE self) {
-  dbi::AbstractResult *result = result_handle(self);
-  try {
-    return SIZET2NUM(result->rows());
-  }
-  CATCH_DBI_EXCEPTIONS();
-}
-
-VALUE result_columns(VALUE self) {
-  dbi::AbstractResult *result = result_handle(self);
-  try {
-    return SIZET2NUM(result->columns());
-  }
-  CATCH_DBI_EXCEPTIONS();
-}
-
-VALUE result_fields(VALUE self) {
-  dbi::AbstractResult *result = result_handle(self);
-  try {
-    std::vector<string> result_fields = result->fields();
-    VALUE fields = rb_ary_new();
-    for (int i = 0; i < result_fields.size(); i++)
-      rb_ary_push(fields, ID2SYM(rb_intern(result_fields[i].c_str())));
-    return fields;
-  }
-  CATCH_DBI_EXCEPTIONS();
-}
-
-VALUE result_field_types(VALUE self) {
-  dbi::AbstractResult *result   = result_handle(self);
-  std::vector<int> result_types = result->types();
-
-  VALUE types = rb_ary_new();
-  for (std::vector<int>::iterator it = result_types.begin(); it != result_types.end(); it++) {
-    switch(*it) {
-      case DBI_TYPE_BOOLEAN:
-        rb_ary_push(types, rb_str_new2("boolean"));
-        break;
-      case DBI_TYPE_INT:
-        rb_ary_push(types, rb_str_new2("integer"));
-        break;
-      case DBI_TYPE_BLOB:
-        rb_ary_push(types, rb_str_new2("blob"));
-        break;
-      case DBI_TYPE_TIMESTAMP:
-        rb_ary_push(types, rb_str_new2("timestamp"));
-        break;
-      case DBI_TYPE_DATE:
-        rb_ary_push(types, rb_str_new2("date"));
-        break;
-      case DBI_TYPE_NUMERIC:
-        rb_ary_push(types, rb_str_new2("numeric"));
-        break;
-      case DBI_TYPE_FLOAT:
-        rb_ary_push(types, rb_str_new2("float"));
-        break;
-      case DBI_TYPE_TIME:
-        rb_ary_push(types, rb_str_new2("time"));
-        break;
-      default:
-        rb_ary_push(types, rb_str_new2("text"));
-    }
-  }
-
-  return types;
-}
-
-VALUE result_retrieve(VALUE self) {
-  dbi::AbstractResult *result = result_handle(self);
-  while (result->consumeResult());
-  result->prepareResult();
-  return true;
-}
-
-void init_swift_result() {
-  rb_require("bigdecimal");
-  rb_require("stringio");
-
-  VALUE mSwift = rb_define_module("Swift");
-  cSwiftResult = rb_define_class_under(mSwift, "Result", rb_cObject);
-  cStringIO    = CONST_GET(rb_mKernel, "StringIO");
-  cBigDecimal  = CONST_GET(rb_mKernel, "BigDecimal");
-
-  fto_date     = rb_intern("to_date");
-  fnew         = rb_intern("new");
-  fload        = rb_intern("load");
-
-  rb_define_alloc_func(cSwiftResult, result_alloc);
-  rb_include_module(cSwiftResult, CONST_GET(rb_mKernel, "Enumerable"));
-
-  rb_define_method(cSwiftResult, "retrieve",    RUBY_METHOD_FUNC(result_retrieve),    0);
-  rb_define_method(cSwiftResult, "clone",       RUBY_METHOD_FUNC(result_clone),       0);
-  rb_define_method(cSwiftResult, "dup",         RUBY_METHOD_FUNC(result_dup),         0);
-  rb_define_method(cSwiftResult, "each",        RUBY_METHOD_FUNC(result_each),        0);
-  rb_define_method(cSwiftResult, "insert_id",   RUBY_METHOD_FUNC(result_insert_id),   0);
-  rb_define_method(cSwiftResult, "rows",        RUBY_METHOD_FUNC(result_rows),        0);
-  rb_define_method(cSwiftResult, "columns",     RUBY_METHOD_FUNC(result_columns),     0);
-  rb_define_method(cSwiftResult, "fields",      RUBY_METHOD_FUNC(result_fields),      0);
-  rb_define_method(cSwiftResult, "field_types", RUBY_METHOD_FUNC(result_field_types), 0);
-}
-

data/ext/result.h

@@ -1,27 +0,0 @@
-#ifndef SWIFT_RESULT_H
-#define SWIFT_RESULT_H
-
-#include "swift.h"
-
-struct ResultWrapper {
-  dbi::AbstractResult *result;
-  VALUE adapter;
-  bool free;
-};
-
-extern VALUE cSwiftResult;
-extern VALUE cStringIO;
-
-void init_swift_result();
-
-void  result_free(ResultWrapper *);
-void  result_mark(ResultWrapper *);
-
-VALUE result_wrap_handle(VALUE, VALUE, dbi::AbstractResult *, bool free);
-dbi::AbstractResult* result_handle(VALUE);
-
-VALUE result_each(VALUE);
-
-VALUE typecast_field(int, const char*, uint64_t);
-
-#endif

data/ext/statement.cc

@@ -1,116 +0,0 @@
-#include "statement.h"
-#include "adapter.h"
-#include "result.h"
-#include "query.h"
-
-VALUE cSwiftStatement;
-
-void statement_mark(StatementWrapper *handle) {
-  if (handle)
-    rb_gc_mark(handle->adapter);
-}
-
-void statement_free(StatementWrapper *handle) {
-  if (handle) {
-    if (handle->free) delete handle->statement;
-    delete handle;
-  }
-}
-
-VALUE statement_alloc(VALUE klass) {
-  StatementWrapper *handle = 0;
-  return Data_Wrap_Struct(klass, statement_mark, statement_free, handle);
-}
-
-VALUE statement_wrap_handle(VALUE klass, VALUE adapter, dbi::AbstractStatement *statement) {
-  StatementWrapper *handle = new StatementWrapper;
-  handle->statement = statement;
-  handle->adapter   = adapter;
-  handle->free      = true;
-
-  VALUE obj = Data_Wrap_Struct(klass, statement_mark, statement_free, handle);
-  if (!NIL_P(adapter))
-    rb_iv_set(obj, "@timezone", rb_iv_get(adapter, "@timezone"));
-
-  return obj;
-}
-
-dbi::AbstractStatement* statement_handle(VALUE self) {
-  StatementWrapper *handle;
-  Data_Get_Struct(self, StatementWrapper, handle);
-  if (!handle) rb_raise(eSwiftRuntimeError, "Invalid object, did you forget to call #super?");
-
-  return handle->statement;
-}
-
-// array -> splat -> array is an overhead, but it reads nicer.
-static VALUE statement_execute(int argc, VALUE *argv, VALUE self) {
-  VALUE bind_values, block;
-  rb_scan_args(argc, argv, "0*&", &bind_values, &block);
-
-  dbi::AbstractStatement *statement = (dbi::AbstractStatement*)statement_handle(self);
-  try {
-    Query query;
-    query.statement = statement;
-    if (RARRAY_LEN(bind_values) > 0) query_bind_values(&query, bind_values);
-    if (dbi::_trace)                 dbi::logMessage(dbi::_trace_fd, dbi::formatParams(statement->command(), query.bind));
-
-    if (rb_thread_blocking_region(((VALUE (*)(void*))query_execute_statement), &query, RUBY_UBF_IO, 0) == Qfalse)
-      rb_raise(query.error_klass, "%s", query.error_message);
-  }
-  CATCH_DBI_EXCEPTIONS();
-
-  StatementWrapper *handle;
-  Data_Get_Struct(self, StatementWrapper, handle);
-
-  VALUE result = result_wrap_handle(cSwiftResult, handle->adapter, statement->result(), true);
-  rb_iv_set(result, "@scheme", rb_iv_get(self, "@scheme"));
-
-  return rb_block_given_p() ? result_each(result) : result;
-}
-
-VALUE statement_insert_id(VALUE self) {
-  dbi::AbstractStatement *statement = statement_handle(self);
-  try {
-    return SIZET2NUM(statement->lastInsertID());
-  }
-  CATCH_DBI_EXCEPTIONS();
-  return Qnil;
-}
-
-VALUE statement_initialize(VALUE self, VALUE adapter, VALUE sql) {
-  dbi::Handle *handle = adapter_handle(adapter);
-
-  if (NIL_P(adapter)) rb_raise(eSwiftArgumentError, "Statement#new called without an Adapter instance.");
-  if (NIL_P(sql))     rb_raise(eSwiftArgumentError, "Statement#new called without a command.");
-
-  try {
-    // needs to happen before wrapping in case it raises errors.
-    dbi::AbstractStatement *statement  = handle->conn()->prepare(CSTRING(sql));
-    StatementWrapper *statement_handle = new StatementWrapper;
-    statement_handle->statement        = statement;
-    statement_handle->adapter          = adapter;
-    statement_handle->free             = true;
-    DATA_PTR(self)                     = statement_handle;
-  }
-  CATCH_DBI_EXCEPTIONS();
-
-  return Qnil;
-}
-
-VALUE statement_command(VALUE self) {
-  return rb_iv_get(self, "@sql");
-}
-
-void init_swift_statement() {
-  VALUE mSwift = rb_define_module("Swift");
-
-  cSwiftStatement = rb_define_class_under(mSwift, "Statement", rb_cObject);
-  rb_define_method(cSwiftStatement, "execute",     RUBY_METHOD_FUNC(statement_execute),   -1);
-  rb_define_method(cSwiftStatement, "initialize",  RUBY_METHOD_FUNC(statement_initialize), 2);
-  rb_define_method(cSwiftStatement, "insert_id",   RUBY_METHOD_FUNC(statement_insert_id),  0);
-  rb_define_method(cSwiftStatement, "command",     RUBY_METHOD_FUNC(statement_command),    0);
-
-  rb_define_alias(cSwiftStatement, "to_s", "command");
-  rb_define_alloc_func(cSwiftStatement, statement_alloc);
-}

data/ext/statement.h

@@ -1,22 +0,0 @@
-#ifndef SWIFT_STATEMENT_H
-#define SWIFT_STATEMENT_H
-
-#include "swift.h"
-
-struct StatementWrapper {
-  dbi::AbstractStatement *statement;
-  VALUE adapter;
-  bool free;
-};
-
-extern VALUE cSwiftStatement;
-
-void init_swift_statement();
-void statement_free(StatementWrapper *);
-void statement_mark(StatementWrapper *);
-
-VALUE statement_wrap_handle(VALUE, VALUE, dbi::AbstractStatement *);
-dbi::AbstractStatement* statement_handle(VALUE);
-
-#endif
-