swift 0.8.0 → 0.8.1

data/API.rdoc

@@ -25,6 +25,8 @@ Public API minus the optional stuff like Pool, IdentityMap, Migrations etc.
       #rollback
       #transaction #=> Adapter
       #update      #=> Result
+      #reconnect
+      #delete      #=> Result
 
       # TODO: DBI < Adapter
         # returning? #=> true or false
@@ -33,6 +35,7 @@ Public API minus the optional stuff like Pool, IdentityMap, Migrations etc.
     DB
       Mysql    < Adapter # TODO: Adapter::DBI?
       Postgres < Adapter # TODO: Adapter::DBI?
+      Sqlite3  < Adapter # TODO: Adapter::DBI?
 
     # Enumerable collection of Scheme or Hash tuples.
     Result
@@ -40,9 +43,9 @@ Public API minus the optional stuff like Pool, IdentityMap, Migrations etc.
       #insert_id #=> Numeric
       #fields    #=> [Symbol, ...] # Field names identical to .first.keys if rows > 0
 
-    Statement < Result
+    Statement
       .new     #=> Statement
-      #execute #=> Statement
+      #execute #=> Result
 
     Scheme
       .all       #=> Result

data/README.rdoc

@@ -9,7 +9,7 @@ A rational rudimentary object relational mapper.
 == Dependencies
 
 * ruby   >= 1.9.1
