swift 0.6.1 → 0.7.0

data/lib/swift/pool.rb

@@ -17,12 +17,19 @@ module Swift
           @pool.detach self
         end
       end
+
+      def notify_writable
+        notify_readable
+      end
     end # Handler
 
 
     def initialize size, options
       @pool         = Swift::DB::Pool.new size, options
-      @stop_reactor = EM.reactor_running? ? false : true
+
+      # TODO move driver specific options to extension.
+      @writable     = options[:driver] == 'db2'
+
       @pending      = {}
       @queue        = []
     end
@@ -33,9 +40,7 @@ module Swift
 
     def detach c
       @pending.delete(c)
-      if @queue.empty?
-        EM.stop if @stop_reactor && @pending.empty?
-      else
+      unless @queue.empty?
         sql, bind, callback = @queue.shift
         execute(sql, *bind, &callback)
       end
@@ -54,7 +59,7 @@ module Swift
       if request && !attached?(request.socket)
         EM.watch(request.socket, Handler, request, self) do |c|
           attach c
-          c.notify_writable = false
+          c.notify_writable = @writable
           c.notify_readable = true
         end
       else

data/lib/swift/type.rb

@@ -3,7 +3,7 @@ module Swift
     class BigDecimal < Attribute; end
     class Boolean    < Attribute; end
     class Date       < Attribute; end
-    class DateTime   < Attribute; end
+    class Time       < Attribute; end
     class Float      < Attribute; end
     class Integer    < Attribute; end
     class IO         < Attribute; end

data/swift.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swift}
-  s.version = "0.6.1"
+  s.version = "0.7.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-09-02}
+  s.date = %q{2010-09-20}
   s.description = %q{A rational rudimentary database abstraction.}
   s.email = ["shane.hanna@gmail.com", "deepfryed@gmail.com"]
   s.extensions = ["ext/extconf.rb"]
@@ -25,6 +25,8 @@ Gem::Specification.new do |s|
      "VERSION",
      "ext/adapter.cc",
      "ext/adapter.h",
+     "ext/attribute.cc",
+     "ext/attribute.h",
      "ext/extconf.rb",
      "ext/iostream.cc",
      "ext/iostream.h",

data/test/helper.rb

@@ -3,23 +3,24 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'minitest/spec'
 require 'minitest/unit'
 require 'swift'
+require 'etc'
 
-class MiniTest::Unit::TestCase
-end
+# 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' }
     adapters.each do |adapter|
       begin
-        Swift.setup :default, adapter, db: 'swift_test'
+        Swift.setup :default, adapter, connection_defaults
       rescue => error
-        warn "Unable to setup 'swift_test' db for #{adapter}, #{error.message}. Skipping..."
+        warn "Unable to setup 'swift' db for #{adapter}, #{error.message}. Skipping..."
         next
       end
 
       describe("Adapter #{adapter.name}") do
         before do
-          Swift.setup :default, adapter, db: 'swift_test'
+          Swift.setup :default, adapter, connection_defaults
         end
         block.call(adapter)
       end

data/test/test_adapter.rb

@@ -2,122 +2,119 @@ require_relative 'helper'
 require 'stringio'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::DB2 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'
