sequel 3.20.0 → 3.21.0

data/spec/core/expression_filters_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 Regexp.send(:include, Sequel::SQL::StringMethods)
 String.send(:include, Sequel::SQL::StringMethods)
 
-context "Blockless Ruby Filters" do
+describe "Blockless Ruby Filters" do
   before do
     db = Sequel::Database.new
     db.quote_identifiers = false
@@ -481,7 +481,7 @@ context "Blockless Ruby Filters" do
   end
 end
 
-context Sequel::SQL::VirtualRow do
+describe Sequel::SQL::VirtualRow do
   before do
     db = Sequel::Database.new
     db.quote_identifiers = true

data/spec/core/schema_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
-context "DB#create_table" do
+describe "DB#create_table" do
   before do
     @db = SchemaDummyDatabase.new
   end
@@ -543,7 +543,7 @@ context "DB#create_table" do
   end
 end
 
-context "DB#create_table!" do
+describe "DB#create_table!" do
   before do
     @db = SchemaDummyDatabase.new
   end
@@ -554,7 +554,7 @@ context "DB#create_table!" do
   end
 end
 
-context "DB#create_table?" do
+describe "DB#create_table?" do
   before do
     @db = SchemaDummyDatabase.new
   end
@@ -572,7 +572,7 @@ context "DB#create_table?" do
   end
 end
 
-context "DB#drop_table" do
+describe "DB#drop_table" do
   before do
     @db = SchemaDummyDatabase.new
   end
@@ -583,7 +583,7 @@ context "DB#drop_table" do
   end
 end
 
-context "DB#alter_table" do
+describe "DB#alter_table" do
   before do
     @db = SchemaDummyDatabase.new
   end
@@ -763,7 +763,7 @@ context "DB#alter_table" do
   end
 end
 
-context "Schema Parser" do
+describe "Schema Parser" do
   before do
     @sqls = []
     @db = Sequel::Database.new

data/spec/core/version_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
-context "Sequel.version" do
+describe "Sequel.version" do
   specify "should be in the form X.Y.Z with all being numbers" do
     Sequel.version.should =~ /\A\d+\.\d+\.\d+\z/
   end

data/spec/extensions/association_autoreloading_spec.rb