-* dbic++ >= 0.4.0 (http://github.com/deepfryed/dbicpp)
+* dbic++ >= 0.5.3 (http://github.com/deepfryed/dbicpp)
 * mysql  >= 5.0.17, postgresql >= 8.4 or sqlite3 >= 3.7
 
 == Features
@@ -217,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.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
+    benchmark       sys     user    total  real     rss
+    ar #create      1.01    7.91    8.92   11.426   406.22m
+    ar #select      0.02    0.31    0.33    0.378    40.69m
+    ar #update      0.88    9.64   10.52   13.908   504.93m
 
-    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
+    dm #create      0.23    3.52    3.75    5.405   211.00m
+    dm #select      0.11    1.67    1.78    1.912   114.57m
+    dm #update      0.54    7.34    7.88    9.453   531.30m
 
-    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
+    sequel #create  0.77    4.61    5.38    8.194   235.50m
+    sequel #select  0.01    0.13    0.14    0.180    12.73m
+    sequel #update  0.64    4.76    5.40    7.790   229.69m
 
-    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
+    swift #create   0.13    0.66    0.79    1.463    85.77m
+    swift #select   0.01    0.10    0.11    0.135     8.92m
+    swift #update   0.14    0.75    0.89    1.585    59.56m
 
     -- bulk insert api --
-    swift #write    0.010000  0.100000  0.11000  0.180514   14.80m
+    swift #write    0.00    0.10    0.10    0.180    14.79m
 
 
 ==== Adapter

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/ext/adapter.cc

@@ -1,5 +1,16 @@
 #include "adapter.h"
 
+// extend the default dbi::FieldSet class with some ruby love.
+class Fields : public dbi::FieldSet {
+  public:
+  Fields() : dbi::FieldSet(0) {}
+
+  void operator<<(VALUE v) {
+    VALUE name = TO_S(v);
+    fields.push_back(std::string(RSTRING_PTR(name), RSTRING_LEN(name)));
+  }
+};
+
 static VALUE cSwiftAdapter;
 
 static void adapter_free(dbi::Handle *handle) {
@@ -98,6 +109,12 @@ static VALUE adapter_execute(int argc, VALUE *argv, VALUE self) {
   CATCH_DBI_EXCEPTIONS();
 }
 
+static VALUE adapter_reconnect(VALUE self) {
+  dbi::Handle *handle = adapter_handle(self);
+  try { handle->reconnect(); } CATCH_DBI_EXCEPTIONS();
+  return Qtrue;
+}
+
 static VALUE adapter_initialize(VALUE self, VALUE options) {
   VALUE db       = rb_hash_aref(options, ID2SYM(rb_intern("db")));
   VALUE driver   = rb_hash_aref(options, ID2SYM(rb_intern("driver")));
@@ -197,11 +214,9 @@ static VALUE adapter_write(int argc, VALUE *argv, VALUE self) {
     rb_raise(eSwiftArgumentError, "Fields must be an Array.");
 
   try {
-    dbi::FieldSet write_fields;
-    for (int i = 0; i < RARRAY_LEN(fields); i++) {
-      VALUE field = TO_S(rb_ary_entry(fields, i));
-      write_fields << std::string(RSTRING_PTR(field), RSTRING_LEN(field));
-    }
+    Fields write_fields;
+    for (int i = 0; i < RARRAY_LEN(fields); i++)
+      write_fields << rb_ary_entry(fields, i);
 
     /*
       TODO: Adapter specific code is balls.
@@ -228,17 +243,18 @@ void init_swift_adapter() {
   cSwiftAdapter = rb_define_class_under(mSwift, "Adapter", rb_cObject);
 
   rb_define_method(cSwiftAdapter, "begin",       RUBY_METHOD_FUNC(adapter_begin),       -1);
-  rb_define_method(cSwiftAdapter, "clone",       RUBY_METHOD_FUNC(adapter_clone),       0);
-  rb_define_method(cSwiftAdapter, "close",       RUBY_METHOD_FUNC(adapter_close),       0);
+  rb_define_method(cSwiftAdapter, "clone",       RUBY_METHOD_FUNC(adapter_clone),        0);
+  rb_define_method(cSwiftAdapter, "close",       RUBY_METHOD_FUNC(adapter_close),        0);
   rb_define_method(cSwiftAdapter, "commit",      RUBY_METHOD_FUNC(adapter_commit),      -1);
-  rb_define_method(cSwiftAdapter, "dup",         RUBY_METHOD_FUNC(adapter_dup),         0);
-  rb_define_method(cSwiftAdapter, "escape",      RUBY_METHOD_FUNC(adapter_escape),      1);
+  rb_define_method(cSwiftAdapter, "dup",         RUBY_METHOD_FUNC(adapter_dup),          0);
+  rb_define_method(cSwiftAdapter, "escape",      RUBY_METHOD_FUNC(adapter_escape),       1);
   rb_define_method(cSwiftAdapter, "execute",     RUBY_METHOD_FUNC(adapter_execute),     -1);
-  rb_define_method(cSwiftAdapter, "initialize",  RUBY_METHOD_FUNC(adapter_initialize),  1);
+  rb_define_method(cSwiftAdapter, "initialize",  RUBY_METHOD_FUNC(adapter_initialize),   1);
   rb_define_method(cSwiftAdapter, "prepare",     RUBY_METHOD_FUNC(adapter_prepare),     -1);
   rb_define_method(cSwiftAdapter, "rollback",    RUBY_METHOD_FUNC(adapter_rollback),    -1);
   rb_define_method(cSwiftAdapter, "transaction", RUBY_METHOD_FUNC(adapter_transaction), -1);
   rb_define_method(cSwiftAdapter, "write",       RUBY_METHOD_FUNC(adapter_write),       -1);
+  rb_define_method(cSwiftAdapter, "reconnect",   RUBY_METHOD_FUNC(adapter_reconnect),    0);
 
   rb_define_alloc_func(cSwiftAdapter, adapter_alloc);
 }

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.5.2'
+assert_dbicpp_version '0.5.4'
 
 create_makefile 'swift'

data/ext/query.cc

@@ -12,7 +12,7 @@ VALUE query_execute(Query *query) {
     );
   }
   catch (dbi::Error &e) {
-    query->error = e.what();
+    snprintf(query->error, 8192, "%s", e.what());
     return Qfalse;
   }
 }
@@ -26,7 +26,7 @@ VALUE query_execute_statement(Query *query) {
     );
   }
   catch (dbi::Error &e) {
-    query->error = e.what();
+    snprintf(query->error, 8192, "%s", e.what());
     return Qfalse;
   }
 }

data/ext/query.h

@@ -8,7 +8,7 @@ struct Query {
   dbi::Handle             *handle;
   dbi::AbstractStatement  *statement;
   std::vector<dbi::Param> bind;
-  const char              *error;
+  char                    error[8192];
 };
 
 VALUE query_execute(Query*);

data/ext/result.cc

@@ -138,24 +138,27 @@ int64_t server_tzoffset(struct tm* tm, const char *zone) {
 
 VALUE typecast_timestamp(const char *data, uint64_t len, const char *zone) {
   struct   tm tm;
-  int64_t  epoch, adjust, offset;
   uint64_t usec   = 0;
+  int64_t  epoch, adjust, offset;
   char     tzsign = 0, subsec[32];
-  int      tzhour = 0, tzmin = 0;
+  int      tzhour = 0, tzmin = 0, lastmatch = -1;
 
   memset(&tm, 0, sizeof(struct tm));
-  // Based on github.com/jeremyevans/sequel_pg. atoll & pow seem to be tad faster than sscanf %Lf
-  // NOTE: Reading subsec as string means malformed subsec > 32 digits could break this.
-  if (strchr(data, '.')) {
-    sscanf(data, "%04d-%02d-%02d %02d:%02d:%02d.%s%c%02d:%02d",
-      &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec, subsec,
-      &tzsign, &tzhour, &tzmin);
-      usec = atoll(subsec)*(uint64_t)pow(10, 6 - strlen(subsec));
-  }
-  else {
-    sscanf(data, "%04d-%02d-%02d %02d:%02d:%02d%c%02d:%02d",
-      &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec,
-      &tzsign, &tzhour, &tzmin);
+  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);
+
+  // parse millisecs if any
+  if (lastmatch > 0 && lastmatch < len && *(data+lastmatch) == '.') {
+      lastmatch++;
+      int idx = 0;
+      const char *ptr = data + lastmatch;
+      while (*ptr && *ptr >= '0' && *ptr <= '9' && idx < 31) {
+        subsec[idx++] = *ptr;
+        ptr++;
+        lastmatch++;
+      }
+      subsec[idx] = 0;
+      usec        = atoll(subsec);
   }
 
   tm.tm_year  -= 1900;
@@ -166,6 +169,22 @@ VALUE typecast_timestamp(const char *data, uint64_t len, const char *zone) {
     adjust = client_tzoffset(epoch, tm.tm_isdst);
     offset = adjust;
 
+    // parse timezone offsets if any - matches +HH:MM +HH MM +HHMM
+    if (lastmatch > 0 && lastmatch < len) {
+      const char *ptr = data + lastmatch;
+      while(*ptr && *ptr != '+' && *ptr != '-') ptr++;
+      tzsign = *ptr++;
+      if (*ptr && *ptr >= '0' && *ptr <= '9') {
+        tzhour = *ptr++ - '0';
+        if (*ptr && *ptr >= '0' && *ptr <= '9') tzhour = tzhour*10 + *ptr++ - '0';
+        while(*ptr && (*ptr < '0' || *ptr > '9')) ptr++;
+        if (*ptr && *ptr >= '0' && *ptr <= '9') {
+          tzmin = *ptr++ - '0';
+          if (*ptr && *ptr >= '0' && *ptr <= '9') tzmin = tzmin*10 + *ptr++ - '0';
+        }
+      }
+    }
+
     if (tzsign) {
       offset = tzsign == '+'
         ? (time_t)tzhour *  3600 + (time_t)tzmin *  60

data/lib/swift/adapter.rb

@@ -83,9 +83,9 @@ module Swift
     # @example Multiple relations.
     #   apple = User.new(name: 'Apple Arthurton', age: 32)
     #   benny = User.new(name: 'Benny Arthurton', age: 30)
-    #   Swift.db.first(User, apple, benny)
+    #   Swift.db.create(User, apple, benny)
     # @example Coerce multiple relations.
-    #   Swift.db.first(User, {name: 'Apple Arthurton', age: 32}, {name: 'Benny Arthurton', age: 30})
+    #   Swift.db.create(User, {name: 'Apple Arthurton', age: 32}, {name: 'Benny Arthurton', age: 30})
     #
     # @param  [Swift::Scheme]       scheme     Concrete scheme subclass to load.
     # @param  [Swift::Scheme, Hash> *relations Scheme or tuple hash. Hashes will be coerced into scheme via Swift::Scheme#new
@@ -95,9 +95,8 @@ module Swift
       statement = prepare_create(scheme)
       relations.map do |relation|
         relation = scheme.new(relation) unless relation.kind_of?(scheme)
-        if statement.execute(*relation.tuple.values_at(*scheme.header.insertable)) && scheme.header.serial
-          relation.tuple[scheme.header.serial] = statement.insert_id
-        end
+        result   = statement.execute(*relation.tuple.values_at(*scheme.header.insertable))
+        relation.tuple[scheme.header.serial] = result.insert_id if scheme.header.serial
         relation
       end
     end
@@ -129,7 +128,9 @@ module Swift
       statement = prepare_update(scheme)
       relations.map do |relation|
         relation = scheme.new(relation) unless relation.kind_of?(scheme)
-        statement.execute(*relation.tuple.values_at(*scheme.header.updatable, *scheme.header.keys))
+        keys     = relation.tuple.values_at(*scheme.header.keys)
+        raise ArgumentError, "relation has incomplete key : #{relation.inspect}" unless keys.select(&:nil?).empty?
+        statement.execute(*relation.tuple.values_at(*scheme.header.updatable), *keys)
         relation
       end
     end
@@ -160,19 +161,39 @@ module Swift
       statement = prepare_destroy(scheme)
       relations.map do |relation|
         relation = scheme.new(relation) unless relation.kind_of?(scheme)
-        if result = statement.execute(*relation.tuple.values_at(*scheme.header.keys))
+        keys     = relation.tuple.values_at(*scheme.header.keys)
+        raise ArgumentError, "relation has incomplete key : #{relation.inspect}" unless keys.select(&:nil?).empty?
+        if result = statement.execute(*keys)
           relation.freeze
         end
         result
       end
     end
 
+
+    # Delete one or more rows
+    #
+    # @example All.
+    #   Swift.db.delete(User)
+    # @example All with conditions and binds.
+    #   Swift.db.delete(User, ':name = ? and :age > ?', 'Apple Arthurton', 32)
+    #
+    # @param  [Swift::Scheme] scheme     Concrete scheme subclass
+    # @param  [String]        conditions Optional SQL 'where' fragment.
+    # @param  [Object, ...]   *binds     Optional bind values that accompany conditions SQL fragment.
+    # @return [Swift::Result]
+    def delete scheme, conditions = '', *binds
+      sql =  "delete from #{scheme.store}"
+      sql += " where #{exchange_names(scheme, conditions)}" unless conditions.empty?
+      execute(sql, *binds)
+    end
+
     def migrate! scheme
       keys   =  scheme.header.keys
       fields =  scheme.header.map{|p| field_definition(p)}.join(', ')
       fields += ", primary key (#{keys.join(', ')})" unless keys.empty?
 
-      execute("drop table if exists #{scheme.store}")
+      execute("drop table if exists #{scheme.store} cascade")
       execute("create table #{scheme.store} (#{fields})")
     end
 

data/lib/swift/db.rb

@@ -8,6 +8,16 @@ module Swift
       def returning?
         false
       end
+
+      # TODO Swift::Type::Bignum ?
+      # serial is an alias for bigint in mysql, we want integer type to be migrated as integer
+      # type in the database (not bigint or smallint or shortint or whatever).
+      def field_type attribute
+        case attribute
+          when Type::Integer then attribute.serial ? 'integer auto_increment' : 'integer'
+          else super
+        end
+      end
     end # Mysql
 
     class Sqlite3 < Adapter

data/swift.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swift}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   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{2011-01-05}
+  s.date = %q{2011-01-19}
   s.description = %q{A rational rudimentary database abstraction.}
   s.email = ["shane.hanna@gmail.com", "deepfryed@gmail.com"]
   s.extensions = ["ext/extconf.rb"]

data/test/test_adapter.rb

@@ -20,6 +20,12 @@ describe 'Adapter' do
         end
       end
 
+      it 'reconnects to db' do
+        Swift.trace true, open('/dev/null', 'w')
+        assert_block { @db.reconnect }
+        Swift.trace false
+      end
+
       describe 'execute' do
         it 'executes without bind values' do
           assert @db.execute %q{select count(*) from users}
@@ -56,7 +62,9 @@ describe 'Adapter' do
             when Swift::DB::Postgres then %q{insert into users (name) values (?) returning id}
             else %q{insert into users (name) values (?)}
           end
-          assert_kind_of Fixnum, @db.prepare(sql).execute('Connie Arthurton').insert_id
+          statement = @db.prepare(sql)
+          assert 1, statement.execute('Connie Arthurton').insert_id
+          assert 1, statement.insert_id # caches insert_id, just interface compatibility with dbic++
         end
       end
 
@@ -116,8 +124,12 @@ describe 'Adapter' do
         end
 
         it 'writes with no columns specified' do
-          data = "1\tSally Arthurton\tsally@local\t2010-01-01 00:00:00\n"
-          assert_equal 1, @db.write('users', [], data)
+          ts   = DateTime.parse('2010-01-01 00:00:00').to_time
+          data = "1\tSally Arthurton\tsally@local\t#{ts}\n"
+          row  = {id: 1, name: 'Sally Arthurton', email: 'sally@local', created_at: ts}
+
+          assert_equal 1,   @db.write('users', [], data)
+          assert_equal row, @db.execute('select * from users limit 1').first
         end
       end
     end

data/test/test_scheme.rb

@@ -50,4 +50,52 @@ describe 'scheme' do
       assert_equal 'cary@local', user.email
     end
   end
+
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
+    describe 'adapter operations' do
+      before do
+        Swift.db.migrate! @user
+      end
+
+      it 'adapter should destroy valid instance' do
+        user = @user.create.first
+        assert_equal 1, user.id
+
+        assert Swift.db.destroy @user, user
+        assert_nil @user.get(id: 1)
+      end
+
+      it 'adapter should barf when trying to destroy invalid instance' do
+        assert_raises(ArgumentError) { Swift.db.destroy @user, {id: nil, name: 'foo'} }
+      end
+
+      it 'adapter should delete all rows given scheme' do
+        user = @user.create.first
+        assert_equal 1, user.id
+
+        Swift.db.delete @user
+        assert_nil @user.get(id: 1)
+      end
+
+      it 'adapter should delete only relevant rows given condition & scheme' do
+        Swift.db.create(@user, {name: 'dave'}, {name: 'mike'})
+        assert_equal 2, @user.all.rows
+
+        Swift.db.delete @user, ':name = ?', 'dave'
+        assert_nil @user.first ':name = ?', 'dave'
+        assert @user.first ':name = ?', 'mike'
+      end
+
+      it 'should not update without valid keys' do
+        user = @user.new
+        assert_raises(ArgumentError) { user.update(name: 'dave') }
+      end
+
+      it 'should update with valid keys' do
+        user = @user.create.first
+        assert user.update(name: 'dave')
+        assert_equal 'dave', @user.first.name
+      end
+    end
+  end
 end

data/test/test_timestamps.rb

@@ -3,7 +3,7 @@ require 'date'
 
 describe 'Adapter' do
   supported_by Swift::DB::Postgres do
-    %w(Australia/Melboure America/Chicago).each do |timezone|
+    %w(America/Chicago Australia/Melbourne).each do |timezone|
       describe 'time parsing in %s' % timezone do
         before do
           @db = Swift.db

data/test/test_types.rb

@@ -40,7 +40,7 @@ describe 'Adapter' do
         assert_kind_of Time,       result[:updated]
 
         assert_equal   dt,         result[:updated].strftime('%F %T')
-        assert_equal   12345,      result[:updated].usec if @db.kind_of?(Swift::DB::Postgres)
+        assert_equal   12345,      result[:updated].usec unless @db.kind_of?(Swift::DB::Mysql)
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Shane Hanna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +11:00
+date: 2011-01-19 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency