sequel 4.49.0 → 5.3.0

data/spec/extensions/instance_hooks_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "InstanceHooks plugin" do
   def r(x=nil)
@@ -25,17 +25,6 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  deprecated "should cancel the save if before_create_hook block returns false" do
-    @o.after_create_hook{r 1}
-    @o.before_create_hook{r false}
-    @o.before_create_hook{r 4}
-    @o.save.must_be_nil
-    @r.must_equal [4, false]
-    @r.clear
-    @o.save.must_be_nil
-    @r.must_equal [4, false]
-  end
-
   it "should cancel the save if before_create_hook block calls cancel_action" do
     @o.after_create_hook{r 1}
     @o.before_create_hook{r{@o.cancel_action}}
@@ -58,17 +47,6 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  deprecated "should cancel the save if before_update_hook block returns false" do
-    @x.after_update_hook{r 1}
-    @x.before_update_hook{r false}
-    @x.before_update_hook{r 4}
-    @x.save.must_be_nil
-    @r.must_equal [4, false]
-    @r.clear
-    @x.save.must_be_nil
-    @r.must_equal [4, false]
-  end
-
   it "should cancel the save if before_update_hook block calls cancel_action" do
     @x.after_update_hook{r 1}
     @x.before_update_hook{r{@x.cancel_action}}
@@ -99,24 +77,6 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  deprecated "should cancel the save if before_save_hook block returns false" do
-    @x.after_save_hook{r 1}
-    @x.before_save_hook{r false}
-    @x.before_save_hook{r 4}
-    @x.save.must_be_nil
-    @r.must_equal [4, false]
-    @r.clear
-    
-    @x.after_save_hook{r 1}
-    @x.before_save_hook{r false}
-    @x.before_save_hook{r 4}
-    @x.save.must_be_nil
-    @r.must_equal [4, false]
-    @r.clear
-    @x.save.must_be_nil
-    @r.must_equal [4, false]
-  end
-
   it "should cancel the save if before_save_hook block calls cancel_action" do
     @x.after_save_hook{r 1}
     @x.before_save_hook{r{@x.cancel_action}}
@@ -144,14 +104,6 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  deprecated "should cancel the destroy if before_destroy_hook block returns false" do
-    @x.after_destroy_hook{r 1}
-    @x.before_destroy_hook{r false}
-    @x.before_destroy_hook{r 4}
-    @x.destroy.must_be_nil
-    @r.must_equal [4, false]
-  end
-
   it "should cancel the destroy if before_destroy_hook block calls cancel_action" do
     @x.after_destroy_hook{r 1}
     @x.before_destroy_hook{r{@x.cancel_action}}
@@ -169,17 +121,6 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  deprecated "should cancel the save if before_validation_hook block returns false" do
-    @o.after_validation_hook{r 1}
-    @o.before_validation_hook{r false}
-    @o.before_validation_hook{r 4}
-    @o.valid?.must_equal false
-    @r.must_equal [4, false]
-    @r.clear
-    @o.valid?.must_equal false
-    @r.must_equal [4, false]
-  end
-
   it "should cancel the save if before_validation_hook block calls cancel_action" do
     @o.after_validation_hook{r 1}
     @o.before_validation_hook{r{@o.cancel_action}}
@@ -289,34 +230,6 @@ describe "InstanceHooks plugin with transactions" do
     @db.sqls
   end
   
-  deprecated "should support after_commit_hook" do
-    @o.after_commit_hook{@db.execute('ac1')}
-    @o.after_commit_hook{@db.execute('ac2')}
-    @o.save.wont_equal nil
-    @db.sqls.must_equal ['BEGIN', 'as', 'COMMIT', 'ac1', 'ac2']
-  end
-  
-  deprecated "should support after_rollback_hook" do
-    @or.after_rollback_hook{@db.execute('ar1')}
-    @or.after_rollback_hook{@db.execute('ar2')}
-    @or.save.must_be_nil
-    @db.sqls.must_equal ['BEGIN', 'as', 'ROLLBACK', 'ar1', 'ar2']
-  end
-  
-  deprecated "should support after_destroy_commit_hook" do
-    @o.after_destroy_commit_hook{@db.execute('adc1')}
-    @o.after_destroy_commit_hook{@db.execute('adc2')}
-    @o.destroy.wont_equal nil
-    @db.sqls.must_equal ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'COMMIT', 'adc1', 'adc2']
-  end
-  
-  deprecated "should support after_destroy_rollback_hook" do
-    @or.after_destroy_rollback_hook{@db.execute('adr1')}
-    @or.after_destroy_rollback_hook{@db.execute('adr2')}
-    @or.destroy.must_be_nil
-    @db.sqls.must_equal ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'ROLLBACK', 'adr1', 'adr2']
-  end
-
   it "should have *_hook methods return self "do
     @o.before_destroy_hook{r 1}.must_be_same_as(@o)
     @o.before_validation_hook{r 1}.must_be_same_as(@o)