@@ -0,0 +1,94 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "AssociationAutoreloading plugin" do
+  before do
+    @c = Class.new(Sequel::Model)
+    @c.plugin :association_autoreloading
+    @Artist = Class.new(@c).set_dataset(:artists)
+    ds1 = @Artist.dataset
+    def ds1.fetch_rows(s)
+      (MODEL_DB.sqls ||= []) << s
+      yield({:id=>2, :name=>'Ar'})
+    end
+    @Album = Class.new(@c).set_dataset(:albums)
+    @Artist.columns :id, :name
+    @Album.columns :id, :name, :artist_id
+    @Album.db_schema[:artist_id][:type] = :integer
+    @Album.many_to_one :artist, :class=>@Artist
+    MODEL_DB.reset
+  end
+
+  specify "should reload many_to_one association when foreign key is modified" do
+    album = @Album.load(:id => 1, :name=>'Al', :artist_id=>2)
+    album.artist
+    MODEL_DB.sqls.should == ['SELECT * FROM artists WHERE (artists.id = 2) LIMIT 1']
+    MODEL_DB.reset
+
+    album.artist_id = 1
+    album.artist
+    MODEL_DB.sqls.should == ['SELECT * FROM artists WHERE (artists.id = 1) LIMIT 1']
+  end
+
+  specify "should not reload when value has not changed" do
+    album = @Album.load(:id => 1, :name=>'Al', :artist_id=>2)
+    album.artist
+    MODEL_DB.sqls.should == ['SELECT * FROM artists WHERE (artists.id = 2) LIMIT 1']
+    MODEL_DB.reset
+
+    album.artist_id = 2
+    album.artist
+    MODEL_DB.sqls.should == []
+
+    album.artist_id = "2"
+    album.artist
+    MODEL_DB.sqls.should == []
+  end
+
+  specify "should reload all associations which use the foreign key" do
+    @Album.many_to_one :other_artist, :key => :artist_id, :foreign_key => :id, :class => @Artist
+    album = @Album.load(:id => 1, :name=>'Al', :artist_id=>2)
+    album.artist
+    album.other_artist
+    MODEL_DB.reset
+
+    album.artist_id = 1
+    album.artist
+    MODEL_DB.sqls.should == ['SELECT * FROM artists WHERE (artists.id = 1) LIMIT 1']
+    MODEL_DB.reset
+
+    album.other_artist
+    MODEL_DB.sqls.should == ['SELECT * FROM artists WHERE (artists.id = 1) LIMIT 1']
+  end
+
+  specify "should work with composite keys" do
+    @Album.many_to_one :composite_artist, :key => [:artist_id, :name], :primary_key => [:id, :name], :class => @Artist
+    album = @Album.load(:id => 1, :name=>'Al', :artist_id=>2)
+    album.composite_artist
+    MODEL_DB.reset
+
+    album.artist_id = 1
+    album.composite_artist
+    MODEL_DB.sqls.should == ["SELECT * FROM artists WHERE ((artists.id = 1) AND (artists.name = 'Al')) LIMIT 1"]
+    MODEL_DB.reset
+
+    album.name = 'Al2'
+    album.composite_artist
+    MODEL_DB.sqls.should == ["SELECT * FROM artists WHERE ((artists.id = 1) AND (artists.name = 'Al2')) LIMIT 1"]
+  end
+
+  specify "should work with subclasses" do
+    salbum = Class.new(@Album)
+    oartist = Class.new(@c).set_dataset(:oartist)
+    oartist.columns :id, :name
+    salbum.many_to_one :artist2, :class=>oartist, :key=>:artist_id
+    album = salbum.load(:id => 1, :name=>'Al', :artist_id=>2)
+    album.artist
+    MODEL_DB.sqls.should == ['SELECT * FROM artists WHERE (artists.id = 2) LIMIT 1']
+    MODEL_DB.reset
+
+    album.artist_id = 1
+    album.artist
+    MODEL_DB.sqls.should == ['SELECT * FROM artists WHERE (artists.id = 1) LIMIT 1']
+  end
+
+end

data/spec/extensions/blank_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
-context "Object#blank?" do
+describe "Object#blank?" do
   specify "it should be true if the object responds true to empty?" do
     [].blank?.should == true
     {}.blank?.should == true
@@ -16,7 +16,7 @@ context "Object#blank?" do
   end
 end
 
-context "Numeric#blank?" do
+describe "Numeric#blank?" do
   specify "it should always be false" do
     1.blank?.should == false
     0.blank?.should == false
@@ -31,25 +31,25 @@ context "Numeric#blank?" do
   end
 end
 
-context "NilClass#blank?" do
+describe "NilClass#blank?" do
   specify "it should always be true" do
     nil.blank?.should == true
   end
 end
 
-context "TrueClass#blank?" do
+describe "TrueClass#blank?" do
   specify "it should always be false" do
     true.blank?.should == false
   end
 end
 
-context "FalseClass#blank?" do
+describe "FalseClass#blank?" do
   specify "it should always be true" do
     false.blank?.should == true
   end
 end
 
-context "String#blank?" do
+describe "String#blank?" do
   specify "it should be true if the string is empty" do
     ''.blank?.should == true
   end

data/spec/extensions/looser_typecasting_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-context "LooserTypecasting Extension" do
+describe "LooserTypecasting Extension" do
   before do
     @db = Sequel::Database.new({})
     def @db.schema(*args)

data/spec/extensions/migration_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
-context "Migration.descendants" do
+describe "Migration.descendants" do
   before do
     Sequel::Migration.descendants.clear
   end
@@ -28,7 +28,7 @@ context "Migration.descendants" do
   end
 end
 
