sequel 4.36.0 → 5.61.0

data/spec/extensions/date_arithmetic_spec.rb

@@ -1,167 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-asd = begin
-  require 'active_support/duration'
-  true
-rescue LoadError => e
-  skip_warn "date_arithmetic extension (partial): can't load active_support/duration (#{e.class}: #{e})"
-  false
-end
-
-Sequel.extension :date_arithmetic
-
-describe "date_arithmetic extension" do
-  dbf = lambda do |db_type|
-    db = Sequel.connect("mock://#{db_type}")
-    db.extension :date_arithmetic
-    db
-  end
-
-  before do
-    @h0 = {:days=>0}
-    @h1 = {:days=>1, :years=>nil, :hours=>0}
-    @h2 = {:years=>1, :months=>1, :days=>1, :hours=>1, :minutes=>1, :seconds=>1}
-  end
-
-  it "should have Sequel.date_add with an interval hash return an appropriate Sequel::SQL::DateAdd expression" do
-    da = Sequel.date_add(:a, :days=>1)
-    da.must_be_kind_of(Sequel::SQL::DateAdd)
-    da.expr.must_equal :a
-    da.interval.must_equal(:days=>1)
-    Sequel.date_add(:a, :years=>1, :months=>2, :days=>3, :hours=>1, :minutes=>1, :seconds=>1).interval.must_equal(:years=>1, :months=>2, :days=>3, :hours=>1, :minutes=>1, :seconds=>1)
-  end
-
-  it "should have Sequel.date_sub with an interval hash return an appropriate Sequel::SQL::DateAdd expression" do
-    da = Sequel.date_sub(:a, :days=>1)
-    da.must_be_kind_of(Sequel::SQL::DateAdd)
-    da.expr.must_equal :a
-    da.interval.must_equal(:days=>-1)
-    Sequel.date_sub(:a, :years=>1, :months=>2, :days=>3, :hours=>1, :minutes=>1, :seconds=>1).interval.must_equal(:years=>-1, :months=>-2, :days=>-3, :hours=>-1, :minutes=>-1, :seconds=>-1)
-  end
-
-  it "should have Sequel.date_* with an interval hash handle nil values" do
-    Sequel.date_sub(:a, :days=>1, :hours=>nil).interval.must_equal(:days=>-1)
-  end
-
-  it "should raise an error if given string values in an interval hash" do
-    lambda{Sequel.date_add(:a, :days=>'1')}.must_raise(Sequel::InvalidValue)
-  end
-
-  if asd
-    it "should have Sequel.date_add with an ActiveSupport::Duration return an appropriate Sequel::SQL::DateAdd expression" do
-      da = Sequel.date_add(:a, ActiveSupport::Duration.new(1, [[:days, 1]]))
-      da.must_be_kind_of(Sequel::SQL::DateAdd)
-      da.expr.must_equal :a
-      da.interval.must_equal(:days=>1)
-      Sequel.date_add(:a, ActiveSupport::Duration.new(1, [[:years, 1], [:months, 1], [:days, 1], [:minutes, 61], [:seconds, 1]])).interval.must_equal(:years=>1, :months=>1, :days=>1, :minutes=>61, :seconds=>1)
-    end
-
-    it "should have Sequel.date_sub with an ActiveSupport::Duration return an appropriate Sequel::SQL::DateAdd expression" do
-      da = Sequel.date_sub(:a, ActiveSupport::Duration.new(1, [[:days, 1]]))
-      da.must_be_kind_of(Sequel::SQL::DateAdd)
-      da.expr.must_equal :a
-      da.interval.must_equal(:days=>-1)
-      Sequel.date_sub(:a, ActiveSupport::Duration.new(1, [[:years, 1], [:months, 1], [:days, 1], [:minutes, 61], [:seconds, 1]])).interval.must_equal(:years=>-1, :months=>-1, :days=>-1, :minutes=>-61, :seconds=>-1)
-    end
-  end
-
-  it "should use existing method" do
-    db = Sequel.mock
-    db.extend_datasets do
-      def date_add_sql_append(sql, da)
-        interval = String.new
-        each_valid_interval_unit(da.interval, Sequel::SQL::DateAdd::DatasetMethods::DEF_DURATION_UNITS) do |value, sql_unit|
-          interval << "#{value} #{sql_unit} "
-        end
-        literal_append(sql, Sequel.function(:da, da.expr, interval))
-      end
-    end
-    db.extension :date_arithmetic
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "da(a, '')"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "da(a, '1 days ')"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "da(a, '1 years 1 months 1 days 1 hours 1 minutes 1 seconds ')"
-  end
-
-  it "should correctly literalize on Postgres" do
-    db = dbf.call(:postgres)
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "CAST(a AS timestamp)"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "(CAST(a AS timestamp) + CAST('1 days ' AS interval))"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "(CAST(a AS timestamp) + CAST('1 years 1 months 1 days 1 hours 1 minutes 1 seconds ' AS interval))"
-  end
-
-  it "should correctly literalize on SQLite" do
-    db = dbf.call(:sqlite)
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "datetime(a)"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "datetime(a, '1 days')"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "datetime(a, '1 years', '1 months', '1 days', '1 hours', '1 minutes', '1 seconds')"
-  end
-
-  it "should correctly literalize on MySQL" do
-    db = dbf.call(:mysql)
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "CAST(a AS DATETIME)"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "DATE_ADD(a, INTERVAL 1 DAY)"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "DATE_ADD(DATE_ADD(DATE_ADD(DATE_ADD(DATE_ADD(DATE_ADD(a, INTERVAL 1 YEAR), INTERVAL 1 MONTH), INTERVAL 1 DAY), INTERVAL 1 HOUR), INTERVAL 1 MINUTE), INTERVAL 1 SECOND)"
-  end
-
-  it "should correctly literalize on HSQLDB" do
-    db = Sequel.mock
-    def db.database_type; :hsqldb end
-    db.extension :date_arithmetic
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "CAST(CAST(a AS timestamp) AS timestamp)"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "DATE_ADD(CAST(a AS timestamp), INTERVAL 1 DAY)"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "DATE_ADD(DATE_ADD(DATE_ADD(DATE_ADD(DATE_ADD(DATE_ADD(CAST(a AS timestamp), INTERVAL 1 YEAR), INTERVAL 1 MONTH), INTERVAL 1 DAY), INTERVAL 1 HOUR), INTERVAL 1 MINUTE), INTERVAL 1 SECOND)"
-  end
-
-  it "should correctly literalize on MSSQL" do
-    db = dbf.call(:mssql)
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "CAST(a AS datetime)"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "DATEADD(day, 1, a)"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "DATEADD(second, 1, DATEADD(minute, 1, DATEADD(hour, 1, DATEADD(day, 1, DATEADD(month, 1, DATEADD(year, 1, a))))))"
-  end
-
-  it "should correctly literalize on H2" do
-    db = Sequel.mock
-    def db.database_type; :h2 end
-    db.extension :date_arithmetic
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "CAST(a AS timestamp)"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "DATEADD('day', 1, a)"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "DATEADD('second', 1, DATEADD('minute', 1, DATEADD('hour', 1, DATEADD('day', 1, DATEADD('month', 1, DATEADD('year', 1, a))))))"
-  end
-
-  it "should correctly literalize on access" do
-    db = dbf.call(:access)
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "CDate(a)"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "DATEADD('d', 1, a)"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "DATEADD('s', 1, DATEADD('n', 1, DATEADD('h', 1, DATEADD('d', 1, DATEADD('m', 1, DATEADD('yyyy', 1, a))))))"
-  end
-
-  it "should correctly literalize on Derby" do
-    db = Sequel.mock
-    def db.database_type; :derby end
-    db.extension :date_arithmetic
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "CAST(a AS timestamp)"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "{fn timestampadd(SQL_TSI_DAY, 1, timestamp(a))}"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "{fn timestampadd(SQL_TSI_SECOND, 1, timestamp({fn timestampadd(SQL_TSI_MINUTE, 1, timestamp({fn timestampadd(SQL_TSI_HOUR, 1, timestamp({fn timestampadd(SQL_TSI_DAY, 1, timestamp({fn timestampadd(SQL_TSI_MONTH, 1, timestamp({fn timestampadd(SQL_TSI_YEAR, 1, timestamp(a))}))}))}))}))}))}"
-    db.literal(Sequel.date_add(Date.civil(2012, 11, 12), @h1)).must_equal "{fn timestampadd(SQL_TSI_DAY, 1, timestamp((CAST('2012-11-12' AS varchar(255)) || ' 00:00:00')))}"
-  end
-
-  it "should correctly literalize on Oracle" do
-    db = dbf.call(:oracle)
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "CAST(a AS timestamp)"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "(a + INTERVAL '1' DAY)"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "(a + INTERVAL '1' YEAR + INTERVAL '1' MONTH + INTERVAL '1' DAY + INTERVAL '1' HOUR + INTERVAL '1' MINUTE + INTERVAL '1' SECOND)"
-  end
-
-  it "should correctly literalize on DB2" do
-    db = dbf.call(:db2)
-    db.literal(Sequel.date_add(:a, @h0)).must_equal "CAST(a AS timestamp)"
-    db.literal(Sequel.date_add(:a, @h1)).must_equal "(CAST(a AS timestamp) + 1 days)"
-    db.literal(Sequel.date_add(:a, @h2)).must_equal "(CAST(a AS timestamp) + 1 years + 1 months + 1 days + 1 hours + 1 minutes + 1 seconds)"
-  end
-
-  it "should raise error if literalizing on an unsupported database" do
-    db = Sequel.mock
-    db.extension :date_arithmetic
-    lambda{db.literal(Sequel.date_add(:a, @h0))}.must_raise(Sequel::Error)
-  end
-end

data/spec/extensions/defaults_setter_spec.rb

@@ -1,102 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Plugins::DefaultsSetter" do
-  before do
-    @db = db = Sequel.mock
-    def db.supports_schema_parsing?() true end
-    def db.schema(*) [] end
-    @c = c = Class.new(Sequel::Model(db[:foo]))
-    @c.instance_variable_set(:@db_schema, {:a=>{}})
-    @c.plugin :defaults_setter
-    @c.columns :a
-    @pr = proc{|x| db.meta_def(:schema){|*| [[:id, {:primary_key=>true}], [:a, {:ruby_default => x, :primary_key=>false}]]}; c.dataset = c.dataset; c}
-  end
-  after do
-    Sequel.datetime_class = Time
-  end
-
-  it "should set default value upon initialization" do
-    @pr.call(2).new.a.must_equal 2
-  end
-
-  it "should not mark the column as modified" do
-    @pr.call(2).new.changed_columns.must_equal []
-  end
-
-  it "should not set a default of nil" do
-    @pr.call(nil).new.class.default_values.must_equal({})
-  end
-
-  it "should set a default of false" do
-    @pr.call(false).new.a.must_equal false
-  end
-
-  it "should handle Sequel::CURRENT_DATE default by using the current Date" do
-    @pr.call(Sequel::CURRENT_DATE).new.a.must_equal Date.today
-  end
-
-  it "should handle Sequel::CURRENT_TIMESTAMP default by using the current Time" do
-    t = @pr.call(Sequel::CURRENT_TIMESTAMP).new.a
-    t.must_be_kind_of(Time)
-    (t - Time.now).must_be :<,  1
-  end
-
-  it "should handle Sequel::CURRENT_TIMESTAMP default by using the current DateTime if Sequel.datetime_class is DateTime" do
-    Sequel.datetime_class = DateTime
-    t = @pr.call(Sequel::CURRENT_TIMESTAMP).new.a
-    t.must_be_kind_of(DateTime)
-    (t - DateTime.now).must_be :<,  1/86400.0
-  end
-
-  it "should work correctly with the current_datetime_timestamp extension" do
-    @db.autoid = 1
-    @db.fetch = {:id=>1}
-    @c.dataset = @c.dataset.extension(:current_datetime_timestamp)
-    c = @pr.call(Sequel::CURRENT_TIMESTAMP)
-    @db.sqls
-    o = c.new
-    o.a = o.a
-    o.save
-    @db.sqls.must_equal ["INSERT INTO foo (a) VALUES (CURRENT_TIMESTAMP)", "SELECT * FROM foo WHERE (id = 1) LIMIT 1"]
-  end
-
-  it "should not override a given value" do
-    @pr.call(2)
-    @c.new('a'=>3).a.must_equal 3
-    @c.new('a'=>nil).a.must_equal nil
-  end
-
-  it "should work correctly when subclassing" do
-    Class.new(@pr.call(2)).new.a.must_equal 2
-  end
-
-  it "should contain the default values in default_values" do
-    @pr.call(2).default_values.must_equal(:a=>2)
-    @pr.call(nil).default_values.must_equal({})
-  end
-
-  it "should allow modifications of default values" do
-    @pr.call(2)
-    @c.default_values[:a] = 3
-    @c.new.a.must_equal 3
-  end
-
-  it "should allow proc default values" do
-    @pr.call(2)
-    @c.default_values[:a] = proc{3}
-    @c.new.a.must_equal 3
-  end
-
-  it "should have procs that set default values set them to nil" do
-    @pr.call(2)
-    @c.default_values[:a] = proc{nil}
-    @c.new.a.must_equal nil
-  end
-
-  it "should work correctly on a model without a dataset" do
-    @pr.call(2)
-    c = Class.new(Sequel::Model(@db[:bar]))
-    c.plugin :defaults_setter
-    c.default_values.must_equal(:a=>2)
-  end
-end