@@ -329,12 +242,5 @@ describe "InstanceHooks plugin with transactions" do
     @o.after_save_hook{r 1}.must_be_same_as(@o)
     @o.after_update_hook{r 1}.must_be_same_as(@o)
     @o.after_create_hook{r 1}.must_be_same_as(@o)
-    deprecated do
-      @o.after_commit_hook{r 1}.must_be_same_as(@o)
-      @o.after_rollback_hook{r 1}.must_be_same_as(@o)
-      @o.after_destroy_commit_hook{r 1}.must_be_same_as(@o)
-      @o.after_destroy_rollback_hook{r 1}.must_be_same_as(@o)
-    end
   end
-
 end

data/spec/extensions/inverted_subsets_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::InvertedSubsets" do
   it "should add an inverted subset method which inverts the condition" do

data/spec/extensions/json_serializer_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::JsonSerializer" do
   before do

data/spec/extensions/lazy_attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 require 'yaml'
 
 describe "Sequel::Plugins::LazyAttributes" do
@@ -42,12 +42,6 @@ describe "Sequel::Plugins::LazyAttributes" do
     Object.send(:remove_const, :LazyAttributesModel)
   end
   
-  deprecated "should allow access to lazy_attributes_module" do
-    @c.lazy_attributes_module.must_be_kind_of Module
-    @c.lazy_attributes_module = v = Module.new
-    @c.lazy_attributes_module.must_equal v
-  end
-
   it "should allowing adding additional lazy attributes via plugin :lazy_attributes" do
     @c.set_dataset(@ds.select(:id, :blah))
     @c.dataset.sql.must_equal 'SELECT id, blah FROM la'

data/spec/extensions/list_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "List plugin" do
   def klass(opts={})
@@ -92,15 +92,14 @@ describe "List plugin" do
     @sc.create(:scope_id=>1).values.must_equal(:id=>1, :scope_id=>1, :position=>1)
     @sc.create(:scope_id=>1).values.must_equal(:id=>2, :scope_id=>1, :position=>2)
     @sc.create(:scope_id=>2).values.must_equal(:id=>3, :scope_id=>2, :position=>1)