-context "Migration.apply" do
+describe "Migration.apply" do
   before do
     @c = Class.new do
       define_method(:one) {|x| [1111, x]}
@@ -57,7 +57,7 @@ context "Migration.apply" do
   end
 end
 
-context "SimpleMigration#apply" do
+describe "SimpleMigration#apply" do
   before do
     @c = Class.new do
       define_method(:one) {|x| [1111, x]}
@@ -86,7 +86,7 @@ context "SimpleMigration#apply" do
   end
 end
 
-context "Reversible Migrations with Sequel.migration{change{}}" do
+describe "Reversible Migrations with Sequel.migration{change{}}" do
   before do
     @c = Class.new do
       self::AT = Class.new do
@@ -193,7 +193,7 @@ context "Reversible Migrations with Sequel.migration{change{}}" do
   end
 end
 
-context "Sequel::IntegerMigrator" do
+describe "Sequel::IntegerMigrator" do
   before do
     dbc = Class.new(MockDatabase) do
       attr_reader :drops, :tables_created, :columns_created, :versions
@@ -313,7 +313,7 @@ context "Sequel::IntegerMigrator" do
   end
 end
 
-context "Sequel::TimestampMigrator" do
+describe "Sequel::TimestampMigrator" do
   before do
     $sequel_migration_version = 0
     $sequel_migration_files = []

data/spec/extensions/pagination_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-context "A paginated dataset" do
+describe "A paginated dataset" do
   before do
     @d = Sequel::Dataset.new(nil)
     @d.meta_def(:count) {153}
@@ -76,7 +76,7 @@ context "A paginated dataset" do
   end
 end
 
-context "Dataset#each_page" do
+describe "Dataset#each_page" do
   before do
     @d = Sequel::Dataset.new(nil).from(:items)
     @d.meta_def(:count) {153}

data/spec/extensions/pretty_table_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 require 'stringio'
 
-context "Dataset#print" do
+describe "Dataset#print" do
   before do
     @output = StringIO.new
     @orig_stdout = $stdout
@@ -35,7 +35,7 @@ context "Dataset#print" do
   end
 end
 
