sequel 3.20.0 → 3.21.0

data/spec/adapters/postgres_spec.rb

@@ -33,7 +33,7 @@ POSTGRES_DB.create_table! :test4 do
   bytea :value
 end
 
-context "A PostgreSQL database" do
+describe "A PostgreSQL database" do
   before do
     @db = POSTGRES_DB
   end
@@ -54,7 +54,7 @@ context "A PostgreSQL database" do
   end
 end
 
-context "A PostgreSQL dataset" do
+describe "A PostgreSQL dataset" do
   before do
     @d = POSTGRES_DB[:test]
     @d.delete # remove all records
@@ -234,7 +234,7 @@ if POSTGRES_DB.pool.respond_to?(:max_size) and POSTGRES_DB.pool.max_size > 1
   end
 end
 
-context "A PostgreSQL dataset with a timestamp field" do
+describe "A PostgreSQL dataset with a timestamp field" do
   before do
     @d = POSTGRES_DB[:test3]
     @d.delete
@@ -259,7 +259,7 @@ context "A PostgreSQL dataset with a timestamp field" do
   end
 end
 
-context "PostgreSQL's EXPLAIN and ANALYZE" do
+describe "PostgreSQL's EXPLAIN and ANALYZE" do
   specify "should not raise errors" do
     @d = POSTGRES_DB[:test3]
     proc{@d.explain}.should_not raise_error
@@ -267,7 +267,7 @@ context "PostgreSQL's EXPLAIN and ANALYZE" do
   end
 end
 
-context "A PostgreSQL database" do
+describe "A PostgreSQL database" do
   before do
     @db = POSTGRES_DB
   end
@@ -310,7 +310,7 @@ context "A PostgreSQL database" do
   end
 end  
 
-context "A PostgreSQL database" do
+describe "A PostgreSQL database" do
   before do
     @db = POSTGRES_DB
     @db.drop_table(:posts) rescue nil
@@ -424,7 +424,7 @@ context "A PostgreSQL database" do
   end
 end
 
-context "Postgres::Dataset#import" do
+describe "Postgres::Dataset#import" do
   before do
     @db = POSTGRES_DB
     @db.create_table!(:test){Integer :x; Integer :y}
@@ -463,7 +463,7 @@ context "Postgres::Dataset#import" do
   end
 end
 
-context "Postgres::Dataset#insert" do
+describe "Postgres::Dataset#insert" do
   before do
     @db = POSTGRES_DB
     @db.create_table!(:test5){primary_key :xid; Integer :value}
@@ -551,7 +551,7 @@ context "Postgres::Dataset#insert" do
   end
 end
 
-context "Postgres::Database schema qualified tables" do
+describe "Postgres::Database schema qualified tables" do
   before do
     POSTGRES_DB << "CREATE SCHEMA schema_test"
     POSTGRES_DB.instance_variable_set(:@primary_keys, {})
@@ -656,7 +656,7 @@ context "Postgres::Database schema qualified tables" do
   end
 end
 
-context "Postgres::Database schema qualified tables and eager graphing" do
+describe "Postgres::Database schema qualified tables and eager graphing" do
   before(:all) do
     @db = POSTGRES_DB
     @db.run "DROP SCHEMA s CASCADE" rescue nil
@@ -844,7 +844,7 @@ if POSTGRES_DB.server_version >= 80300
     full_text_index [:title, :body]
   end
 
-  context "PostgreSQL tsearch2" do
+  describe "PostgreSQL tsearch2" do
     before do
       @ds = POSTGRES_DB[:test6]
     end
@@ -873,7 +873,7 @@ if POSTGRES_DB.server_version >= 80300
 end
 
 if POSTGRES_DB.dataset.supports_window_functions?
-  context "Postgres::Dataset named windows" do
+  describe "Postgres::Dataset named windows" do
     before do
       @db = POSTGRES_DB
       @db.create_table!(:i1){Integer :id; Integer :group_id; Integer :amount}
@@ -902,7 +902,7 @@ if POSTGRES_DB.dataset.supports_window_functions?
   end
 end
 
-context "Postgres::Database functions, languages, and triggers" do
+describe "Postgres::Database functions, languages, and triggers" do
   before do
     @d = POSTGRES_DB
   end
@@ -973,7 +973,7 @@ context "Postgres::Database functions, languages, and triggers" do
 end
 
 if POSTGRES_DB.adapter_scheme == :postgres
-context "Postgres::Dataset #use_cursor" do
+describe "Postgres::Dataset #use_cursor" do
   before(:all) do
     @db = POSTGRES_DB
     @db.create_table!(:test_cursor){Integer :x}

data/spec/adapters/spec_helper.rb

@@ -16,7 +16,7 @@ class Sequel::Database
   end
 end
 
-class Spec::Example::ExampleGroup
+(defined?(RSpec) ? RSpec::Core::ExampleGroup : Spec::Example::ExampleGroup).class_eval do
   def log 
     begin
       INTEGRATION_DB.loggers << Logger.new(STDOUT)

data/spec/adapters/sqlite_spec.rb

@@ -6,7 +6,7 @@ unless defined?(SQLITE_DB)
 end
 INTEGRATION_DB = SQLITE_DB unless defined?(INTEGRATION_DB)
 
-context "An SQLite database" do
+describe "An SQLite database" do
   before do
     @db = SQLITE_DB
     @fk = @db.foreign_keys
@@ -128,7 +128,7 @@ context "An SQLite database" do
   end
 end
 
-context "An SQLite dataset" do
+describe "An SQLite dataset" do
   before do
     @d = SQLITE_DB[:items]
   end
@@ -148,7 +148,7 @@ context "An SQLite dataset" do
   end
 end
 
-context "An SQLite numeric column" do
+describe "An SQLite numeric column" do
   specify "should handle and return BigDecimal values" do
     SQLITE_DB.create_table!(:d){numeric :d}
     d = SQLITE_DB[:d]
@@ -162,7 +162,7 @@ context "An SQLite numeric column" do
   end
 end
 
-context "An SQLite dataset AS clause" do
+describe "An SQLite dataset AS clause" do
   specify "should use a string literal for :col___alias" do
     SQLITE_DB.literal(:c___a).should == "c AS 'a'"
   end
@@ -188,7 +188,7 @@ context "An SQLite dataset AS clause" do
   end
 end
 
-context "SQLite::Dataset#delete" do
+describe "SQLite::Dataset#delete" do
   before do
     SQLITE_DB.create_table! :items do
       primary_key :id
@@ -220,7 +220,7 @@ context "SQLite::Dataset#delete" do
   end
 end
 
-context "SQLite::Dataset#update" do
+describe "SQLite::Dataset#update" do
   before do
     SQLITE_DB.create_table! :items do
       primary_key :id
@@ -243,7 +243,7 @@ context "SQLite::Dataset#update" do
   end
 end
 
-context "SQLite dataset" do
+describe "SQLite dataset" do
   before do
     SQLITE_DB.create_table! :test do
       primary_key :id
@@ -282,7 +282,7 @@ context "SQLite dataset" do
   end
 end
 
-context "A SQLite database" do
+describe "A SQLite database" do
   before do
     @db = SQLITE_DB
     @db.create_table! :test2 do

data/spec/core/connection_pool_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 CONNECTION_POOL_DEFAULTS = {:pool_timeout=>5, :pool_sleep_time=>0.001, :max_connections=>4}
 
-context "An empty ConnectionPool" do
+describe "An empty ConnectionPool" do
   before do
     @cpool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS){}
   end
@@ -19,7 +19,7 @@ context "An empty ConnectionPool" do
   end
 end
 
-context "ConnectionPool options" do
+describe "ConnectionPool options" do
   specify "should support string option values" do
     cpool = Sequel::ConnectionPool.get_pool({:max_connections=>'5', :pool_timeout=>'3', :pool_sleep_time=>'0.01'}){}
     cpool.max_size.should == 5
@@ -35,7 +35,7 @@ context "ConnectionPool options" do
   end
 end
 
-context "A connection pool handling connections" do
+describe "A connection pool handling connections" do
   before do
     @max_size = 2
     @cpool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS.merge(:disconnection_proc=>proc{|c| @max_size=3},  :max_connections=>@max_size)) {:got_connection}
@@ -107,7 +107,7 @@ context "A connection pool handling connections" do
   end
 end
 
-context "A connection pool handling connection errors" do 
+describe "A connection pool handling connection errors" do 
   specify "#hold should raise a Sequel::DatabaseConnectionError if an exception is raised by the connection_proc" do
     cpool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS){raise Interrupt}
     proc{cpool.hold{:block_return}}.should raise_error(Sequel::DatabaseConnectionError)
@@ -132,7 +132,7 @@ class DummyConnection
   end
 end
 
-context "ConnectionPool#hold" do
+describe "ConnectionPool#hold" do
   before do
     @pool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS) {DummyConnection.new}
   end
@@ -158,7 +158,7 @@ context "ConnectionPool#hold" do
   end
 end
 
-context "A connection pool with a max size of 1" do
+describe "A connection pool with a max size of 1" do
   before do
     @invoked_count = 0
     @pool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>1)) {@invoked_count += 1; 'herro'}
@@ -166,14 +166,15 @@ context "A connection pool with a max size of 1" do
   
   specify "should let only one thread access the connection at any time" do
     cc,c1, c2 = nil
+    m = (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx') ? 30 : 1
     
     t1 = Thread.new {@pool.hold {|c| cc = c; c1 = c.dup; while c == 'herro';sleep 0.01;end}}
-    sleep 0.03
+    sleep 0.02 * m
     cc.should == 'herro'
     c1.should == 'herro'
     
     t2 = Thread.new {@pool.hold {|c| c2 = c.dup; while c == 'hello';sleep 0.01;end}}
-    sleep 0.02
+    sleep 0.02 * m
     
     # connection held by t1
     t1.should be_alive
@@ -187,7 +188,7 @@ context "A connection pool with a max size of 1" do
     @pool.allocated.should == {t1=>cc}
     
     cc.gsub!('rr', 'll')
-    sleep 0.05
+    sleep 0.05 * m
     
     # connection held by t2
     t1.should_not be_alive
@@ -199,7 +200,7 @@ context "A connection pool with a max size of 1" do
     @pool.allocated.should == {t2=>cc}
     
     cc.gsub!('ll', 'rr')
-    sleep 0.05
+    sleep 0.05 * m
     
     #connection released
     t2.should_not be_alive
@@ -290,7 +291,7 @@ shared_examples_for "A threaded connection pool" do
     cc[7].should be_nil
     
     stop = true
-    sleep 0.05
+    sleep 0.1
     
     threads.each {|t| t.should_not be_alive}
     
@@ -301,7 +302,7 @@ shared_examples_for "A threaded connection pool" do
   end
 end
 
-context "Threaded Unsharded Connection Pool" do
+describe "Threaded Unsharded Connection Pool" do
   before do
     @invoked_count = 0
     @pool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>5)) {@invoked_count += 1}
@@ -310,7 +311,7 @@ context "Threaded Unsharded Connection Pool" do
   it_should_behave_like "A threaded connection pool"
 end
 
-context "Threaded Sharded Connection Pool" do
+describe "Threaded Sharded Connection Pool" do
   before do
     @invoked_count = 0
     @pool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>5, :servers=>{})) {@invoked_count += 1}
@@ -319,7 +320,7 @@ context "Threaded Sharded Connection Pool" do
   it_should_behave_like "A threaded connection pool"
 end
 
-context "ConnectionPool#disconnect" do
+describe "ConnectionPool#disconnect" do
   before do
     @count = 0
     @pool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>5, :servers=>{})) {{:id => @count += 1}}
@@ -385,7 +386,7 @@ context "ConnectionPool#disconnect" do
   end
 end
 
-context "A connection pool with multiple servers" do
+describe "A connection pool with multiple servers" do
   before do
     @invoked_counts = Hash.new(0)
     @pool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS.merge(:servers=>{:read_only=>{}})){|server| "#{server}#{@invoked_counts[server] += 1}"}
@@ -616,7 +617,7 @@ end
 
 ST_CONNECTION_POOL_DEFAULTS = CONNECTION_POOL_DEFAULTS.merge(:single_threaded=>true)
 
-context "SingleConnectionPool" do
+describe "SingleConnectionPool" do
   before do
     @pool = Sequel::ConnectionPool.get_pool(ST_CONNECTION_POOL_DEFAULTS){1234}
   end
@@ -638,7 +639,7 @@ context "SingleConnectionPool" do
   end
 end
 
-context "A single threaded pool with multiple servers" do
+describe "A single threaded pool with multiple servers" do
   before do
     @max_size=2
     @pool = Sequel::ConnectionPool.get_pool(ST_CONNECTION_POOL_DEFAULTS.merge(:disconnection_proc=>proc{|c| @max_size=3}, :servers=>{:read_only=>{}})){|server| server}

data/spec/core/core_sql_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
-context "Array#all_two_pairs?" do
+describe "Array#all_two_pairs?" do
   specify "should return false if empty" do
     [].all_two_pairs?.should == false
   end
@@ -23,7 +23,7 @@ context "Array#all_two_pairs?" do
   end
 end
   
-context "Array#case and Hash#case" do
+describe "Array#case and Hash#case" do
   before do
     @d = Sequel::Dataset.new(nil)
   end
@@ -55,7 +55,7 @@ context "Array#case and Hash#case" do
   end
 end
 
-context "Array#sql_value_list and #sql_array" do
+describe "Array#sql_value_list and #sql_array" do
   before do
     @d = Sequel::Dataset.new(nil)
   end
@@ -73,7 +73,7 @@ context "Array#sql_value_list and #sql_array" do
   end
 end
 
-context "String#lit" do
+describe "String#lit" do
   before do
     @ds = ds = MockDatabase.new.dataset
   end
@@ -111,7 +111,7 @@ context "String#lit" do
   end
 end
 
-context "String#to_sequel_blob" do
+describe "String#to_sequel_blob" do
   specify "should return a Blob object" do
     'xyz'.to_sequel_blob.should be_a_kind_of(::Sequel::SQL::Blob)
     'xyz'.to_sequel_blob.should == 'xyz'
@@ -122,7 +122,7 @@ context "String#to_sequel_blob" do
   end
 end
 
-context "#desc" do
+describe "#desc" do
   before do
     @ds = Sequel::Dataset.new(nil)
   end
@@ -138,7 +138,7 @@ context "#desc" do
   end
 end
 
-context "#asc" do
+describe "#asc" do
   before do
     @ds = Sequel::Dataset.new(nil)
   end
@@ -154,7 +154,7 @@ context "#asc" do
   end
 end
 
-context "#as" do
+describe "#as" do
   before do
     @ds = Sequel::Dataset.new(nil)
   end
@@ -174,7 +174,7 @@ context "#as" do
   end
 end
 
-context "Column references" do
+describe "Column references" do
   before do
     @c = Class.new(Sequel::Dataset) do
       def quoted_identifier(c); "`#{c}`"; end
@@ -211,7 +211,7 @@ context "Column references" do
   end
 end
 
-context "Blob" do
+describe "Blob" do
   specify "#to_sequel_blob should return self" do
     blob = "x".to_sequel_blob
     blob.to_sequel_blob.object_id.should == blob.object_id
@@ -219,7 +219,7 @@ context "Blob" do
 end
 
 if RUBY_VERSION < '1.9.0'
-  context "Symbol#[]" do
+  describe "Symbol#[]" do
     specify "should format an SQL Function" do
       ds = Sequel::Dataset.new(nil)
       ds.literal(:xyz[]).should == 'xyz()'
@@ -229,7 +229,7 @@ if RUBY_VERSION < '1.9.0'
   end
 end
 
-context "Symbol#*" do
+describe "Symbol#*" do
   before do
     @ds = Sequel::Dataset.new(nil)
   end
@@ -249,7 +249,7 @@ context "Symbol#*" do
   end
 end
 
-context "Symbol" do
+describe "Symbol" do
   before do
     @ds = Sequel::Dataset.new(nil)
     @ds.quote_identifiers = true
@@ -287,7 +287,7 @@ context "Symbol" do
   end
 end
 
-context "Dataset#literal" do
+describe "Dataset#literal" do
   before do
     @ds = MockDataset.new(nil)
   end
@@ -323,7 +323,7 @@ context "Dataset#literal" do
   end
 end
 
-context "Symbol" do
+describe "Symbol" do
   before do
     @ds = Sequel::Dataset.new(MockDatabase.new)
   end
@@ -390,7 +390,7 @@ context "Symbol" do
   end
 end
 
-context "Sequel::SQL::Function#==" do
+describe "Sequel::SQL::Function#==" do
   specify "should be true for functions with the same name and arguments, false otherwise" do
     a = :date.sql_function(:t)
     b = :date.sql_function(:t)
@@ -407,7 +407,7 @@ context "Sequel::SQL::Function#==" do
   end
 end
 
-context "Sequel::SQL::OrderedExpression" do
+describe "Sequel::SQL::OrderedExpression" do
   specify "should #desc" do
     @oe = :column.asc
     @oe.descending.should == false
@@ -427,7 +427,7 @@ context "Sequel::SQL::OrderedExpression" do
   end
 end
 
-context "Expression" do
+describe "Expression" do
   specify "should consider objects == only if they have the same attributes" do
     :column.qualify(:table).cast(:type).*(:numeric_column).asc.should == :column.qualify(:table).cast(:type).*(:numeric_column).asc
     :other_column.qualify(:table).cast(:type).*(:numeric_column).asc.should_not == :column.qualify(:table).cast(:type).*(:numeric_column).asc