sequel 3.20.0 → 3.21.0

data/lib/sequel/plugins/validation_helpers.rb

@@ -72,7 +72,7 @@ module Sequel
     
         # Check attribute value(s) is included in the given set.
         def validates_includes(set, atts, opts={})
-          validatable_attributes_for_type(:includes, atts, opts){|a,v,m| validation_error_message(m, set) unless set.include?(v)}
+          validatable_attributes_for_type(:includes, atts, opts){|a,v,m| validation_error_message(m, set) unless set.send(set.respond_to?(:cover?) ? :cover? : :include?, v)}
         end
     
         # Check attribute value(s) string representation is a valid integer.
@@ -89,7 +89,7 @@ module Sequel
 
         # Check that the attribute values length is in the specified range.
         def validates_length_range(range, atts, opts={})
-          validatable_attributes_for_type(:length_range, atts, opts){|a,v,m| validation_error_message(m, range) unless v && range.include?(v.length)}
+          validatable_attributes_for_type(:length_range, atts, opts){|a,v,m| validation_error_message(m, range) unless v && range.send(range.respond_to?(:cover?) ? :cover? : :include?, v.length)}
         end
     
         # Check that the attribute values are not longer than the given max length.

data/lib/sequel/version.rb

@@ -3,7 +3,7 @@ module Sequel
   MAJOR = 3
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 20
+  MINOR = 21
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
   TINY  = 0

data/spec/adapters/firebird_spec.rb

@@ -43,7 +43,7 @@ FIREBIRD_DB.create_table! :test6 do
   String :val4, :text=>true
 end
 
-context "A Firebird database" do
+describe "A Firebird database" do
   before do
     @db = FIREBIRD_DB
   end
@@ -60,7 +60,7 @@ context "A Firebird database" do
   end
 end
 
-context "A Firebird dataset" do
+describe "A Firebird dataset" do
   before do
     @d = FIREBIRD_DB[:test]
     @d.delete # remove all records
@@ -230,7 +230,7 @@ context "A Firebird dataset" do
   end
 end
 
-context "A Firebird dataset with a timestamp field" do
+describe "A Firebird dataset with a timestamp field" do
   before do
     @d = FIREBIRD_DB[:test3]
     @d.delete
@@ -244,7 +244,7 @@ context "A Firebird dataset with a timestamp field" do
   end
 end
 
-context "A Firebird database" do
+describe "A Firebird database" do
   before do
     @db = FIREBIRD_DB
     @db.drop_table(:posts) rescue nil
@@ -353,7 +353,7 @@ context "A Firebird database" do
   end
 end
 
-context "Postgres::Dataset#insert" do
+describe "Postgres::Dataset#insert" do
   before do
     @ds = FIREBIRD_DB[:test5]
     @ds.delete
@@ -387,7 +387,7 @@ context "Postgres::Dataset#insert" do
   end
 end
 
-context "Postgres::Dataset#insert" do
+describe "Postgres::Dataset#insert" do
   before do
     @ds = FIREBIRD_DB[:test6]
     @ds.delete

data/spec/adapters/informix_spec.rb

@@ -15,7 +15,7 @@ INFORMIX_DB.create_table :test do
   index :value
 end
 
-context "A Informix database" do
+describe "A Informix database" do
   specify "should provide disconnect functionality" do
     INFORMIX_DB.execute("select user from dual")
     INFORMIX_DB.pool.size.should == 1
@@ -24,7 +24,7 @@ context "A Informix database" do
   end
 end
 
-context "A Informix dataset" do
+describe "A Informix dataset" do
   before do
     @d = INFORMIX_DB[:test]
     @d.delete # remove all records

data/spec/adapters/mssql_spec.rb

@@ -34,7 +34,7 @@ MSSQL_DB.create_table! :test4 do
   varbinary :value
 end
 
-context "A MSSQL database" do
+describe "A MSSQL database" do
   before do
     @db = MSSQL_DB
   end
@@ -59,7 +59,7 @@ context "A MSSQL database" do
   end
 end
 
-context "MSSQL Dataset#join_table" do
+describe "MSSQL Dataset#join_table" do
   specify "should emulate the USING clause with ON" do
     MSSQL_DB[:items].join(:categories, [:id]).sql.should ==
       'SELECT * FROM ITEMS INNER JOIN CATEGORIES ON (CATEGORIES.ID = ITEMS.ID)'
@@ -71,7 +71,7 @@ context "MSSQL Dataset#join_table" do
   end
 end
 
-context "MSSQL Dataset#output" do
+describe "MSSQL Dataset#output" do
   before do
     @db = MSSQL_DB
     @db.create_table!(:items){String :name; Integer :value}
@@ -150,13 +150,13 @@ context "MSSQL Dataset#output" do
   end
 end
 