-    sqls = @db.sqls
-    sqls.slice!(7).must_match(/INSERT INTO items \((scope_id|position), (scope_id|position)\) VALUES \([12], [12]\)/)
-    sqls.slice!(4).must_match(/INSERT INTO items \((scope_id|position), (scope_id|position)\) VALUES \([12], [12]\)/)
-    sqls.slice!(1).must_match(/INSERT INTO items \((scope_id|position), (scope_id|position)\) VALUES \(1, 1\)/)
-    sqls.must_equal ["SELECT max(position) AS max FROM items WHERE (scope_id = 1) LIMIT 1",
+    @db.sqls.must_equal ["SELECT max(position) AS max FROM items WHERE (scope_id = 1) LIMIT 1",
+      'INSERT INTO items (scope_id, position) VALUES (1, 1)',
       "SELECT * FROM items WHERE (id = 1) ORDER BY scope_id, position LIMIT 1",
       "SELECT max(position) AS max FROM items WHERE (scope_id = 1) LIMIT 1",
+      'INSERT INTO items (scope_id, position) VALUES (1, 2)',
       "SELECT * FROM items WHERE (id = 2) ORDER BY scope_id, position LIMIT 1",
       "SELECT max(position) AS max FROM items WHERE (scope_id = 2) LIMIT 1",
+      'INSERT INTO items (scope_id, position) VALUES (2, 1)',
       "SELECT * FROM items WHERE (id = 3) ORDER BY scope_id, position LIMIT 1"]
   end
 

data/spec/extensions/looser_typecasting_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "LooserTypecasting Extension" do
   before do

data/spec/extensions/many_through_many_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "many_through_many" do
   before do
@@ -462,12 +462,12 @@ describe Sequel::Model, "many_through_many" do
 
   it "should not add associations methods directly to class" do
     @c1.many_through_many :tags, [[:albums_artists, :artist_id, :album_id], [:albums, :id, :id], [:albums_tags, :album_id, :tag_id]]
-    im = @c1.instance_methods.collect{|x| x.to_s}
-    im.must_include('tags')
-    im.must_include('tags_dataset')
-    im2 = @c1.instance_methods(false).collect{|x| x.to_s}
-    im2.wont_include('tags')
-    im2.wont_include('tags_dataset')
+    im = @c1.instance_methods
+    im.must_include(:tags)
+    im.must_include(:tags_dataset)
+    im2 = @c1.instance_methods(false)
+    im2.wont_include(:tags)
+    im2.wont_include(:tags_dataset)
   end
 
   it "should support after_load association callback" do
@@ -603,11 +603,9 @@ describe "many_through_many eager loading methods" do
   it "should eagerly load multiple associations in a single call" do
     a = @c1.eager(:tags, :albums).all
     a.must_equal [@c1.load(:id=>1)]
-    sqls = DB.sqls
-    sqls.length.must_equal 3
-    sqls[0].must_equal 'SELECT * FROM artists'
-    sqls[1..-1].must_include('SELECT tags.*, albums_artists.artist_id AS x_foreign_key_x FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))')
-    sqls[1..-1].must_include('SELECT albums.*, albums_artists.artist_id AS x_foreign_key_x FROM albums INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))')
+    DB.sqls.must_equal ['SELECT * FROM artists',
+      'SELECT tags.*, albums_artists.artist_id AS x_foreign_key_x FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))',
+      'SELECT albums.*, albums_artists.artist_id AS x_foreign_key_x FROM albums INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))']
     a = a.first
     a.tags.must_equal [Tag.load(:id=>2)]
     a.albums.must_equal [Album.load(:id=>3)]
@@ -617,11 +615,9 @@ describe "many_through_many eager loading methods" do
   it "should eagerly load multiple associations in separate" do
     a = @c1.eager(:tags).eager(:albums).all
     a.must_equal [@c1.load(:id=>1)]
-    sqls = DB.sqls
-    sqls.length.must_equal 3
-    sqls[0].must_equal 'SELECT * FROM artists'
-    sqls[1..-1].must_include('SELECT tags.*, albums_artists.artist_id AS x_foreign_key_x FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))')
-    sqls[1..-1].must_include('SELECT albums.*, albums_artists.artist_id AS x_foreign_key_x FROM albums INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))')
+    DB.sqls.must_equal ['SELECT * FROM artists',
+      'SELECT tags.*, albums_artists.artist_id AS x_foreign_key_x FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))',
+      'SELECT albums.*, albums_artists.artist_id AS x_foreign_key_x FROM albums INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))']
     a = a.first
     a.tags.must_equal [Tag.load(:id=>2)]
     a.albums.must_equal [Album.load(:id=>3)]
@@ -1585,12 +1581,12 @@ describe Sequel::Model, "one_through_many" do
 
   it "should not add associations methods directly to class" do
     @c1.one_through_many :tag, [[:albums_artists, :artist_id, :album_id], [:albums, :id, :id], [:albums_tags, :album_id, :tag_id]]
-    im = @c1.instance_methods.collect{|x| x.to_s}
-    im.must_include('tag')
-    im.must_include('tag_dataset')
-    im2 = @c1.instance_methods(false).collect{|x| x.to_s}
-    im2.wont_include('tag')
-    im2.wont_include('tag_dataset')
+    im = @c1.instance_methods
+    im.must_include(:tag)
+    im.must_include(:tag_dataset)
+    im2 = @c1.instance_methods(false)
+    im2.wont_include(:tag)
+    im2.wont_include(:tag_dataset)
   end
 
   it "should support after_load association callback" do
@@ -1681,11 +1677,9 @@ describe "one_through_many eager loading methods" do
   it "should eagerly load multiple associations in a single call" do
     a = @c1.eager(:tag, :album).all
     a.must_equal [@c1.load(:id=>1)]
-    sqls = DB.sqls
-    sqls.length.must_equal 3
-    sqls[0].must_equal 'SELECT * FROM artists'
-    sqls[1..-1].must_include('SELECT tags.*, albums_artists.artist_id AS x_foreign_key_x FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))')
-    sqls[1..-1].must_include('SELECT albums.*, albums_artists.artist_id AS x_foreign_key_x FROM albums INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))')
+    DB.sqls.must_equal ['SELECT * FROM artists',
+      'SELECT tags.*, albums_artists.artist_id AS x_foreign_key_x FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))',
+      'SELECT albums.*, albums_artists.artist_id AS x_foreign_key_x FROM albums INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))']
     a = a.first
     a.tag.must_equal Tag.load(:id=>2)
     a.album.must_equal Album.load(:id=>3)
@@ -1695,11 +1689,9 @@ describe "one_through_many eager loading methods" do
   it "should eagerly load multiple associations in separate" do
     a = @c1.eager(:tag).eager(:album).all
     a.must_equal [@c1.load(:id=>1)]
-    sqls = DB.sqls
-    sqls.length.must_equal 3
-    sqls[0].must_equal 'SELECT * FROM artists'
-    sqls[1..-1].must_include('SELECT tags.*, albums_artists.artist_id AS x_foreign_key_x FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))')
-    sqls[1..-1].must_include('SELECT albums.*, albums_artists.artist_id AS x_foreign_key_x FROM albums INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))')
+    DB.sqls.must_equal ['SELECT * FROM artists',
+      'SELECT tags.*, albums_artists.artist_id AS x_foreign_key_x FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))',
+      'SELECT albums.*, albums_artists.artist_id AS x_foreign_key_x FROM albums INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id IN (1))']
     a = a.first
     a.tag.must_equal Tag.load(:id=>2)
     a.album.must_equal Album.load(:id=>3)

data/spec/extensions/migration_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 Sequel.extension :migration
 
@@ -62,7 +62,7 @@ describe "Migration.apply" do
     m = Sequel::Migration.new(Sequel.mock)
     m.respond_to?(:foo).must_equal false
     m.respond_to?(:execute).must_equal true
-  end if RUBY_VERSION >= '1.9'
+  end
 end
 
 describe "SimpleMigration#apply" do
@@ -195,6 +195,16 @@ describe "Reversible Migrations with Sequel.migration{change{}}" do
       [:drop_table, :a, {:foo=>:bar}]]
   end
   