data/spec/extensions/delay_add_association_spec.rb

@@ -1,74 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Plugins::DelayAddAssociation" do
-  before do
-    @db = Sequel.mock(:autoid=>1, :numrows=>1, :fetch=>{:id=>1, :name=>'a', :c_id=>nil})
-    @c = Class.new(Sequel::Model(@db[:cs]))
-    @c.send(:define_method, :save){|*| super(:changed=>true)}
-    @c.plugin :delay_add_association
-    @c.columns :id, :name, :c_id
-    @c.one_to_many :cs, :class=>@c, :key=>:c_id
-    @db.sqls
-  end
-
-  it "should delay adding of the association until after creation" do
-    @o = @c.new(:name=>'a')
-    @o.add_c(@c.load(:id=>2, :name=>'b'))
-    @db.sqls.must_equal []
-    @o.save
-    @db.sqls.must_equal ["INSERT INTO cs (name) VALUES ('a')", "UPDATE cs SET c_id = 1 WHERE (id = 2)", "SELECT * FROM cs WHERE (id = 1) LIMIT 1"]
-  end
-
-  it "should immediately reflect changes in cached association" do
-    @o = @c.new(:name=>'a')
-    o = @c.load(:id=>2, :name=>'b')
-    @o.add_c(o)
-    @o.cs.must_equal [o]
-    @db.sqls.must_equal []
-  end
-
-  it "should not affect adding associations to existing rows" do
-    @o = @c.load(:id=>1, :name=>'a')
-    @o.add_c(@c.load(:id=>2, :name=>'b'))
-    @db.sqls.must_equal ["UPDATE cs SET c_id = 1 WHERE (id = 2)"]
-  end
-
-  it "should raise an error when saving if the associated object is invalid" do
-    @c.send(:define_method, :validate){|*| errors.add(:name, 'is b') if name == 'b'}
-    @o = @c.new(:name=>'a')
-    @o.add_c(@c.load(:id=>2, :name=>'b'))
-    proc{@o.save}.must_raise Sequel::ValidationFailed
-  end
-
-  it "should return nil when saving if the associated object is invalid when raise_on_save_failure is false" do
-    @c.raise_on_save_failure = false
-    @c.send(:define_method, :validate){|*| errors.add(:name, 'is b') if name == 'b'}
-    @o = @c.new(:name=>'a')
-    @o.add_c(@c.load(:id=>2, :name=>'b'))
-    @o.save.must_equal nil
-    @o.errors[:cs].must_equal ["name is b"]
-    @o.cs.first.errors[:name].must_equal ['is b']
-  end
-
-  it "should work when passing in hashes" do
-    @o = @c.new(:name=>'a')
-    @o.add_c(:name=>'b')
-    @db.sqls.must_equal []
-    @o.save
-    sqls = @db.sqls
-    sqls.length.must_equal 4
-    sqls[0].must_equal "INSERT INTO cs (name) VALUES ('a')"
-    ["INSERT INTO cs (name, c_id) VALUES ('b', 1)", "INSERT INTO cs (c_id, name) VALUES (1, 'b')"].must_include sqls[1]
-    sqls[2].must_equal "SELECT * FROM cs WHERE (id = 2) LIMIT 1"
-    sqls[3].must_equal "SELECT * FROM cs WHERE (id = 1) LIMIT 1"
-  end
-
-  it "should work when passing in primary keys" do
-    @db.fetch = [[{:id=>2, :name=>'b', :c_id=>nil}], [{:id=>1, :name=>'a', :c_id=>nil}]]
-    @o = @c.new(:name=>'a')
-    @o.add_c(2)
-    @db.sqls.must_equal ["SELECT * FROM cs WHERE (id = 2) LIMIT 1"]
-    @o.save
-    @db.sqls.must_equal ["INSERT INTO cs (name) VALUES ('a')", "UPDATE cs SET c_id = 1 WHERE (id = 2)", "SELECT * FROM cs WHERE (id = 1) LIMIT 1"]
-  end
-end