-context "MSSQL dataset" do
+describe "MSSQL dataset" do
   before do
     @db = MSSQL_DB
     @ds = MSSQL_DB[:t]
   end
 
-  context "using #with and #with_recursive" do
+  describe "using #with and #with_recursive" do
     before do
       @ds1 = @ds.with(:t, @db[:x])
       @ds2 = @ds.with_recursive(:t, @db[:x], @db[:t])
@@ -177,7 +177,12 @@ context "MSSQL dataset" do
       @ds2.insert_sql(@db[:t]).should == 'WITH T AS (SELECT * FROM X UNION ALL SELECT * FROM T) INSERT INTO T SELECT * FROM T'
     end
 
-    context "on #import" do
+    specify "should move WITH clause on joined dataset to top level" do
+      @db[:s].inner_join(@ds1).sql.should == "WITH T AS (SELECT * FROM X) SELECT * FROM S INNER JOIN (SELECT * FROM T) AS T1"
+      @ds1.inner_join(@db[:s].with(:s, @db[:y])).sql.should == "WITH T AS (SELECT * FROM X), S AS (SELECT * FROM Y) SELECT * FROM T INNER JOIN (SELECT * FROM S) AS T1"
+    end
+
+    describe "on #import" do
       before do
         @db = @db.clone
         class << @db
@@ -213,7 +218,7 @@ context "MSSQL dataset" do
   end
 end
 
-context "MSSQL joined datasets" do
+describe "MSSQL joined datasets" do
   before do
     @db = MSSQL_DB
   end
@@ -325,7 +330,7 @@ describe "Common Table Expressions" do
   end
 end
 
-context "MSSSQL::Dataset#insert" do
+describe "MSSSQL::Dataset#insert" do
   before do
     @db = MSSQL_DB
     @db.create_table!(:test5){primary_key :xid; Integer :value}
@@ -352,13 +357,13 @@ context "MSSSQL::Dataset#insert" do
   end
 end
 
-context "MSSSQL::Dataset#disable_insert_output" do
+describe "MSSSQL::Dataset#disable_insert_output" do
   specify "should play nicely with simple_select_all?" do
     MSSQL_DB[:test].disable_insert_output.send(:simple_select_all?).should == true
   end
 end
 
-context "MSSSQL::Dataset#into" do
+describe "MSSSQL::Dataset#into" do
   before do
     @db = MSSQL_DB
   end
@@ -377,7 +382,7 @@ context "MSSSQL::Dataset#into" do
   end
 end
 
-context "A MSSQL database" do
+describe "A MSSQL database" do
   before do
     @db = MSSQL_DB
   end
@@ -403,7 +408,7 @@ context "A MSSQL database" do
   end
 end
 
-context "MSSQL::Database#rename_table" do
+describe "MSSQL::Database#rename_table" do
   specify "should work on non-schema bound tables which need escaping" do
     MSSQL_DB.quote_identifiers = true
     MSSQL_DB.create_table! :'foo bar' do
@@ -426,7 +431,7 @@ context "MSSQL::Database#rename_table" do
   end
 end
 
-context "MSSQL::Dataset#count" do
+describe "MSSQL::Dataset#count" do
   specify "should work with a distinct query with an order clause" do
     MSSQL_DB.create_table!(:items){String :name; Integer :value}
     MSSQL_DB[:items].insert(:name => "name", :value => 1)

data/spec/adapters/mysql_spec.rb

@@ -34,7 +34,7 @@ SQL_BEGIN = 'BEGIN'
 SQL_ROLLBACK = 'ROLLBACK'
 SQL_COMMIT = 'COMMIT'
 
-context "MySQL", '#create_table' do
+describe "MySQL", '#create_table' do
   before do
     @db = MYSQL_DB
     MYSQL_DB.sqls.clear
@@ -84,7 +84,7 @@ context "MySQL", '#create_table' do
   end
 end
 
-context "A MySQL database" do
+describe "A MySQL database" do
   specify "should provide the server version" do
     MYSQL_DB.server_version.should >= 40000
   end
@@ -99,7 +99,7 @@ context "A MySQL database" do
 end
 
 if MYSQL_DB.adapter_scheme == :mysql
-  context "Sequel::MySQL.convert_tinyint_to_bool" do
+  describe "Sequel::MySQL.convert_tinyint_to_bool" do
     before do
       @db = MYSQL_DB
       @db.create_table(:booltest){column :b, 'tinyint(1)'; column :i, 'tinyint(4)'}
@@ -148,7 +148,7 @@ if MYSQL_DB.adapter_scheme == :mysql
   end
 end
 
-context "A MySQL dataset" do
+describe "A MySQL dataset" do
   before do
     MYSQL_DB.create_table(:items){String :name; Integer :value}
     @d = MYSQL_DB[:items]
@@ -243,7 +243,7 @@ context "A MySQL dataset" do
   end
 end
 
-context "MySQL datasets" do
+describe "MySQL datasets" do
   before do
     @d = MYSQL_DB[:orders]
   end
@@ -282,7 +282,7 @@ describe "Dataset#distinct" do
   end
 end
 
-context "MySQL join expressions" do
+describe "MySQL join expressions" do
   before do
     @ds = MYSQL_DB[:nodes]
     @ds.db.meta_def(:server_version) {50014}
@@ -333,7 +333,7 @@ context "MySQL join expressions" do
   end
 end
 
-context "Joined MySQL dataset" do
+describe "Joined MySQL dataset" do
   before do
     @ds = MYSQL_DB[:nodes]
   end
@@ -357,7 +357,7 @@ context "Joined MySQL dataset" do
   end
 end
 
-context "A MySQL database" do
+describe "A MySQL database" do
   before do
     @db = MYSQL_DB
   end
@@ -424,7 +424,7 @@ context "A MySQL database" do
   end
 end  
 
-context "A MySQL database with table options" do
+describe "A MySQL database with table options" do
   before do
     @options = {:engine=>'MyISAM', :charset=>'latin1', :collate => 'latin1_swedish_ci'}
     
@@ -461,7 +461,7 @@ context "A MySQL database with table options" do
   end
 end
 
-context "A MySQL database" do
+describe "A MySQL database" do
   before do
     @db = MYSQL_DB
     @db.drop_table(:items) rescue nil
@@ -547,7 +547,7 @@ end
 
 # Socket tests should only be run if the MySQL server is on localhost
 if %w'localhost 127.0.0.1 ::1'.include?(MYSQL_URI.host) and MYSQL_DB.adapter_scheme == :mysql
-  context "A MySQL database" do
+  describe "A MySQL database" do
     specify "should accept a socket option" do
       db = Sequel.mysql(MYSQL_DB.opts[:database], :host => 'localhost', :user => MYSQL_DB.opts[:user], :password => MYSQL_DB.opts[:password], :socket => MYSQL_SOCKET_FILE)
       proc {db.test_connection}.should_not raise_error
@@ -565,7 +565,7 @@ if %w'localhost 127.0.0.1 ::1'.include?(MYSQL_URI.host) and MYSQL_DB.adapter_sch
   end
 end
 
-context "A MySQL database" do
+describe "A MySQL database" do
   specify "should accept a read_timeout option when connecting" do
     db = Sequel.connect(MYSQL_DB.opts.merge(:read_timeout=>22342))
     proc {db.test_connection}.should_not raise_error
@@ -577,7 +577,7 @@ context "A MySQL database" do
   end
 end
 
-context "A grouped MySQL dataset" do
+describe "A grouped MySQL dataset" do
   before do
     MYSQL_DB[:test2].delete
     MYSQL_DB[:test2] << {:name => '11', :value => 10}
@@ -599,7 +599,7 @@ context "A grouped MySQL dataset" do
   end
 end
 
-context "A MySQL database" do
+describe "A MySQL database" do
   before do
     @db = MYSQL_DB
     @db.drop_table(:posts) rescue nil
@@ -668,7 +668,7 @@ context "A MySQL database" do
   end
 end
 
-context "MySQL::Dataset#insert and related methods" do
+describe "MySQL::Dataset#insert and related methods" do
   before do
     MYSQL_DB.create_table(:items){String :name; Integer :value}
     @d = MYSQL_DB[:items]
@@ -853,7 +853,7 @@ context "MySQL::Dataset#insert and related methods" do
   
 end
 
-context "MySQL::Dataset#replace" do
+describe "MySQL::Dataset#replace" do
   before do
     MYSQL_DB.create_table(:items){Integer :id, :unique=>true; Integer :value}
     @d = MYSQL_DB[:items]
@@ -895,7 +895,7 @@ context "MySQL::Dataset#replace" do
   end
 end
 
-context "MySQL::Dataset#complex_expression_sql" do
+describe "MySQL::Dataset#complex_expression_sql" do
   before do
     @d = MYSQL_DB.dataset
   end
@@ -923,8 +923,35 @@ context "MySQL::Dataset#complex_expression_sql" do
   end
 end
 
