swift 0.7.2 → 0.8.0

data/README.rdoc

@@ -10,15 +10,7 @@ A rational rudimentary object relational mapper.
 
 * ruby   >= 1.9.1
 * dbic++ >= 0.4.0 (http://github.com/deepfryed/dbicpp)
-* mysql  >= 5.0.17 or postgresql >= 8.4 or db2 >= 9.7.2
-
-== Caveats
-
-=== DB2
-* The server needs to be running under DB2_COMPATIBILITY_VECTOR=77FF if you want to use the ORM
-  features of swift.
-* DB2 asynchronous operations are highly experimental at this point due to inherent limitations of the
-  underlying api. It is more an academic exercise and is not ready for real-world use.
+* mysql  >= 5.0.17, postgresql >= 8.4 or sqlite3 >= 3.7
 
 == Features
 
@@ -26,7 +18,7 @@ A rational rudimentary object relational mapper.
 * Prepared statements.
 * Bind values.
 * Transactions and named save points.
-* EventMachine asynchronous interface.
+* EventMachine asynchronous interface (mysql and postgresql).
 * IdentityMap.
 * Migrations.
 
@@ -175,7 +167,7 @@ Swift comes with a simple identity map. Just require it after you load swift.
 
 === Bulk inserts
 
-Swift comes with adapter level support for bulk inserts for MySQL, PostgreSQL and DB2. This
+Swift comes with adapter level support for bulk inserts for MySQL and PostgreSQL. This
 is usually very fast (~5-10x faster) than regular prepared insert statements for larger
 sets of data.
 
@@ -225,25 +217,25 @@ Intel Core2Duo P8700 2.53GHz and stock PostgreSQL 8.4.1.
 
     ./simple.rb -n1 -r10000 -s ar -s dm -s sequel -s swift
 
-    benchmark       sys       user      total     real      rss
-    ar #create      0.800000  6.620000  7.420000  9.898821  369.44m
-    ar #select      0.020000  0.300000  0.320000  0.372809  38.83m
-    ar #update      0.770000  6.550000  7.320000  10.02434  361.92m
+    benchmark       sys       user      total    real       rss
+    ar #create      0.790000  8.290000  9.08000  11.679886  405.07m
+    ar #select      0.040000  0.310000  0.35000   0.383573  40.56m
+    ar #update      0.720000  9.890000  10.6100  13.765735  503.48m
 
-    dm #create      0.110000  3.590000  3.700000  4.847609  248.74m
-    dm #select      0.120000  1.840000  1.960000  2.029552  128.98m
-    dm #update      0.400000  7.750000  8.150000  9.741249  599.52m
+    dm #create      0.310000  3.300000  3.61000   4.593075  211.01m
+    dm #select      0.040000  1.720000  1.76000   1.776852  114.51m
+    dm #update      0.450000  7.600000  8.05000   9.610320  531.26m
 
-    sequel #create  0.770000  3.910000  4.680000  7.432611  263.59m
-    sequel #select  0.020000  0.080000  0.100000  0.147321  9.82m
-    sequel #update  0.730000  3.910000  4.640000  7.594949  259.18m
+    sequel #create  0.670000  4.670000  5.34000   7.991811  235.39m
+    sequel #select  0.000000  0.130000  0.13000   0.178447  12.76m
+    sequel #update  0.790000  4.540000  5.33000   7.854936  229.70m
 
-    swift #create   0.210000  0.850000  1.060000  2.618661  32.72m
-    swift #select   0.000000  0.080000  0.080000  0.132245  9.91m
-    swift #update   0.270000  0.650000  0.920000  2.204108  37.48m
+    swift #create   0.100000  0.710000  0.81000   1.562289  85.84m
+    swift #select   0.000000  0.120000  0.12000   0.145567  8.96m
+    swift #update   0.190000  0.690000  0.88000   1.628918  59.50m
 
     -- bulk insert api --
-    swift #write    0.000000  0.080000  0.080000  0.151146  7.29m
+    swift #write    0.010000  0.100000  0.11000  0.180514   14.80m
 
 
 ==== Adapter
@@ -258,21 +250,20 @@ The adapter level SELECT benchmarks without using ORM.
 ===== PostgreSQL
 
     benchmark       sys       user      total     real      rss
-    do #select      0.060000  1.070000  1.130000  1.370092  99.83m
-    pg #select      0.030000  0.270000  0.300000  0.584091  46.13m
-    swift #select   0.020000  0.290000  0.310000  0.571635  39.08m
+    do #select      0.020000  1.250000  1.270000  1.441281  71.98m
+    pg #select      0.000000  0.580000  0.580000  0.769186  42.93m
+    swift #select   0.040000  0.510000  0.550000  0.627581  43.23m
 
 ===== MySQL
 
     benchmark       sys       user      total     real      rss
-    do #select      0.030000  1.070000  1.100000  1.200177  99.26m
-    mysql2 #select  0.060000  0.450000  0.510000  0.609236  76.44m
-    swift #select   0.050000  0.170000  0.220000  0.334932  33.61m
+    do #select      0.030000  1.130000  1.160000  1.172205  71.86m
+    mysql2 #select  0.040000  0.660000  0.700000  0.704414  72.72m
+    swift #select   0.010000  0.480000  0.490000  0.499643  42.03m
 
 == TODO
 
 * More tests.
-* Make db2 async api more stable.
 * Assertions for dumb stuff.
 * Abstract interface for other adapters? Move dbic++ to Swift::DBI::(Adapter, Pool, Result, Statment etc.)
 
@@ -280,3 +271,7 @@ The adapter level SELECT benchmarks without using ORM.
 
 Go nuts! There is no style guide and I do not care if you write tests or comment code. If you write something neat just
 send a pull request, tweet, email or yell it at me line by line in person.
+
+== Feature suggestions and support
+
+{Suggest features and support Swift ORM on fundry.}[https://fundry.com/project/14-swift-orm]

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

data/examples/db.rb

@@ -39,6 +39,6 @@ Swift.db do |db|
   pp db.get(User, id: 1)
 
   puts '', '-- destroy --'
-  pp db.destroy(User, id: 1)
+  pp db.destroy(User, id: 1).map(&:rows).first
 end
 

data/ext/adapter.cc

@@ -86,18 +86,14 @@ static VALUE adapter_execute(int argc, VALUE *argv, VALUE self) {
     query.sql    = CSTRING(statement);
     query.handle = handle;
 
-    if (RARRAY_LEN(bind_values) > 0) query_bind_values(&query, bind_values, handle->driver());
+    if (RARRAY_LEN(bind_values) > 0) query_bind_values(&query, bind_values);
     if (dbi::_trace)                 dbi::logMessage(dbi::_trace_fd, dbi::formatParams(query.sql, query.bind));
 
     if ((rows = rb_thread_blocking_region(((VALUE (*)(void*))query_execute), &query, RUBY_UBF_IO, 0)) == Qfalse)
       rb_raise(eSwiftRuntimeError, "%s", query.error);
 
-    if (rb_block_given_p()) {
-      dbi::AbstractResult *result = handle->results();
-      return result_each(result_wrap_handle(cSwiftResult, self, result, false));
-    }
-    else
-      return rows;
+    VALUE result = result_wrap_handle(cSwiftResult, self, handle->conn()->result(), true);
+    return rb_block_given_p() ? result_each(result) : result;
   }
   CATCH_DBI_EXCEPTIONS();
 }
@@ -110,7 +106,7 @@ static VALUE adapter_initialize(VALUE self, VALUE options) {
   if (NIL_P(db))     rb_raise(eSwiftArgumentError, "Adapter#new called without :db");
   if (NIL_P(driver)) rb_raise(eSwiftArgumentError, "Adapter#new called without :driver");
 
-  user = NIL_P(user) ? rb_str_new2(getlogin()) : user;
+  user = NIL_P(user) ? CURRENT_USER() : user;
 
   try {
     DATA_PTR(self) = new dbi::Handle(
@@ -215,11 +211,11 @@ static VALUE adapter_write(int argc, VALUE *argv, VALUE self) {
     rb_gc();
 
     if (TYPE(stream) == T_STRING) {
-      dbi::IOStream io(RSTRING_PTR(stream), RSTRING_LEN(stream));
+      dbi::StringIO io(RSTRING_PTR(stream), RSTRING_LEN(stream));
       rows = handle->write(RSTRING_PTR(table), write_fields, &io);
     }
     else {
-      IOStream io(stream);
+      AdapterIO io(stream);
       rows = handle->write(RSTRING_PTR(table), write_fields, &io);
     }
     return SIZET2NUM(rows);
@@ -227,15 +223,6 @@ static VALUE adapter_write(int argc, VALUE *argv, VALUE self) {
   CATCH_DBI_EXCEPTIONS();
 }
 
-VALUE adapter_results(VALUE self) {
-  dbi::Handle *handle = adapter_handle(self);
-  try {
-    dbi::AbstractResult *result = handle->results();
-    return result_wrap_handle(cSwiftResult, self, result, false);
-  }
-  CATCH_DBI_EXCEPTIONS();
-}
-
 void init_swift_adapter() {
   VALUE mSwift   = rb_define_module("Swift");
   cSwiftAdapter = rb_define_class_under(mSwift, "Adapter", rb_cObject);
@@ -254,9 +241,6 @@ void init_swift_adapter() {
   rb_define_method(cSwiftAdapter, "write",       RUBY_METHOD_FUNC(adapter_write),       -1);
 
   rb_define_alloc_func(cSwiftAdapter, adapter_alloc);
-
-  // TODO Figure out how to avoid race conditions.
-  rb_define_method(cSwiftAdapter, "results",     RUBY_METHOD_FUNC(adapter_results),     0);
 }
 
 

data/ext/{iostream.cc → adapter_io.cc}

@@ -1,10 +1,10 @@
-#include "iostream.h"
+#include "adapter_io.h"
 
-IOStream::IOStream(VALUE s) {
+AdapterIO::AdapterIO(VALUE s) {
   stream = s;
 }
 
-std::string& IOStream::read() {
+std::string& AdapterIO::read() {
   VALUE response = rb_funcall(stream, rb_intern("read"), 0);
   if (response == Qnil) {
     return empty;
@@ -17,12 +17,12 @@ std::string& IOStream::read() {
         "Write can only process string data. You need to stringify values returned in the callback."
       );
     }
-    data = string(RSTRING_PTR(response), RSTRING_LEN(response));
-    return data;
+    stringdata = std::string(RSTRING_PTR(response), RSTRING_LEN(response));
+    return stringdata;
   }
 }
 
-uint32_t IOStream::read(char *buffer, uint32_t length) {
+uint32_t AdapterIO::read(char *buffer, uint32_t length) {
   VALUE response = rb_funcall(stream, rb_intern("read"), 1, INT2NUM(length));
   if (response == Qnil) {
     return 0;
@@ -34,11 +34,29 @@ uint32_t IOStream::read(char *buffer, uint32_t length) {
   }
 }
 
-void IOStream::write(const char *str) {
+void AdapterIO::write(const char *str) {
   rb_funcall(stream, rb_intern("write"), 1, rb_str_new2(str));
 }
 
-void IOStream::write(const char *str, uint64_t l) {
+void AdapterIO::write(const char *str, uint64_t l) {
   rb_funcall(stream, rb_intern("write"), 1, rb_str_new(str, l));
 }
 
+bool AdapterIO::readline(std::string &line) {
+  VALUE response = rb_funcall(stream, rb_intern("gets"), 0);
+  if (response == Qnil) {
+    return false;
+  }
+  else {
+    line = std::string(RSTRING_PTR(response), RSTRING_LEN(response));
+    return true;
+  }
+}
+
+char* AdapterIO::readline() {
+  return readline(stringdata) ? (char*)stringdata.c_str() : 0;
+}
+
+void AdapterIO::truncate() {
+  rb_funcall(stream, rb_intern("truncate"), 0);
+}

data/ext/adapter_io.h

@@ -0,0 +1,24 @@
+#ifndef SWIFT_ADAPTER_IO_H
+#define SWIFT_ADAPTER_IO_H
+
+#include "swift.h"
+
+class AdapterIO : public dbi::IO {
+    private:
+      VALUE stream;
+      std::string stringdata, empty;
+    public:
+      AdapterIO(VALUE);
+      std::string& read();
+      uint32_t     read(char *, uint32_t);
+
+      void write(const char *);
+      void write(const char *, uint64_t);
+
+      void truncate();
+
+      bool  readline(string&);
+      char* readline();
+};
+
+#endif

data/ext/extconf.rb

@@ -55,6 +55,6 @@ 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.4.0'
+assert_dbicpp_version '0.5.2'
 
 create_makefile 'swift'

data/ext/pool.cc

@@ -26,7 +26,7 @@ VALUE pool_init(VALUE self, VALUE n, VALUE options) {
   if (NIL_P(db))     rb_raise(eSwiftArgumentError, "Pool#new called without :db");
   if (NIL_P(driver)) rb_raise(eSwiftArgumentError, "#new called without :driver");
 
-  user = NIL_P(user) ? rb_str_new2(getlogin()) : user;
+  user = NIL_P(user) ? CURRENT_USER() : user;
   if (NUM2INT(n) < 1) rb_raise(eSwiftArgumentError, "Pool#new called with invalid pool size.");
 
   try {
@@ -76,7 +76,7 @@ VALUE pool_execute(int argc, VALUE *argv, VALUE self) {
 
   try {
     Query query;
-    query_bind_values(&query, bind_values, pool->driver());
+    query_bind_values(&query, bind_values);
     request = request_alloc(cSwiftRequest);
     DATA_PTR(request) = pool->execute(CSTRING(sql), query.bind, pool_callback, (void*)callback);
     return request;

data/ext/query.cc

@@ -31,7 +31,7 @@ VALUE query_execute_statement(Query *query) {
   }
 }
 
-void query_bind_values(Query *query, VALUE bind_values, std::string driver) {
+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);
 
@@ -53,8 +53,7 @@ void query_bind_values(Query *query, VALUE bind_values, std::string driver) {
       std::string timestamp = RSTRING_PTR(rb_funcall(bind_value, fstrftime, 1, dtformat));
 
       timestamp += RSTRING_PTR(rb_funcall(rb_funcall(bind_value, fusec, 0), fto_s, 0));
-      if (driver != "db2")
-        timestamp += RSTRING_PTR(rb_funcall(bind_value, fstrftime, 1, tzformat));
+      timestamp += RSTRING_PTR(rb_funcall(bind_value, fstrftime, 1, tzformat));
 
       query->bind.push_back(dbi::PARAM(timestamp));
     }

data/ext/query.h

@@ -4,16 +4,16 @@
 #include "swift.h"
 
 struct Query {
-  char                   *sql;
-  dbi::Handle            *handle;
-  dbi::AbstractStatement *statement;
-  dbi::ResultRow         bind;
-  const char             *error;
+  char                    *sql;
+  dbi::Handle             *handle;
+  dbi::AbstractStatement  *statement;
+  std::vector<dbi::Param> bind;
+  const char              *error;
 };
 
 VALUE query_execute(Query*);
 VALUE query_execute_statement(Query*);
-void query_bind_values(Query*, VALUE, std::string);
+void query_bind_values(Query*, VALUE);
 void init_swift_query();
 
 #endif

data/ext/result.cc

@@ -14,10 +14,7 @@ void result_mark(ResultWrapper *handle) {
 
 void result_free(ResultWrapper *handle) {
   if (handle) {
-    if (handle->free) {
-      handle->result->cleanup();
-      delete handle->result;
-    }
+    if (handle->free) delete handle->result;
     delete handle;
   }
 }
@@ -99,14 +96,6 @@ VALUE result_each(VALUE self) {
   return Qnil;
 }
 
-static VALUE result_finish(VALUE self) {
-  dbi::AbstractResult *result = result_handle(self);
-  try {
-    result->finish();
-  }
-  CATCH_DBI_EXCEPTIONS();
-}
-
 // Calculates local offset at a given time, including dst.
 int64_t client_tzoffset(int64_t local, int isdst) {
   struct tm tm;
@@ -296,7 +285,6 @@ void init_swift_result() {
   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, "finish",     RUBY_METHOD_FUNC(result_finish),    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);

data/ext/statement.cc

@@ -12,10 +12,7 @@ void statement_mark(StatementWrapper *handle) {
 
 void statement_free(StatementWrapper *handle) {
   if (handle) {
-    if (handle->free) {
-      handle->statement->cleanup();
-      delete handle->statement;
-    }
+    if (handle->free) delete handle->statement;
     delete handle;
   }
 }
@@ -55,7 +52,7 @@ static VALUE statement_execute(int argc, VALUE *argv, VALUE self) {
   try {
     Query query;
     query.statement = statement;
-    if (RARRAY_LEN(bind_values) > 0) query_bind_values(&query, bind_values, statement->driver());
+    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)
@@ -63,8 +60,22 @@ static VALUE statement_execute(int argc, VALUE *argv, VALUE self) {
   }
   CATCH_DBI_EXCEPTIONS();
 
-  if (rb_block_given_p()) return result_each(self);
-  return self;
+  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) {
@@ -90,23 +101,9 @@ VALUE statement_initialize(VALUE self, VALUE adapter, VALUE sql) {
 void init_swift_statement() {
   VALUE mSwift = rb_define_module("Swift");
 
-  /*
-    TODO Inheritance confusion.
-
-    dbic++ has this,
-    dbi::Statement < dbi::AbstractStatement
-    dbi::AbstractStatement < dbi::AbstractResult
-
-    Swift has this,
-    Statement < Result
-
-    Not sure if this hierarchy is correct or perfect. I reckon Statement should not
-    inherit Result and just return a Result on execute() - maybe cleaner but very
-    inefficient when doing tons on non-select style queries.
-  */
-
-  cSwiftStatement = rb_define_class_under(mSwift, "Statement", cSwiftResult);
-  rb_define_method(cSwiftStatement, "execute",    RUBY_METHOD_FUNC(statement_execute),   -1);
-  rb_define_method(cSwiftStatement, "initialize", RUBY_METHOD_FUNC(statement_initialize), 2);
+  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_alloc_func(cSwiftStatement, statement_alloc);
 }

data/ext/swift.h

@@ -5,6 +5,9 @@
 #include <ruby/ruby.h>
 #include <ruby/io.h>
 #include <stdint.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <pwd.h>
 
 #define CONST_GET(scope, constant) rb_funcall(scope, rb_intern("const_get"), 1, rb_str_new2(constant))
 #define TO_S(v)                    rb_funcall(v, rb_intern("to_s"), 0)
@@ -26,8 +29,15 @@ extern VALUE eSwiftConnectionError;
     rb_raise(rb_eNoMemError, "%s", error.what()); \
   }
 
+
+// works without a controlling tty, getlogin() will fail when process is daemonized.
+inline VALUE CURRENT_USER() {
+  struct passwd *ptr = getpwuid(getuid());
+  return ptr ? rb_str_new2(ptr->pw_name) : rb_str_new2("root");
+}
+
 #include "adapter.h"
-#include "iostream.h"
+#include "adapter_io.h"
 #include "query.h"
 #include "result.h"
 #include "statement.h"

data/lib/swift/db.rb

@@ -10,64 +10,55 @@ module Swift
       end
     end # Mysql
 
-    class Postgres < Adapter
+    class Sqlite3 < Adapter
       def initialize options = {}
-        super options.update(driver: 'postgresql')
+        super options.update(driver: 'sqlite3')
       end
 
       def returning?
-        true
+        false
+      end
+
+      def migrate! scheme
+        keys   =  scheme.header.keys
+        serial =  scheme.header.find(&:serial)
+        fields =  scheme.header.map{|p| field_definition(p)}.join(', ')
+        fields += ", primary key (#{keys.join(', ')})" unless serial or keys.empty?
+
+        execute("drop table if exists #{scheme.store}")
+        execute("create table #{scheme.store} (#{fields})")
       end
 
       def field_type attribute
         case attribute
-          when Type::IO then 'bytea'
-          else super
+          when Type::String     then 'text'
+          when Type::Integer    then attribute.serial ? 'integer primary key' : 'integer'
+          when Type::Float      then 'float'
+          when Type::BigDecimal then 'numeric'
+          when Type::Time       then 'timestamp'
+          when Type::Date       then 'date'
+          when Type::Boolean    then 'boolean'
+          when Type::IO         then 'blob'
+          else 'text'
         end
       end
-    end # Postgres
+    end # Sqlite3
 
-    class DB2 < Adapter
+    class Postgres < Adapter
       def initialize options = {}
-        super options.update(driver: 'db2')
+        super options.update(driver: 'postgresql')
       end
 
       def returning?
-        false
-      end
-
-      def migrate!
-        keys   =  scheme.header.keys
-        fields =  scheme.header.map{|p| field_definition(p)}.join(', ')
-        fields += ", primary key (#{keys.join(', ')})" unless keys.empty?
-
-        sql = <<-SQL
-          select count(*) as exists from syscat.tables
-          where tabschema = CURRENT_SCEMA and tabname = '#{scheme.store.upcase}'
-        SQL
-
-        execute(sql) {|result| execute("drop table #{scheme.store}") if result[:exists] > 0 }
-        execute("create table #{scheme.store} (#{fields})")
+        true
       end
 
       def field_type attribute
         case attribute
-          when Type::String     then 'clob(2g)'
-          when Type::Integer    then attribute.serial ? 'integer not null generated by default as identity' : 'integer'
-          when Type::Boolean    then 'char(1)'
-          when Type::Float      then 'real'
-          when Type::BigDecimal then 'double'
+          when Type::IO then 'bytea'
           else super
         end
       end
-
-      def prepare_create scheme
-        prepare_cached(scheme, :create) do
-          values = (['?'] * scheme.header.insertable.size).join(', ')
-          sql    = "insert into #{scheme.store} (#{scheme.header.insertable.join(', ')}) values (#{values})"
-          scheme.header.serial ? "select #{scheme.header.serial} from final table (#{sql})" : sql
-        end
-      end
-    end # DB2
+    end # Postgres
   end # DB
 end # Swift

data/lib/swift/pool.rb

@@ -27,9 +27,8 @@ module Swift
     def initialize size, options
       @pool         = Swift::DB::Pool.new size, options
 
-      # TODO move driver specific options to extension.
-      @writable     = options[:driver] == 'db2'
-
+      # used to be used for db2
+      @writable     = false
       @pending      = {}
       @queue        = []
     end
@@ -52,10 +51,7 @@ module Swift
 
     def execute sql, *bind, &callback
       request = @pool.execute sql, *bind, &callback
-      # TODO EM throws exceptions in C++ land which are not trapped in the extension.
-      #      This is somehow causing everything to unravel and result in a segfault which
-      #      I cannot track down. I'll buy a beer for someone who can get this fixed :)
-      #      Oh, here it throws an exception if we try to attach same fd twice.
+      # NOTE EM segfaults if we try to attach same fd twice.
       if request && !attached?(request.socket)
         EM.watch(request.socket, Handler, request, self) do |c|
           attach c

data/swift.gemspec

@@ -1,101 +1,100 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{swift}
-  s.version = "0.7.2"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Hanna", "Bharanee 'Barney' Rathna"]
-  s.date = %q{2010-10-02}
+  s.date = %q{2011-01-05}
   s.description = %q{A rational rudimentary database abstraction.}
   s.email = ["shane.hanna@gmail.com", "deepfryed@gmail.com"]
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     "API.rdoc",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "ext/adapter.cc",
-     "ext/adapter.h",
-     "ext/attribute.cc",
-     "ext/attribute.h",
-     "ext/extconf.rb",
-     "ext/iostream.cc",
-     "ext/iostream.h",
-     "ext/pool.cc",
-     "ext/pool.h",
-     "ext/query.cc",
-     "ext/query.h",
-     "ext/request.cc",
-     "ext/request.h",
-     "ext/result.cc",
-     "ext/result.h",
-     "ext/statement.cc",
-     "ext/statement.h",
-     "ext/swift.cc",
-     "ext/swift.h",
-     "lib/swift.rb",
-     "lib/swift/adapter.rb",
-     "lib/swift/attribute.rb",
-     "lib/swift/db.rb",
-     "lib/swift/header.rb",
-     "lib/swift/identity_map.rb",
-     "lib/swift/migrations.rb",
-     "lib/swift/pool.rb",
-     "lib/swift/scheme.rb",
-     "lib/swift/type.rb",
-     "lib/swift/validations.rb",
-     "swift.gemspec",
-     "test/helper.rb",
-     "test/house-explode.jpg",
-     "test/test_adapter.rb",
-     "test/test_encoding.rb",
-     "test/test_error.rb",
-     "test/test_identity_map.rb",
-     "test/test_io.rb",
-     "test/test_pool.rb",
-     "test/test_scheme.rb",
-     "test/test_timestamps.rb",
-     "test/test_transactions.rb",
-     "test/test_types.rb",
-     "test/test_validations.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "ext/adapter.cc",
+    "ext/adapter.h",
+    "ext/adapter_io.cc",
+    "ext/adapter_io.h",
+    "ext/attribute.cc",
+    "ext/attribute.h",
+    "ext/extconf.rb",
+    "ext/pool.cc",
+    "ext/pool.h",
+    "ext/query.cc",
+    "ext/query.h",
+    "ext/request.cc",
+    "ext/request.h",
+    "ext/result.cc",
+    "ext/result.h",
+    "ext/statement.cc",
+    "ext/statement.h",
+    "ext/swift.cc",
+    "ext/swift.h",
+    "lib/swift.rb",
+    "lib/swift/adapter.rb",
+    "lib/swift/attribute.rb",
+    "lib/swift/db.rb",
+    "lib/swift/header.rb",
+    "lib/swift/identity_map.rb",
+    "lib/swift/migrations.rb",
+    "lib/swift/pool.rb",
+    "lib/swift/scheme.rb",
+    "lib/swift/type.rb",
+    "lib/swift/validations.rb",
+    "swift.gemspec",
+    "test/helper.rb",
+    "test/house-explode.jpg",
+    "test/test_adapter.rb",
+    "test/test_encoding.rb",
+    "test/test_error.rb",
+    "test/test_identity_map.rb",
+    "test/test_io.rb",
+    "test/test_pool.rb",
+    "test/test_scheme.rb",
+    "test/test_timestamps.rb",
+    "test/test_transactions.rb",
+    "test/test_types.rb",
+    "test/test_validations.rb"
   ]
   s.homepage = %q{http://github.com/shanna/swift}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A rational rudimentary database abstraction.}
   s.test_files = [
+    "examples/async.rb",
+    "examples/db.rb",
+    "examples/scheme.rb",
+    "test/helper.rb",
     "test/test_adapter.rb",
-     "test/test_scheme.rb",
-     "test/test_types.rb",
-     "test/test_error.rb",
-     "test/test_io.rb",
-     "test/test_encoding.rb",
-     "test/test_transactions.rb",
-     "test/test_validations.rb",
-     "test/test_timestamps.rb",
-     "test/helper.rb",
-     "test/test_identity_map.rb",
-     "test/test_pool.rb",
-     "examples/async.rb",
-     "examples/scheme.rb",
-     "examples/db.rb"
+    "test/test_encoding.rb",
+    "test/test_error.rb",
+    "test/test_identity_map.rb",
+    "test/test_io.rb",
+    "test/test_pool.rb",
+    "test/test_scheme.rb",
+    "test/test_timestamps.rb",
+    "test/test_transactions.rb",
+    "test/test_types.rb",
+    "test/test_validations.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<minitest>, [">= 1.7.0"])
       s.add_development_dependency(%q<eventmachine>, [">= 0"])
     else

data/test/helper.rb

@@ -5,22 +5,21 @@ require 'minitest/unit'
 require 'swift'
 require 'etc'
 
-# db2 database name is limited to 8 characters, gonna use swift instead of swift_test
-
 class MiniTest::Spec
   def self.supported_by *adapters, &block
-    connection_defaults = { db: 'swift', user: Etc.getlogin, host: '127.0.0.1' }
+    adapter_defaults    = { Swift::DB::Sqlite3 => { db: ':memory:' } }
+    connection_defaults = { db: 'swift_test', user: Etc.getlogin, host: '127.0.0.1' }
     adapters.each do |adapter|
       begin
-        Swift.setup :default, adapter, connection_defaults
+        Swift.setup :default, adapter, connection_defaults.merge(adapter_defaults.fetch(adapter, {}))
       rescue => error
-        warn "Unable to setup 'swift' db for #{adapter}, #{error.message}. Skipping..."
+        warn "Unable to setup 'swift_test' db for #{adapter}, #{error.message}. Skipping..."
         next
       end
 
       describe("Adapter #{adapter.name}") do
         before do
-          Swift.setup :default, adapter, connection_defaults
+          Swift.setup :default, adapter, connection_defaults.merge(adapter_defaults.fetch(adapter, {}))
         end
         block.call(adapter)
       end

data/test/test_adapter.rb

@@ -2,16 +2,16 @@ require_relative 'helper'
 require 'stringio'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::DB2 do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
     describe 'db' do
       before do
         @db = Swift.db
-        @db.execute('drop table users') rescue nil
-        type = case @db
-          when Swift::DB::DB2 then 'integer not null generated by default as identity'
+        @db.execute('drop table if exists users')
+        serial = case @db
+          when Swift::DB::Sqlite3 then 'integer primary key'
           else 'serial'
         end
-        @db.execute %Q{create table users(id #{type}, name varchar(512), email varchar(512), created_at timestamp)}
+        @db.execute %Q{create table users(id #{serial}, name text, email text, created_at timestamp)}
       end
 
       it 'yields db to block' do
@@ -34,7 +34,7 @@ describe 'Adapter' do
         it 'executes via Statement#new' do
           result = []
           Swift::Statement.new(@db, 'select count(*) as n from users').execute {|r| result << r[:n] }
-          assert_kind_of Integer, result[0]
+          assert_kind_of Fixnum, result[0]
         end
 
         it 'executes without bind values' do
@@ -54,10 +54,9 @@ describe 'Adapter' do
         it 'has insert_id' do
           sql = case @db
             when Swift::DB::Postgres then %q{insert into users (name) values (?) returning id}
-            when Swift::DB::Mysql    then %q{insert into users (name) values (?)}
-            when Swift::DB::DB2      then %q{select id from final table(insert into users(name) values(?))}
+            else %q{insert into users (name) values (?)}
           end
-          assert_kind_of Numeric, @db.prepare(sql).execute('Connie Arthurton').insert_id
+          assert_kind_of Fixnum, @db.prepare(sql).execute('Connie Arthurton').insert_id
         end
       end
 
@@ -66,11 +65,12 @@ describe 'Adapter' do
           insert = @db.prepare(%q{insert into users (name, created_at) values (?, current_timestamp)})
           insert.execute('Apple Arthurton')
           insert.execute('Benny Arthurton')
-          @sth = @db.prepare('select * from users').execute
+          @sth = @db.prepare('select * from users')
+          @res = @sth.execute
         end
 
         it 'enumerates' do
-          assert_kind_of Enumerable, @sth
+          assert_kind_of Enumerable, @res
         end
 
         it 'enumerates block' do
@@ -84,7 +84,7 @@ describe 'Adapter' do
         end
 
         it 'returns hash tuples for enumerable methods' do
-          assert_kind_of Hash, @sth.first
+          assert_kind_of Hash, @res.first
         end
 
         it 'returns a result set on Adapter#execute{}' do
@@ -92,12 +92,11 @@ describe 'Adapter' do
         end
 
         it 'returns a result set on Adapter#results' do
-          @db.execute('select * from users')
-          assert_kind_of Swift::Result, @db.results
+          assert_kind_of Swift::Result, @db.execute('select * from users')
         end
 
         it 'returns fields' do
-          assert_equal [ :id, :name, :email, :created_at ], @sth.fields
+          assert_equal [ :id, :name, :email, :created_at ], @res.fields
         end
       end
 

data/test/test_encoding.rb

@@ -1,12 +1,12 @@
 require_relative 'helper'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::DB2 do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
     describe 'character encoding' do
       before do
         Swift.db do |db|
-          db.execute %q{drop table users} rescue nil
-          db.execute %q{create table users(name varchar(128))}
+          db.execute %q{drop table if exists users}
+          db.execute %q{create table users(name text)}
 
           # Mysql on debian at least doesn't default to utf8.
           if db.kind_of? Swift::DB::Mysql

data/test/test_error.rb

@@ -1,12 +1,12 @@
 require_relative 'helper'
 
 describe 'Error' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
     describe 'prepare' do
       before do
         Swift.db do |db|
           db.execute %q{drop table if exists users}
-          db.execute %q{create table users(id serial, name text, primary key(id))}
+          db.execute %q{create table users(id integer, name text, primary key(id))}
         end
       end
 

data/test/test_io.rb

@@ -1,7 +1,7 @@
 require_relative 'helper'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::DB2 do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
     describe 'Storing binary objects' do
       before do
         user = Class.new(Swift::Scheme) do
@@ -13,7 +13,7 @@ describe 'Adapter' do
         Swift.db.migrate! user
       end
 
-      it 'stores and retrieves an image' do
+      it 'stores and retrieves an image via prepared statement' do
         Swift.db do |db|
           io = File.open(File.dirname(__FILE__) + '/house-explode.jpg')
           db.prepare('insert into users (name, image) values(?, ?)').execute('test', io)
@@ -28,6 +28,22 @@ describe 'Adapter' do
           assert_equal io.read.force_encoding('ASCII-8BIT'), data
         end
       end
+
+      it 'stores and retrieves an image via Adapter#execute' do
+        Swift.db do |db|
+          io = File.open(File.dirname(__FILE__) + '/house-explode.jpg')
+          db.execute('insert into users (name, image) values(?, ?)', 'test', io)
+
+          blob = db.prepare('select image from users limit 1').execute.first[:image]
+
+          io.rewind
+          assert_kind_of StringIO, blob
+
+          data = blob.read
+          assert_equal Encoding::ASCII_8BIT, data.encoding
+          assert_equal io.read.force_encoding('ASCII-8BIT'), data
+        end
+      end
     end
   end
 end

data/test/test_pool.rb

@@ -6,7 +6,7 @@ describe 'Adapter' do
     describe 'Asynchronous connection pool' do
       before do
         Swift.db do |db|
-          db.execute %q{drop table users} rescue nil
+          db.execute %q{drop table if exists users}
           db.execute %Q{create table users(name varchar(64))}
         end
       end

data/test/test_timestamps.rb

@@ -44,8 +44,7 @@ describe 'Adapter' do
           end
 
           sql = sql % value.strftime('%F %T' + zone)
-          @db.execute(sql)
-          @db.results.first.fetch(:now)
+          @db.execute(sql).first.fetch(:now)
         end
 
         def assert_timestamp_like expect, given, comment

data/test/test_transactions.rb

@@ -1,14 +1,17 @@
 require_relative 'helper'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::DB2 do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
     describe 'transactions' do
       before do
         @name = 'test1 - transaction 1'
         @db   = Swift.db
-        @db.execute %q{drop table users} rescue nil
-        @db.execute %q{create table users(name varchar(512), created_at timestamp)}
-        @db.execute %q{alter table users engine=innodb} if @db.kind_of?(Swift::DB::Mysql) # In case of MyISAM default.
+        @db.execute %q{drop table if exists users}
+        @db.execute %q{create table users(name text, created_at timestamp)}
+
+        # In case of MyISAM default.
+        @db.kind_of?(Swift::DB::Mysql) && @db.execute('alter table users engine=innodb')
+
         @sth = @db.prepare('select count(*) as c from users where name = ?')
       end
 
@@ -24,7 +27,7 @@ describe 'Adapter' do
 
       describe 'commits work' do
         before do
-          @db.execute('truncate users')
+          @db.execute('delete from users')
         end
 
         after do
@@ -47,7 +50,7 @@ describe 'Adapter' do
 
       describe 'rollbacks work' do
         before do
-          @db.execute('truncate users')
+          @db.execute('delete from users')
         end
 
         after do
@@ -73,7 +76,7 @@ describe 'Adapter' do
 
       describe 'nested transactions' do
         before do
-          @db.execute('truncate users')
+          @db.execute('delete from users')
         end
 
         after do

data/test/test_types.rb

@@ -1,14 +1,18 @@
 require_relative 'helper'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
     describe 'typecasting' do
       before do
         @db = Swift.db
         @db.execute %q{drop table if exists users}
-        @db.execute %q{
+        serial = case @db
+          when Swift::DB::Sqlite3 then 'integer primary key'
+          else 'serial'
+        end
+        @db.execute %Q{
           create table users(
-            id      serial,
+            id      #{serial},
             name    text,
             age     integer,
             height  float,

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Shane Hanna
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-02 00:00:00 +10:00
+date: 2011-01-05 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,6 +37,7 @@ dependencies:
   name: eventmachine
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -63,11 +65,11 @@ files:
 - VERSION
 - ext/adapter.cc
 - ext/adapter.h
+- ext/adapter_io.cc
+- ext/adapter_io.h
 - ext/attribute.cc
 - ext/attribute.h
 - ext/extconf.rb
-- ext/iostream.cc
-- ext/iostream.h
 - ext/pool.cc
 - ext/pool.h
 - ext/query.cc
@@ -105,16 +107,20 @@ files:
 - test/test_transactions.rb
 - test/test_types.rb
 - test/test_validations.rb
+- examples/async.rb
+- examples/db.rb
+- examples/scheme.rb
 has_rdoc: true
 homepage: http://github.com/shanna/swift
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -122,6 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -131,23 +138,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A rational rudimentary database abstraction.
 test_files: 
+- examples/async.rb
+- examples/db.rb
+- examples/scheme.rb
+- test/helper.rb
 - test/test_adapter.rb
-- test/test_scheme.rb
-- test/test_types.rb
+- test/test_encoding.rb
 - test/test_error.rb
+- test/test_identity_map.rb
 - test/test_io.rb
-- test/test_encoding.rb
+- test/test_pool.rb
+- test/test_scheme.rb
+- test/test_timestamps.rb
 - test/test_transactions.rb
+- test/test_types.rb
 - test/test_validations.rb
-- test/test_timestamps.rb
-- test/helper.rb
-- test/test_identity_map.rb
-- test/test_pool.rb
-- examples/async.rb
-- examples/scheme.rb
-- examples/db.rb

data/ext/iostream.h

@@ -1,17 +0,0 @@
-#ifndef SWIFT_IOSTREAM_H
-#define SWIFT_IOSTREAM_H
-
-#include "swift.h"
-
-class IOStream : public dbi::IOStream {
-    private:
-      VALUE stream;
-    public:
-      IOStream(VALUE);
-      std::string& read();
-      uint32_t read(char *, uint32_t);
-      void write(const char *);
-      void write(const char *, uint64_t);
-};
-
-#endif