sequel 0.4.1 → 0.4.1.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.4.1.1 (2007-11-27)
+
+* Fixed #first and #last functionality in Informix::Dataset (thanks Gerardo Santana).
+
 === 0.4.1 (2007-11-25)
 
 * Put adapter files in lib/sequel/adapters. Requiring sequel/<adapter> is now deprecated. Users can now just require 'sequel' and adapters are automagically loaded (#93).

data/README

@@ -30,13 +30,14 @@ Sequel currently supports:
 
 * ADO (on Windows)
 * DBI
+* Informix
 * MySQL
 * ODBC
 * Oracle
 * PostgreSQL
 * SQLite 3
 
-There are also experimental adapters for DB2 and Informix.
+There is also an experimental adapter for DB2.
 
 == The Sequel Console
 

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.4.1"
+VERS = "0.4.1.1"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",

data/lib/sequel/adapters/informix.rb

@@ -49,6 +49,18 @@ module Sequel
         end
       end
 
+      def select_sql(opts = nil)
+        limit = opts.delete(:limit)
+        offset = opts.delete(:offset)
+        sql = super
+        if limit
+          limit = "FIRST #{limit}"
+          offset = offset ? "SKIP #{offset}" : ""
+          sql.sub!(/^select /i,"SELECT #{offset} #{limit} ")
+        end
+        sql
+      end
+      
       def fetch_rows(sql, &block)
         @db.synchronize do
           @db.query(sql) do |cursor|

data/lib/sequel/model/base.rb

@@ -14,7 +14,7 @@ module Sequel
     # Called when a database is opened in order to automatically associate the
     # first opened database with model classes.
     def self.database_opened(db)
-      @db = db if self == Model && !@db
+      @db = db if (self == Model) && !@db
     end
 
     # Returns the dataset associated with the Model class.

data/spec/adapters/informix_spec.rb

@@ -0,0 +1,139 @@
+require File.join(File.dirname(__FILE__), '../../lib/sequel')
+
+INFORMIX_DB = Sequel('informix://localhost/mydb')
+if INFORMIX_DB.table_exists?(:test)
+  INFORMIX_DB.drop_table :test
+end
+INFORMIX_DB.create_table :test do
+  text :name
+  integer :value
+  
+  index :value
+end
+
+context "A Informix database" do
+  specify "should provide disconnect functionality" do
+    INFORMIX_DB.execute("select user from dual")
+    INFORMIX_DB.pool.size.should == 1
+    INFORMIX_DB.disconnect
+    INFORMIX_DB.pool.size.should == 0
+  end
+end
+
+context "A Informix dataset" do
+  setup do
+    @d = INFORMIX_DB[:test]
+    @d.delete # remove all records
+  end
+  
+  specify "should return the correct record count" do
+    @d.count.should == 0
+    @d << {:name => 'abc', :value => 123}
+    @d << {:name => 'abc', :value => 456}
+    @d << {:name => 'def', :value => 789}
+    @d.count.should == 3
+  end
+  
+  specify "should return the correct records" do
+    @d.to_a.should == []
+    @d << {:name => 'abc', :value => 123}
+    @d << {:name => 'abc', :value => 456}
+    @d << {:name => 'def', :value => 789}
+
+    @d.order(:value).to_a.should == [
+      {:name => 'abc', :value => 123},
+      {:name => 'abc', :value => 456},
+      {:name => 'def', :value => 789}
+    ]
+  end
+  
+  specify "should update records correctly" do
+    @d << {:name => 'abc', :value => 123}
+    @d << {:name => 'abc', :value => 456}
+    @d << {:name => 'def', :value => 789}
+    @d.filter(:name => 'abc').update(:value => 530)
+    
+    # the third record should stay the same
+    # floating-point precision bullshit
+    @d[:name => 'def'][:value].should == 789
+    @d.filter(:value => 530).count.should == 2
+  end
+  
+  specify "should delete records correctly" do
+    @d << {:name => 'abc', :value => 123}
+    @d << {:name => 'abc', :value => 456}
+    @d << {:name => 'def', :value => 789}
+    @d.filter(:name => 'abc').delete
+    
+    @d.count.should == 1
+    @d.first[:name].should == 'def'
+  end
+  
+  specify "should be able to literalize booleans" do
+    proc {@d.literal(true)}.should_not raise_error
+    proc {@d.literal(false)}.should_not raise_error
+  end
+  
+  specify "should support transactions" do
+    INFORMIX_DB.transaction do
+      @d << {:name => 'abc', :value => 1}
+    end
+
+    @d.count.should == 1
+  end
+  
+  specify "should support #first and #last" do
+    @d << {:name => 'abc', :value => 123}
+    @d << {:name => 'abc', :value => 456}
+    @d << {:name => 'def', :value => 789}
+    
+    @d.order(:value).first.should == {:name => 'abc', :value => 123}
+    @d.order(:value).last.should == {:name => 'def', :value => 789}
+  end
+end
+
+context "A Informix dataset in array tuples mode" do
+  setup do
+    @d = INFORMIX_DB[:test]
+    @d.delete # remove all records
+    Sequel.use_array_tuples
+  end
+  
+  teardown do
+    Sequel.use_hash_tuples
+  end
+  
+  specify "should return the correct records" do
+    @d.to_a.should == []
+    @d << {:name => 'abc', :value => 123}
+    @d << {:name => 'abc', :value => 456}
+    @d << {:name => 'def', :value => 789}
+
+    @d.order(:value).select(:name, :value).to_a.should == [
+      ['abc', 123],
+      ['abc', 456],
+      ['def', 789]
+    ]
+  end
+  
+  specify "should work correctly with transforms" do
+    @d.transform(:value => [proc {|v| v.to_s}, proc {|v| v.to_i}])
+
+    @d.to_a.should == []
+    @d << {:name => 'abc', :value => 123}
+    @d << {:name => 'abc', :value => 456}
+    @d << {:name => 'def', :value => 789}
+
+    @d.order(:value).select(:name, :value).to_a.should == [
+      ['abc', '123'],
+      ['abc', '456'],
+      ['def', '789']
+    ]
+    
+    a = @d.order(:value).first
+    a.values.should == ['abc', '123']
+    a.keys.should == [:name, :value]
+    a[:name].should == 'abc'
+    a[:value].should == '123'
+  end
+end

data/spec/adapters/mysql_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/sequel/mysql')
+require File.join(File.dirname(__FILE__), '../../lib/sequel')
 
 MYSQL_DB = Sequel('mysql://root@localhost/sandbox')
 if MYSQL_DB.table_exists?(:items)

data/spec/adapters/oracle_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/sequel/oracle')
+require File.join(File.dirname(__FILE__), '../../lib/sequel')
 
 ORACLE_DB = Sequel('oracle://hr:hr@loalhost/XE')
 if ORACLE_DB.table_exists?(:test)

data/spec/adapters/postgres_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/sequel/postgres')
+require File.join(File.dirname(__FILE__), '../../lib/sequel')
 
 PGSQL_DB = Sequel('postgres://postgres:postgres@localhost:5432/reality_spec')
 if PGSQL_DB.table_exists?(:test)

data/spec/adapters/sqlite_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/sequel/sqlite')
+require File.join(File.dirname(__FILE__), '../../lib/sequel')
 
 SQLITE_DB = Sequel('sqlite:/')
 SQLITE_DB.create_table :items do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.1.1
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-11-25 00:00:00 +02:00
+date: 2007-11-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,8 +54,8 @@ files:
 - README
 - Rakefile
 - bin/sequel
-- doc/rdoc
 - spec/adapters
+- spec/adapters/informix_spec.rb
 - spec/adapters/mysql_spec.rb
 - spec/adapters/oracle_spec.rb
 - spec/adapters/postgres_spec.rb