+describe "MySQL::Dataset#calc_found_rows" do
+  before do
+    MYSQL_DB.create_table!(:items){Integer :a}
+  end
+  after do
+    MYSQL_DB.drop_table(:items)
+  end
+
+  specify "should add the SQL_CALC_FOUND_ROWS keyword when selecting" do
+    MYSQL_DB[:items].select(:a).calc_found_rows.limit(1).sql.should == \
+      'SELECT SQL_CALC_FOUND_ROWS a FROM items LIMIT 1'
+  end
+
+  specify "should count matching rows disregarding LIMIT clause" do
+    MYSQL_DB[:items].multi_insert([{:a => 1}, {:a => 1}, {:a => 2}])
+    MYSQL_DB.sqls.clear
+
+    MYSQL_DB[:items].calc_found_rows.filter(:a => 1).limit(1).all.should == [{:a => 1}]
+    MYSQL_DB.dataset.select(:FOUND_ROWS.sql_function.as(:rows)).all.should == [{:rows => 2 }]
+
+    MYSQL_DB.sqls.should == [
+      'SELECT SQL_CALC_FOUND_ROWS * FROM items WHERE (a = 1) LIMIT 1',
+      'SELECT FOUND_ROWS() AS rows',
+    ]
+  end
+end
+
 if MYSQL_DB.adapter_scheme == :mysql or MYSQL_DB.adapter_scheme == :jdbc
-  context "MySQL Stored Procedures" do
+  describe "MySQL Stored Procedures" do
     before do
       MYSQL_DB.create_table(:items){Integer :id; Integer :value}
       @d = MYSQL_DB[:items]
@@ -969,7 +996,7 @@ if MYSQL_DB.adapter_scheme == :mysql or MYSQL_DB.adapter_scheme == :jdbc
 end
 
 if MYSQL_DB.adapter_scheme == :mysql
-  context "MySQL bad date/time conversions" do
+  describe "MySQL bad date/time conversions" do
     after do
       Sequel::MySQL.convert_invalid_date_time = false
     end
@@ -1000,7 +1027,7 @@ if MYSQL_DB.adapter_scheme == :mysql
     end
   end
   
-  context "MySQL multiple result sets" do
+  describe "MySQL multiple result sets" do
     before do
       MYSQL_DB.create_table!(:a){Integer :a}
       MYSQL_DB.create_table!(:b){Integer :b}

data/spec/adapters/oracle_spec.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require "timeout"
 
 unless defined?(ORACLE_DB)
   ORACLE_DB = Sequel.connect('oracle://hr:hr@localhost/XE')
@@ -32,7 +33,7 @@ ORACLE_DB.create_table :categories do
   varchar2 :cat_name, :size => 50
 end
 
-context "An Oracle database" do
+describe "An Oracle database" do
   specify "should provide disconnect functionality" do
     ORACLE_DB.execute("select user from dual")
     ORACLE_DB.pool.size.should == 1
@@ -74,7 +75,7 @@ context "An Oracle database" do
   end
 end
 
-context "An Oracle dataset" do
+describe "An Oracle dataset" do
   before do
     @d = ORACLE_DB[:items]
     @d.delete # remove all records
@@ -222,7 +223,7 @@ context "An Oracle dataset" do
   end
 end
 
-context "Joined Oracle dataset" do
+describe "Joined Oracle dataset" do
   before do
     @d1 = ORACLE_DB[:books]
     @d1.delete # remove all records
@@ -263,7 +264,7 @@ context "Joined Oracle dataset" do
   end  
 end
 
-context "Oracle aliasing" do
+describe "Oracle aliasing" do
   before do
     @d1 = ORACLE_DB[:books]
     @d1.delete # remove all records
@@ -284,3 +285,38 @@ context "Oracle aliasing" do
     @d1.select(:title).group_by(:title).count.should == 2
   end
 end
+
+describe "Row locks in Oracle" do
+  before do
+    @d1 = ORACLE_DB[:books]
+    @d1.delete # remove all records
+    @d1 << {:id => 1, :title => 'aaa'}
+  end
+
+  specify "#for_update should use FOR UPDATE" do
+    @d1.for_update.sql.should == "SELECT * FROM BOOKS FOR UPDATE"
+  end
+
+  specify "#lock_style should accept symbols" do
+    @d1.lock_style(:update).sql.should == "SELECT * FROM BOOKS FOR UPDATE"
+  end
+
+  specify "should not update during row lock" do
+    ORACLE_DB.transaction do
+      @d1.filter(:id => 1).for_update.to_a
+      proc do
+        t1 = Thread.start do
+          # wait for unlock
+          Timeout::timeout(0.02) do
+            ORACLE_DB[:books].filter(:id => 1).update(:title => "bbb")
+          end
+        end
+        t1.join
+      end.should raise_error
+      @d1.filter(:id => 1).first[:title].should == "aaa"
+    end
+    t2 = Thread.start { ORACLE_DB[:books].filter(:id => 1).update(:title => "bbb") }
+    t2.join
+    @d1.filter(:id => 1).first[:title].should == "bbb"
+  end
+end