+          else 'serial'
+        end
+        @db.execute %Q{create table users(id #{type}, name varchar(512), email varchar(512), created_at timestamp)}
+      end
+
       it 'yields db to block' do
         Swift.db do |db|
           assert_kind_of Swift::Adapter, db
         end
       end
-    end
 
-    describe 'execute' do
-      it 'executes without bind values' do
-        assert Swift.db.execute %q{drop table if exists users}
-      end
+      describe 'execute' do
+        it 'executes without bind values' do
+          assert @db.execute %q{select count(*) from users}
+        end
 
-      it 'executes with bind values' do
-        Swift.db.execute %q{drop table if exists users}
-        Swift.db.execute %q{create table users(id serial, name text, created_at timestamp)}
-        assert Swift.db.execute 'insert into users (name, created_at) values (?, now())', 'Benny Arthurton'
+        it 'executes with bind values' do
+          assert @db.execute 'insert into users (name, created_at) values (?, current_timestamp)', 'Benny Arthurton'
+        end
       end
-    end
 
-    describe 'prepared statements' do
-      before do
-        @db = Swift.db do |db|
-          db.execute %q{drop table if exists users}
-          db.execute %q{create table users(id serial, name text, created_at timestamp)}
+      describe 'prepared statements' 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]
         end
-      end
 
-      it 'executes without bind values' do
-        assert @db.prepare(%q{insert into users (name, created_at) values ('Apple Arthurton', now())}).execute
-      end
+        it 'executes without bind values' do
+          assert @db.prepare(%q{insert into users (name) values ('Apple Arthurton')}).execute
+        end
 
-      it 'executes with bind values' do
-        assert @db.prepare(%q{insert into users (name, created_at) values (?, now())}).execute('Apple Arthurton')
-      end
+        it 'executes with bind values' do
+          assert @db.prepare(%q{insert into users (name) values (?)}).execute('Apple Arthurton')
+        end
 
-      it 'executes multiple times' do
-        sth = @db.prepare(%q{insert into users (name, created_at) values (?, now())})
-        assert sth.execute('Apple Arthurton')
-        assert sth.execute('Benny Arthurton')
-      end
+        it 'executes multiple times' do
+          sth = @db.prepare(%q{insert into users (name, created_at) values (?, current_timestamp)})
+          assert sth.execute('Apple Arthurton')
+          assert sth.execute('Benny Arthurton')
+        end
 
-      it 'has insert_id' do
-        sql = case @db
-          when Swift::DB::Postgres then %q{insert into users (name, created_at) values (?, now()) returning id}
-          when Swift::DB::Mysql    then %q{insert into users (name, created_at) values (?, now())}
+        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(?))}
+          end
+          assert_kind_of Numeric, @db.prepare(sql).execute('Connie Arthurton').insert_id
         end
-        assert_kind_of Numeric, @db.prepare(sql).execute('Connie Arthurton').insert_id
       end
-    end
 
-    describe 'executed prepared statements' do
-      before do
-        @db = Swift.db do |db|
-          db.execute %q{drop table if exists users}
-          db.execute %q{create table users(id serial, name text, created_at timestamp)}
-          sth = db.prepare(%q{insert into users (name, created_at) values (?, now())})
-          sth.execute('Apple Arthurton')
-          sth.execute('Benny Arthurton')
-        end
-        @sth = @db.prepare('select * from users').execute
-      end
+      describe 'executed prepared statements' do
+        before 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
+        end
 
-      it 'enumerates' do
-        assert_kind_of Enumerable, @sth
-      end
+        it 'enumerates' do
+          assert_kind_of Enumerable, @sth
+        end
 
-      it 'enumerates block' do
-        begin
-          @sth.execute{|row| row}
-        rescue => error
-          flunk error.message
-        else
-          pass
+        it 'enumerates block' do
+          begin
+            @sth.execute{|row| row}
+          rescue => error
+            flunk error.message
+          else
+            pass
+          end
         end
-      end
 
-      it 'returns hash tuples for enumerable methods' do
-        assert_kind_of Hash, @sth.first
-      end
+        it 'returns hash tuples for enumerable methods' do
+          assert_kind_of Hash, @sth.first
+        end
 
-      it 'returns a result set on Adapter#execute{}' do
-        @db.execute('select * from users') {|r| assert_kind_of Hash, r }
-      end
+        it 'returns a result set on Adapter#execute{}' do
+          @db.execute('select * from users') {|r| assert_kind_of Hash, r }
+        end
 
-      it 'returns a result set on Adapter#results' do
-        @db.execute('select * from users')
-        assert_kind_of Swift::Result, @db.results
-      end
+        it 'returns a result set on Adapter#results' do
+          @db.execute('select * from users')
+          assert_kind_of Swift::Result, @db.results
+        end
 
-      it 'returns fields' do
-        assert_equal [ :id, :name, :created_at ], @sth.fields
+        it 'returns fields' do
+          assert_equal [ :id, :name, :email, :created_at ], @sth.fields
+        end
       end
-    end
 
 
-    #--
-    # TODO: Not sure how I feel about the block in write; feels like it's just there to get around the fields in the
-    # argument list. How about write('users', %w{name, email, balance}, data)?
-    describe 'bulk writes!' do
-      before do
-        @db = Swift.db do |db|
-          db.execute %q{drop table if exists users}
-          db.execute %q{create table users(id serial, name text, email text)}
+      #--
+      # TODO: Not sure how I feel about the block in write; feels like it's just there to get around the fields in the
+      # argument list. How about write('users', %w{name, email, balance}, data)?
+      describe 'bulk writes!' do
+        it 'writes from an IO object' do
+          data = StringIO.new "Sally Arthurton\tsally@local\nJonas Arthurton\tjonas@local\n"
+          assert_equal 2, @db.write('users', %w{name email}, data)
         end