-context "PrettyTable" do
+describe "PrettyTable" do
   before do
     @data1 = [
       {:x => 3, :y => 4}

data/spec/extensions/query_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-context "Database#dataset" do
+describe "Database#dataset" do
   before do
     @db = Sequel::Database.new
   end
@@ -12,7 +12,7 @@ context "Database#dataset" do
   end
 end
 
-context "Dataset#query" do
+describe "Dataset#query" do
   before do
     @d = Sequel::Dataset.new(nil)
   end

data/spec/extensions/schema_dumper_spec.rb

@@ -291,7 +291,7 @@ END_MIG
       ["double precision", "timestamp with time zone", "timestamp without time zone",
        "time with time zone", "time without time zone", "character varying(20)"] +
       %w"nvarchar ntext smalldatetime smallmoney binary varbinary nchar" +
-      ["timestamp(6) without time zone", "timestamp(6) with time zone", "int(12) unsigned"]
+      ["timestamp(6) without time zone", "timestamp(6) with time zone", "int(12) unsigned", 'bigint unsigned']
     @d.meta_def(:schema) do |t, *o|
       i = 0
       types.map{|x| [:"c#{i+=1}", {:db_type=>x, :allow_null=>true}]}
@@ -362,6 +362,7 @@ create_table(:x) do
   DateTime :c62, :size=>6
   DateTime :c63, :size=>6
   Integer :c64
+  Bignum :c65
 end
 END_MIG
     @d.dump_table_schema(:x).should == table.chomp

data/spec/extensions/single_table_inheritance_spec.rb

@@ -114,7 +114,7 @@ describe Sequel::Model, "#sti_key" do
     StiTestSub1B.dataset.sql.should == "SELECT * FROM sti_tests WHERE (sti_tests.kind IN ('StiTestSub1B'))"
   end
 
-  context "with custom options" do
+  describe "with custom options" do
     before do
       class ::StiTest2 < Sequel::Model
         columns :id, :kind

data/spec/extensions/sql_expr_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
-context "Sequel sql_expr extension" do
+describe "Sequel sql_expr extension" do
   specify "Object#sql_expr should wrap the object in a GenericComplexExpression" do
     o = Object.new
     s = o.sql_expr

data/spec/extensions/string_date_time_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
-context "String#to_time" do
+describe "String#to_time" do
   specify "should convert the string into a Time object" do
     "2007-07-11".to_time.should == Time.parse("2007-07-11")
     "06:30".to_time.should == Time.parse("06:30")
@@ -11,7 +11,7 @@ context "String#to_time" do
   end
 end
 
-context "String#to_date" do
+describe "String#to_date" do
   after do
     Sequel.convert_two_digit_years = true
   end
@@ -34,7 +34,7 @@ context "String#to_date" do
   end
 end
 
-context "String#to_datetime" do
+describe "String#to_datetime" do
   after do
     Sequel.convert_two_digit_years = true
   end
@@ -57,7 +57,7 @@ context "String#to_datetime" do
   end
 end
 
-context "String#to_sequel_time" do
+describe "String#to_sequel_time" do
   after do
     Sequel.datetime_class = Time
     Sequel.convert_two_digit_years = true

data/spec/extensions/validation_class_methods_spec.rb

@@ -583,7 +583,7 @@ describe Sequel::Model do
   end
 end
 
-context "Superclass validations" do
+describe "Superclass validations" do
   before do
     @c1 = Class.new(Sequel::Model)
     @c1.class_eval do
@@ -635,7 +635,7 @@ context "Superclass validations" do
   end
 end
 
-context ".validates with block" do
+describe ".validates with block" do
   specify "should support calling .each" do
     @c = Class.new(Sequel::Model)
     @c.class_eval do

data/spec/integration/dataset_test.rb

@@ -191,7 +191,7 @@ describe Sequel::Database do
   end
 end
 
-context Sequel::Dataset do
+describe Sequel::Dataset do
   before do
     INTEGRATION_DB.create_table! :items do
       primary_key :id 
@@ -386,6 +386,11 @@ if INTEGRATION_DB.dataset.supports_cte?
       ps.call(:n=>3).should == [{:id=>5, :parent_id=>3}, {:id=>6, :parent_id=>5}]
       ps.call(:n=>5).should == [{:id=>6, :parent_id=>5}]
     end
+
+    specify "should support joining a dataset with a CTE" do
+      @ds.inner_join(@db[:t].with(:t, @ds.filter(:parent_id=>nil)), :id => :id).select(:i1__id).order(:i1__id).map(:id).should == [1,2]
+      @db[:t].with(:t, @ds).inner_join(@db[:s].with(:s, @ds.filter(:parent_id=>nil)), :id => :id).select(:t__id).order(:t__id).map(:id).should == [1,2]
+    end
   end
 end
 
@@ -480,13 +485,13 @@ describe Sequel::SQL::Constants do
   cspecify "should have working CURRENT_TIME", [:do, :mysql], [:jdbc, :sqlite], [:mysql2] do
     @db.create_table!(:constants){Time :t, :only_time=>true}
     @ds.insert(:t=>Sequel::CURRENT_TIME)
-    (Time.now - @c[@ds.get(:t)]).should be_close(0, 1)
+    (Time.now - @c[@ds.get(:t)]).should be_within(1).of(0)
   end
 
   cspecify "should have working CURRENT_TIMESTAMP", [:jdbc, :sqlite] do
     @db.create_table!(:constants){DateTime :ts}
     @ds.insert(:ts=>Sequel::CURRENT_TIMESTAMP)
-    (Time.now - @c[@ds.get(:ts)]).should be_close(0, 1)
+    (Time.now - @c[@ds.get(:ts)]).should be_within(1).of(0)
   end
 end