data/spec/extensions/dirty_spec.rb

@@ -1,180 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Plugins::Dirty" do
-  before do
-    @db = Sequel.mock(:fetch=>{:initial=>'i'.dup, :initial_changed=>'ic'.dup}, :numrows=>1)
-    @c = Class.new(Sequel::Model(@db[:c]))
-    @c.plugin :dirty
-    @c.columns :initial, :initial_changed, :missing, :missing_changed
-  end
-
-  dirty_plugin_specs = shared_description do
-    it "initial_value should be the current value if value has not changed" do
-      @o.initial_value(:initial).must_equal 'i'
-      @o.initial_value(:missing).must_equal nil
-    end
-
-    it "initial_value should be the intial value if value has changed" do
-      @o.initial_value(:initial_changed).must_equal 'ic'
-      @o.initial_value(:missing_changed).must_equal nil
-    end
-
-    it "initial_value should handle case where initial value is reassigned later" do
-      @o.initial_changed = 'ic'
-      @o.initial_value(:initial_changed).must_equal 'ic'
-      @o.missing_changed = nil
-      @o.initial_value(:missing_changed).must_equal nil
-    end
-
-    it "changed_columns should handle case where initial value is reassigned later" do
-      @o.changed_columns.must_equal [:initial_changed, :missing_changed]
-      @o.initial_changed = 'ic'
-      @o.changed_columns.must_equal [:missing_changed]
-      @o.missing_changed = nil
-      @o.changed_columns.must_equal [:missing_changed]
-    end
-
-    it "column_change should give initial and current values if there has been a change made" do
-      @o.column_change(:initial_changed).must_equal ['ic', 'ic2']
-      @o.column_change(:missing_changed).must_equal [nil, 'mc2']
-    end
-
-    it "column_change should be nil if no change has been made" do
-      @o.column_change(:initial).must_equal nil
-      @o.column_change(:missing).must_equal nil
-    end
-
-    it "column_changed? should return whether the column has changed" do
-      @o.column_changed?(:initial).must_equal false
-      @o.column_changed?(:initial_changed).must_equal true
-      @o.column_changed?(:missing).must_equal false
-      @o.column_changed?(:missing_changed).must_equal true
-    end
-
-    it "column_changed? should handle case where initial value is reassigned later" do
-      @o.initial_changed = 'ic'
-      @o.column_changed?(:initial_changed).must_equal false
-      @o.missing_changed = nil
-      @o.column_changed?(:missing_changed).must_equal false
-    end
-
-    it "changed_columns should handle case where initial value is reassigned later" do
-      @o.changed_columns.must_equal [:initial_changed, :missing_changed]
-      @o.initial_changed = 'ic'
-      @o.changed_columns.must_equal [:missing_changed]
-      @o.missing_changed = nil
-      @o.changed_columns.must_equal [:missing_changed]
-    end
-
-    it "column_changes should give initial and current values" do
-      @o.column_changes.must_equal(:initial_changed=>['ic', 'ic2'], :missing_changed=>[nil, 'mc2'])
-    end
-
-    it "reset_column should reset the column to its initial value" do
-      @o.reset_column(:initial)
-      @o.initial.must_equal 'i'
-      @o.reset_column(:initial_changed)
-      @o.initial_changed.must_equal 'ic'
-      @o.reset_column(:missing)
-      @o.missing.must_equal nil
-      @o.reset_column(:missing_changed)
-      @o.missing_changed.must_equal nil
-    end
-
-    it "reset_column should remove missing values from the values" do
-      @o.reset_column(:missing)
-      @o.values.has_key?(:missing).must_equal false
-      @o.reset_column(:missing_changed)
-      @o.values.has_key?(:missing_changed).must_equal false
-    end
-    
-    it "refresh should clear the cached initial values" do
-      @o.refresh
-      @o.column_changes.must_equal({})
-    end
-    
-    it "will_change_column should be used to signal in-place modification to column" do
-      @o.will_change_column(:initial)
-      @o.initial << 'b'
-      @o.column_change(:initial).must_equal ['i', 'ib']
-      @o.will_change_column(:initial_changed)
-      @o.initial_changed << 'b'
-      @o.column_change(:initial_changed).must_equal ['ic', 'ic2b']
-      @o.will_change_column(:missing)
-      @o.values[:missing] = 'b'
-      @o.column_change(:missing).must_equal [nil, 'b']
-      @o.will_change_column(:missing_changed)
-      @o.missing_changed << 'b'
-      @o.column_change(:missing_changed).must_equal [nil, 'mc2b']
-    end
-
-    it "will_change_column should different types of existing objects" do
-      [nil, true, false, Class.new{undef_method :clone}.new, Class.new{def clone; raise TypeError; end}.new].each do |v|
-        o = @c.new(:initial=>v)
-        o.will_change_column(:initial)
-        o.initial = 'a'
-        o.column_change(:initial).must_equal [v, 'a']
-      end
-    end
-
-    it "should work when freezing objects" do
-      @o.freeze
-      @o.initial_value(:initial).must_equal 'i'
-      proc{@o.initial = 'b'}.must_raise
-    end
-
-    it "should have #dup duplicate structures" do
-      @o.dup.initial_values.must_equal @o.initial_values
-      @o.dup.initial_values.wont_be_same_as(@o.initial_values)
-      @o.dup.instance_variable_get(:@missing_initial_values).must_equal @o.instance_variable_get(:@missing_initial_values)
-      @o.dup.instance_variable_get(:@missing_initial_values).wont_be_same_as(@o.instance_variable_get(:@missing_initial_values))
-      @o.dup.previous_changes.must_equal @o.previous_changes
-      @o.dup.previous_changes.wont_be_same_as(@o.previous_changes) if @o.previous_changes
-    end
-  end
-
-  describe "with new instance" do
-    before do
-      @o = @c.new(:initial=>'i'.dup, :initial_changed=>'ic'.dup)
-      @o.initial_changed = 'ic2'.dup
-      @o.missing_changed = 'mc2'.dup
-    end
-
-    include dirty_plugin_specs
-
-    it "save should clear the cached initial values" do
-      @o.save
-      @o.column_changes.must_equal({})
-    end
-
-    it "save_changes should clear the cached initial values" do
-      def (@c.instance_dataset).supports_insert_select?() true end
-      def (@c.instance_dataset).insert_select(*) {:id=>1} end
-      @o.save
-      @o.column_changes.must_equal({})
-    end
-  end
-
-  describe "with existing instance" do
-    before do
-      @o = @c[1]
-      @o.initial_changed = 'ic2'.dup
-      @o.missing_changed = 'mc2'.dup
-    end
-
-    include dirty_plugin_specs
-
-    it "previous_changes should be the previous changes after saving" do
-      @o.save
-      @o.previous_changes.must_equal(:initial_changed=>['ic', 'ic2'], :missing_changed=>[nil, 'mc2'])
-    end
-
-    it "should work when freezing objects after saving" do
-      @o.initial = 'a'
-      @o.save
-      @o.freeze
-      @o.previous_changes[:initial].must_equal ['i', 'a']
-      proc{@o.initial = 'b'}.must_raise
-    end
-  end
-end