+  it "should reverse add_foreign_key with :foreign_key_constraint_name option" do
+    Sequel.migration{change{alter_table(:t){add_foreign_key :b, :c, :foreign_key_constraint_name=>:f}}}.apply(@db, :down)
+    actions = @db.actions
+    actions.must_equal [[:alter_table, [[:drop_foreign_key, :b, {:foreign_key_constraint_name=>:f}]]]]
+    @db.sqls
+    db = Sequel.mock
+    db.alter_table(:t){send(*actions[0][1][0])}
+    db.sqls.must_equal ["ALTER TABLE t DROP CONSTRAINT f", "ALTER TABLE t DROP COLUMN b"]
+  end
+  
   it "should raise in the down direction if migration uses unsupported method" do
     m = Sequel.migration{change{run 'SQL'}}
     m.apply(@db, :up)

data/spec/extensions/modification_detection_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 require 'yaml'
 
 describe "serialization_modification_detection plugin" do

data/spec/extensions/mssql_optimistic_locking_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "MSSSQL optimistic locking plugin" do
   before do

data/spec/extensions/named_timezones_spec.rb

@@ -1,9 +1,9 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 begin
   require 'tzinfo'
-rescue LoadError => e
-  skip_warn "named_timezones_spec: can't load tzinfo (#{e.class}: #{e})"
+rescue LoadError
+  warn "Skipping test of named_timezones extension: can't load tzinfo"
 else
 Sequel.extension :thread_local_timezones
 Sequel.extension :named_timezones

data/spec/extensions/nested_attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "NestedAttributes plugin" do
   def check_sqls(should, is)
@@ -49,12 +49,6 @@ describe "NestedAttributes plugin" do
     @db.sqls
   end
   