-      end
-
-      it 'writes from an IO object' do
-        data = StringIO.new "Sally Arthurton\tsally@local\nJonas Arthurton\tjonas@local\n"
-        assert_equal 2, Swift.db.write('users', %w{name email}, data)
-      end
 
-      it 'writes from a string' do
-        data = "Sally Arthurton\tsally@local\nJonas Arthurton\tjonas@local\n"
-        assert_equal 2, Swift.db.write('users', %w{name email}, data)
+        it 'writes from a string' do
+          data = "Sally Arthurton\tsally@local\nJonas Arthurton\tjonas@local\n"
+          assert_equal 2, @db.write('users', %w{name email}, data)
+        end
       end
     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 do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::DB2 do
     describe 'character encoding' 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{drop table users} rescue nil
+          db.execute %q{create table users(name varchar(128))}
 
           # Mysql on debian at least doesn't default to utf8.
           if db.kind_of? Swift::DB::Mysql

data/test/test_io.rb

@@ -1,7 +1,7 @@
 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::DB2 do
     describe 'Storing binary objects' do
       before do
         user = Class.new(Swift::Scheme) do

data/test/test_pool.rb

@@ -6,28 +6,32 @@ describe 'Adapter' do
     describe 'Asynchronous connection pool' 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)}
+          db.execute %q{drop table users} rescue nil
+          db.execute %Q{create table users(name varchar(64))}
         end
       end
 
-      it 'creates connection pool' do
-        driver = Swift.db.kind_of?(Swift::DB::Mysql) ? 'mysql' : 'postgresql'
-        assert Swift::Pool.new 5, db: 'swift_test', driver: driver
-      end
-
-      describe 'Running queries' do
-        it 'should select data' do
-          rows = []
+      it 'creates connection pool and runs queries' do
+        rows = []
+        Swift.pool(5) do |pool|
+          assert pool
           assert Swift.db.write('users', %w{name}, StringIO.new("user1\nuser2\nuser3\n"))
-          Swift.pool 5 do |pool|
-            pool.execute('select * from users') do |rs|
-              rows += rs.to_a
-              pool.execute('select * from users') {|rs| rows += rs.to_a }
+          pool.execute('select * from users') do |rs|
+            rows += rs.to_a
+            Thread.new do
+              sleep 0.25
+              pool.execute('select * from users order by name desc') {|rs| rows += rs.to_a; EM.stop }
             end
           end
-          assert_equal 6, rows.length
+          pool.execute('select * from users') do |rs|
+            rows += rs.to_a
+          end
         end
+
+        data = %w(user1 user2 user3)
+
+        assert_equal 9, rows.length
+        assert_equal data*2 + data.reverse, rows.map {|r| r[:name] }
       end
     end
   end

data/test/test_scheme.rb

@@ -9,7 +9,7 @@ describe 'scheme' do
       attribute :age,        Swift::Type::Integer,  default: 18
       attribute :email,      Swift::Type::String
       attribute :verified,   Swift::Type::Boolean,  default: false
-      attribute :created_at, Swift::Type::DateTime, default: proc { Time.now }
+      attribute :created_at, Swift::Type::Time,     default: proc { Time.now }
     end
   end
 

data/test/test_timestamps.rb

@@ -25,15 +25,32 @@ describe 'Adapter' do
           assert_timestamp_like time, fetch_timestamp_at(time), 'DST off'
         end
 
-        def fetch_timestamp_at value
-          sql = "select '%s'::timestamp with time zone as now" % value.strftime('%F %T%z')
+        describe 'Adapter timezone' do
+          %w(+05:30 -05:30).each do |offset|
+            it 'should parse timestamps and do conversion accordingly for offset ' + offset do
+              @db = Swift::DB::Postgres.new(@db.options.merge(timezone: offset))
+              server = DateTime.parse('2010-01-01 10:00:00')
+              local  = DateTime.parse('2010-01-01 10:00:00 ' + offset)
+              assert_timestamp_like local, fetch_timestamp_at(server, ''), 'parses correctly'
+            end
+          end
+        end
+
+        def fetch_timestamp_at value, zone='%z'
+          sql = if zone.empty?
+            "select '%s'::timestamp as now"
+          else
+            "select '%s'::timestamp with time zone as now"
+          end
+
+          sql = sql % value.strftime('%F %T' + zone)
           @db.execute(sql)
           @db.results.first.fetch(:now)
         end
 
         def assert_timestamp_like expect, given, comment
           match = Regexp.new expect.to_time.strftime('%F %T')