data/spec/extensions/duplicate_columns_handler_spec.rb

@@ -1,110 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-mod = shared_description do
-  it "should take action depending on :on_duplicate_columns if 2 or more columns have the same name" do
-    check(nil, @cols)
-    @warned.must_equal nil
-
-    check(:ignore, @cols)
-    @warned.must_equal nil
-
-    check(:warn, @cols)
-    @warned.must_equal("One or more duplicate columns present in #{@cols.inspect}")
-
-    proc{check(:raise, @cols)}.must_raise(Sequel::DuplicateColumnError)
-
-    cols = nil
-    check(proc{|cs| cols = cs; nil}, @cols)
-    @warned.must_equal nil
-    cols.must_equal @cols
-
-    cols = nil
-    check(proc{|cs| cols = cs; :ignore}, @cols)
-    @warned.must_equal nil
-    cols.must_equal @cols
-
-    cols = nil
-    proc{check(proc{|cs| cols = cs; :raise}, @cols)}.must_raise(Sequel::DuplicateColumnError)
-    cols.must_equal @cols
-
-    cols = nil
-    check(proc{|cs| cols = cs; :warn}, @cols)
-    @warned.must_equal("One or more duplicate columns present in #{@cols.inspect}")
-    cols.must_equal @cols
-
-    check(:raise, nil)
-    @warned.must_equal nil
-  end
-
-  it "should not raise error or warning if no columns have the same name" do
-    [nil, :ignore, :raise, :warn, proc{|cs| :raise}].each do |handler|
-      check(handler, @cols.uniq)
-      @warned.must_equal nil
-    end
-  end
-end
-
-describe "Sequel::DuplicateColumnsHandler Database configuration" do
-  before do
-    @db = Sequel.mock
-    @db.extension(:duplicate_columns_handler)
-    @ds = @db[:things]
-    @cols = [:id, :name, :id]
-    @warned = nil
-    set_warned = @set_warned = proc{|m| @warned = m}
-    @ds.meta_def(:warn) do |message|
-      set_warned.call(message)
-    end
-  end
-
-  def check(handler, cols)
-    @db.opts[:on_duplicate_columns] = handler
-    @set_warned.call(nil)
-    @ds.send(:columns=, cols)
-  end
-
-  include mod
-end
-
-describe "Sequel::DuplicateColumnsHandler Dataset configuration" do
-  before do
-    @ds = Sequel.mock[:things].extension!(:duplicate_columns_handler)
-    @cols = [:id, :name, :id]
-    @warned = nil
-    set_warned = @set_warned = proc{|m| @warned = m}
-    @ds.meta_def(:warn) do |message|
-      set_warned.call(message)
-    end
-  end
-
-  def check(handler, cols)
-    @set_warned.call(nil)
-    @ds.on_duplicate_columns(handler).send(:columns=, cols)
-  end
-
-  include mod
-
-  it "should use handlers passed as blocks to on_duplicate_columns" do
-    proc{@ds.on_duplicate_columns{:raise}.send(:columns=, @cols)}.must_raise(Sequel::DuplicateColumnError)
-  end
-
-  it "should raise an error if not providing either an argument or block to on_duplicate_columns" do
-    proc{@ds.on_duplicate_columns}.must_raise(Sequel::Error)
-  end
-
-  it "should raise an error if providing both an argument and block to on_duplicate_columns" do
-    proc{@ds.on_duplicate_columns(:raise){:raise}}.must_raise(Sequel::Error)
-  end
-
-  it "should warn by defaul if there is no database or dataset handler" do
-    @ds.send(:columns=, @cols)
-    @warned.must_equal("One or more duplicate columns present in #{@cols.inspect}")
-  end
-
-  it "should fallback to database setting if there is no dataset-level handler" do
-    @ds.db.opts[:on_duplicate_columns] = :raise
-    proc{@ds.send(:columns=, @cols)}.must_raise(Sequel::DuplicateColumnError)
-    check(:ignore, @cols)
-    @warned.must_equal nil
-  end
-end