-  deprecated "should allow access to nested_attributes_module" do
-    @Artist.nested_attributes_module.must_be_kind_of Module
-    @Artist.nested_attributes_module = v = Module.new
-    @Artist.nested_attributes_module.must_equal v
-  end
-
   it "should support creating new many_to_one objects" do
     a = @Album.new({:name=>'Al', :artist_attributes=>{:name=>'Ar'}})
     @db.sqls.must_equal []
@@ -462,17 +456,6 @@ describe "NestedAttributes plugin" do
     ar.set(:albums_attributes=>[{:id=>10, :_delete=>'t'}])
   end
   
-  deprecated "should not raise an Error if an unmatched primary key is given, if the :strict=>false option is used" do
-    @Artist.nested_attributes :albums, :strict=>false
-    al = @Album.load(:id=>10, :name=>'Al')
-    ar = @Artist.load(:id=>20, :name=>'Ar')
-    ar.associations[:albums] = [al]
-    ar.set(:albums_attributes=>[{:id=>30, :_delete=>'t'}])
-    @db.sqls.must_equal []
-    ar.save
-    @db.sqls.must_equal ["UPDATE artists SET name = 'Ar' WHERE (id = 20)"]
-  end
-  
   it "should not raise an Error if an unmatched primary key is given, if the :unmatched_pk=>:ignore option is used" do
     @Artist.nested_attributes :albums, :unmatched_pk=>:ignore
     al = @Album.load(:id=>10, :name=>'Al')
@@ -492,17 +475,6 @@ describe "NestedAttributes plugin" do
     ar.set(:concerts_attributes=>[{:tour=>'To', :date=>'2004-04-05', :_delete=>'t'}])
   end
 
-  deprecated "should not raise an Error if an unmatched composite primary key is given, if the :strict=>false option is used" do
-    @Artist.nested_attributes :concerts, :strict=>false
-    ar = @Artist.load(:id=>10, :name=>'Ar')
-    co = @Concert.load(:tour=>'To', :date=>'2004-04-05', :playlist=>'Pl')
-    ar.associations[:concerts] = [co]
-    ar.set(:concerts_attributes=>[{:tour=>'To', :date=>'2004-04-06', :_delete=>'t'}])
-    @db.sqls.must_equal []
-    ar.save
-    @db.sqls.must_equal ["UPDATE artists SET name = 'Ar' WHERE (id = 10)"]
-  end
-
   it "should not raise an Error if an unmatched composite primary key is given, if the :unmatched_pk=>:ignore option is used" do
     @Artist.nested_attributes :concerts, :unmatched_pk=>:ignore
     ar = @Artist.load(:id=>10, :name=>'Ar')

data/spec/extensions/null_dataset_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "null_dataset extension" do
   before do
@@ -73,16 +73,6 @@ describe "null_dataset extension" do
     @i.must_equal 1
   end
 
-  deprecated "should have nullify! method modify receiver" do
-    ds = @db[:table]
-    # SEQUEL5: Remove
-    unless ds.frozen?
-      ds.nullify!.must_be_same_as(ds)
-      ds.each(&@pr)
-      @i.must_equal 0
-    end
-  end
-
   it "should work with method chaining" do
     @ds.where(:a=>1).select(:b).each(&@pr)
     @i.must_equal 0

data/spec/extensions/optimistic_locking_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "optimistic_locking plugin" do
   before do
@@ -105,7 +105,7 @@ describe "optimistic_locking plugin" do
       @c.db.sqls
       p2.update(:name=>'Bob')
     end
-    @c.db.sqls.first.must_match(/UPDATE people SET (name = 'Bob', lock_version = 4|lock_version = 4, name = 'Bob') WHERE \(\(id = 1\) AND \(lock_version = 3\)\)/)
+    @c.db.sqls.must_equal ["UPDATE people SET name = 'Bob', lock_version = 4 WHERE ((id = 1) AND (lock_version = 3))"]
   end
 
   it "should increment the lock column when #modified! even if no columns are changed" do

data/spec/extensions/pagination_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "A paginated dataset" do
   before do

data/spec/extensions/pg_array_associations_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "pg_array_associations" do
   before do
@@ -248,9 +248,8 @@ describe Sequel::Model, "pg_array_associations" do
   it "should eagerly load correctly" do
     a = @c1.eager(:tags).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))']
     a.first.tags.must_equal [@o2]
     @db.sqls.must_equal []
 