-          assert_kind_of DateTime, given
+          assert_kind_of Time, given
           assert_match match, given.strftime('%F %T'), comment
         end
       end

data/test/test_transactions.rb

@@ -1,15 +1,15 @@
 require_relative 'helper'
-describe 'Adapter' do
-  supported_by Swift::DB::Postgres do #, Swift::DB::Mysql do
-    before do
-      Swift.db.execute %q{drop table if exists users}
-      Swift.db.execute %q{create table users(id serial, name text, created_at timestamp)}
-    end
 
+describe 'Adapter' do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::DB2 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.
+        @sth = @db.prepare('select count(*) as c from users where name = ?')
       end
 
       it 'yields db to block' do
@@ -28,7 +28,7 @@ describe 'Adapter' do
         end
 
         after do
-          @db.execute('select count(*) as c from users where name = ?', @name) {|r| assert_equal 1, r[:c] }
+          assert_equal 1, @sth.execute(@name).first[:c]
         end
 
         it 'should allow explicit commits' do
@@ -43,16 +43,15 @@ describe 'Adapter' do
             db.execute('insert into users(name) values(?)', @name)
           end
         end
-      end
+      end # commits work
 
       describe 'rollbacks work' do
-
         before do
           @db.execute('truncate users')
         end
 
         after do
-          @db.execute('select count(*) as c from users where name = ?', @name) {|r| assert_equal 0, r[:c] }
+          assert_equal 0, @sth.execute(@name).first[:c]
         end
 
         it 'should allow explicit rollbacks' do
@@ -70,7 +69,31 @@ describe 'Adapter' do
             end
           end
         end
-      end
-    end
-  end
-end
+      end # rollbacks work
+
+      describe 'nested transactions' do
+        before do
+          @db.execute('truncate users')
+        end
+
+        after do
+          assert_equal 1, @sth.execute(@name).first[:c]
+        end
+
+        it 'should autocommit and autorollback' do
+          @db.transaction do |db|
+            db.execute('insert into users(name) values(?)', @name)
+            begin
+              db.transaction do
+                db.execute('insert into users(name) values(?)', @name)
+                raise 'foo'
+              end
+            rescue RuntimeError
+            end
+          end
+        end
+      end # nested transactions
+
+    end # transactions
+  end # supported_by
+end # adapter

data/test/test_types.rb

@@ -7,13 +7,23 @@ describe 'Adapter' do
         @db = Swift.db
         @db.execute %q{drop table if exists users}
         @db.execute %q{
-          create table users(id serial, name text, age integer, height float, hacker bool, slacker bool, created date)
+          create table users(
+            id      serial,
+            name    text,
+            age     integer,
+            height  float,
+            hacker  bool,
+            slacker bool,
+            created date,
+            updated timestamp
+          )
         }
       end
 
       it 'query result is typecast correctly' do
-        bind = [ 'jim', 32, 178.71, true, false ]
-        @db.execute %q{insert into users(name,age,height,hacker,slacker, created) values(?, ?, ?, ?, ?, now())}, *bind
+        dt   = '2010-01-01 23:22:21'
+        bind = [ 1, 'jim', 32, 178.71, true, false, '2010-01-02', "#{dt}.012345+11:00" ]
+        @db.execute %q{insert into users values(?, ?, ?, ?, ?, ?, ?, ?)}, *bind
 
         result = @db.prepare(%q{select * from users limit 1}).execute.first
         assert_kind_of Integer,    result[:id]
@@ -23,6 +33,10 @@ describe 'Adapter' do
         assert_kind_of TrueClass,  result[:hacker]
         assert_kind_of FalseClass, result[:slacker]
         assert_kind_of Date,       result[:created]
+        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)
       end
     end
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Shane Hanna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +10:00
+date: 2010-09-20 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,8 @@ files:
 - VERSION
 - ext/adapter.cc
 - ext/adapter.h
+- ext/attribute.cc
+- ext/attribute.h
 - ext/extconf.rb
 - ext/iostream.cc
 - ext/iostream.h