@@ -268,9 +267,8 @@ describe Sequel::Model, "pg_array_associations" do
 
     a = @c1.eager(:tags).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(\(tags\.id \* 3\) IN \([369], [369], [369]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE ((tags.id * 3) IN (3, 6, 9))']
     a.first.tags.must_equal [@o2]
     @db.sqls.must_equal []
 
@@ -284,9 +282,9 @@ describe Sequel::Model, "pg_array_associations" do
   it "should allow cascading of eager loading for associations of associated models" do
     a = @c1.eager(:tags=>:artists).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.slice!(1).must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ['SELECT * FROM artists', "SELECT * FROM artists WHERE (artists.tag_ids && ARRAY[2]::integer[])"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))',
+      "SELECT * FROM artists WHERE (artists.tag_ids && ARRAY[2]::integer[])"]
     a.first.tags.must_equal [@o2]
     a.first.tags.first.artists.must_equal [@o1]
     @db.sqls.must_equal []
@@ -302,9 +300,8 @@ describe Sequel::Model, "pg_array_associations" do
     @db.sqls.must_equal []
 
     @o2.artists2.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists WHERE (artists.tag_ids @> ARRAY[2]::integer[])"]
+    @db.sqls.must_equal ["SELECT * FROM artists WHERE (artists.tag_ids @> ARRAY[2]::integer[])",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))']
     @o2.artists2.first.tags.must_equal [@o2]
     @db.sqls.must_equal []
   end
@@ -318,7 +315,7 @@ describe Sequel::Model, "pg_array_associations" do
     @db.sqls
 
     @o1.tags2.must_equal [@o2]
-    @db.sqls.first.must_match(/SELECT tags\.id, artists\.id AS artists_id, artists\.tag_ids FROM tags LEFT OUTER JOIN artists ON \(artists.tag_ids @> ARRAY\[tags.id\]\) WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
+    @db.sqls.must_equal ['SELECT tags.id, artists.id AS artists_id, artists.tag_ids FROM tags LEFT OUTER JOIN artists ON (artists.tag_ids @> ARRAY[tags.id]) WHERE (tags.id IN (1, 2, 3))']
     @o1.tags2.first.artists.must_equal [@o1]
     @db.sqls.must_equal []
 
@@ -332,9 +329,8 @@ describe Sequel::Model, "pg_array_associations" do
     @db.sqls
 
     a = @c1.eager(:tags2).all
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT tags\.id, artists\.id AS artists_id, artists\.tag_ids FROM tags LEFT OUTER JOIN artists ON \(artists.tag_ids @> ARRAY\[tags.id\]\) WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT tags.id, artists.id AS artists_id, artists.tag_ids FROM tags LEFT OUTER JOIN artists ON (artists.tag_ids @> ARRAY[tags.id]) WHERE (tags.id IN (1, 2, 3))']
     a.must_equal [@o1]
     a.first.tags2.must_equal [@o2]
     a.first.tags2.first.artists.must_equal [@o1]
@@ -359,27 +355,24 @@ describe Sequel::Model, "pg_array_associations" do
     @c1.pg_array_to_many :tags, :clone=>:tags, :limit=>2
     a = @c1.eager(:tags).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))']
     a.first.tags.must_equal [@c2.load(:id=>1), @c2.load(:id=>2)]
     @db.sqls.must_equal []
 
     @c1.pg_array_to_many :tags, :clone=>:tags, :limit=>[1, 1]
     a = @c1.eager(:tags).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))']
     a.first.tags.must_equal [@c2.load(:id=>2)]
     @db.sqls.must_equal []
 
     @c1.pg_array_to_many :tags, :clone=>:tags, :limit=>[nil, 1]
     a = @c1.eager(:tags).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))']
     a.first.tags.must_equal [@c2.load(:id=>2), @c2.load(:id=>3)]
     @db.sqls.length.must_equal 0
 
@@ -748,6 +741,9 @@ end
 describe "Sequel::Model.finalize_associations" do
   before do
     @db = Sequel.mock(:host=>'postgres', :numrows=>1)
+    @db.extend_datasets do
+      def quote_identifiers?; false end
+    end
     class ::Foo < Sequel::Model(@db)
       plugin :pg_array_associations
       many_to_pg_array :items

data/spec/extensions/pg_array_ops_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 Sequel.extension :pg_array, :pg_array_ops, :pg_hstore, :pg_hstore_ops