sequel 3.28.0 → 3.29.0

data/spec/extensions/spec_helper.rb

@@ -48,6 +48,10 @@ class MockDatabase < Sequel::Database
   self.identifier_input_method = nil
   self.identifier_output_method = nil
   attr_reader :sqls
+
+  def connect(opts)
+    Object.new
+  end
   
   def execute(sql, opts={})
     @sqls ||= []

data/spec/extensions/thread_local_timezones_spec.rb

@@ -39,7 +39,27 @@ describe "Sequel thread_local_timezones extension" do
   end
     
   it "should be thread safe" do
-    [Thread.new{Sequel.thread_application_timezone = :utc; sleep 0.03; Sequel.application_timezone.should == :utc},
-     Thread.new{sleep 0.01; Sequel.thread_application_timezone = :local; sleep 0.01; Sequel.application_timezone.should == :local}].each{|x| x.join}
+    q, q1, q2 = Queue.new, Queue.new, Queue.new
+    tz1, tz2 = nil, nil
+    t1 = Thread.new do
+      Sequel.thread_application_timezone = :utc
+      q2.push nil
+      q.pop
+      tz1 = Sequel.application_timezone
+    end
+    t2 = Thread.new do
+      Sequel.thread_application_timezone = :local
+      q2.push nil
+      q1.pop
+      tz2 = Sequel.application_timezone
+    end
+    q2.pop
+    q2.pop
+    q.push nil
+    q1.push nil
+    t1.join
+    t2.join
+    tz1.should == :utc
+    tz2.should == :local
   end
 end

data/spec/extensions/typecast_on_load_spec.rb

@@ -2,22 +2,17 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "TypecastOnLoad plugin" do
   before do
-    @db = Sequel::Database.new({})
+    @db = Sequel.mock(:fetch=>{:id=>1, :b=>"1", :y=>"0"}, :columns=>[:id, :b, :y])
     def @db.schema(*args)
       [[:id, {}], [:y, {:type=>:boolean, :db_type=>'tinyint(1)'}], [:b, {:type=>:integer, :db_type=>'integer'}]]
     end
     @c = Class.new(Sequel::Model(@db[:items])) do
-      include(Module.new{def _refresh(ds); values[:b] = b.to_s; self; end})
       attr_accessor :bset
       def b=(x)
         self.bset = true
         super
       end
     end
-    @c.instance_eval do
-      @columns = [:id, :b, :y]
-      def columns; @columns; end
-    end
   end 
 
   specify "should call setter method with value when loading the object, for all given columns" do

data/spec/integration/associations_test.rb

@@ -8,7 +8,7 @@ shared_examples_for "eager limit strategies" do
     diff_album = @diff_album.call
     al, ar, t = @pr.call
     
-    a = Artist.eager(:first_album, :last_album).all
+    a = Artist.eager(:first_album, :last_album).order(:name).all
     a.should == [@artist, ar]
     a.first.first_album.should == @album
     a.first.last_album.should == diff_album
@@ -20,7 +20,7 @@ shared_examples_for "eager limit strategies" do
     a.first.last_album.values.should == diff_album.values
 
     same_album = @same_album.call
-    a = Artist.eager(:first_album).all
+    a = Artist.eager(:first_album).order(:name).all
     a.should == [@artist, ar]
     [@album, same_album].should include(a.first.first_album)
     a.last.first_album.should == nil
@@ -51,6 +51,9 @@ shared_examples_for "eager limit strategies" do
   end
   
   specify "should correctly handle limits and offsets when eager loading many_to_many associations" do
+    if @els == {:eager_limit_strategy=>:correlated_subquery} && Sequel.guarded?(:derby)
+      pending("Derby errors with correlated subqueries on many_to_many associations")
+    end
     Album.many_to_many :first_two_tags, {:clone=>:first_two_tags}.merge(@els) if @els
     Album.many_to_many :second_two_tags, {:clone=>:second_two_tags}.merge(@els) if @els
     Album.many_to_many :last_two_tags, {:clone=>:last_two_tags}.merge(@els) if @els
@@ -73,6 +76,9 @@ shared_examples_for "eager limit strategies" do
   end
   
   specify "should correctly handle limits and offsets when eager loading many_through_many associations" do
+    if @els == {:eager_limit_strategy=>:correlated_subquery} && Sequel.guarded?(:derby)
+      pending("Derby errors with correlated subqueries on many_through_many associations")
+    end
     Artist.many_through_many :first_two_tags, {:clone=>:first_two_tags}.merge(@els) if @els
     Artist.many_through_many :second_two_tags, {:clone=>:second_two_tags}.merge(@els) if @els
     Artist.many_through_many :last_two_tags, {:clone=>:last_two_tags}.merge(@els) if @els
@@ -102,6 +108,7 @@ shared_examples_for "regular and composite key associations" do
     @artist.first_album.should == nil
     @artist.albums.should == []
     @album.tags.should == []
+    @album.alias_tags.should == []
     @tag.albums.should == []
   end
 
@@ -117,6 +124,7 @@ shared_examples_for "regular and composite key associations" do
     @artist.first_album.should == @album
     @artist.albums.should == [@album]
     @album.tags.should == [@tag]
+    @album.alias_tags.should == [@tag]
     @tag.albums.should == [@album]
   end
   
@@ -133,6 +141,7 @@ shared_examples_for "regular and composite key associations" do
     @artist.first_album.should == @album
     @artist.albums.should == [@album]
     @album.tags.should == [@tag]
+    @album.alias_tags.should == [@tag]
     @tag.albums.should == [@album]
   end
 
@@ -144,6 +153,7 @@ shared_examples_for "regular and composite key associations" do
     Artist.filter(:first_album=>@album).all.should == [@artist]
     Album.filter(:artist=>@artist).all.should == [@album]
     Album.filter(:tags=>@tag).all.should == [@album]
+    Album.filter(:alias_tags=>@tag).all.should == [@album]
     Tag.filter(:albums=>@album).all.should == [@tag]
     Album.filter(:artist=>@artist, :tags=>@tag).all.should == [@album]
     @artist.albums_dataset.filter(:tags=>@tag).all.should == [@album]
@@ -158,6 +168,7 @@ shared_examples_for "regular and composite key associations" do
     Artist.exclude(:first_album=>@album).all.should == [artist]
     Album.exclude(:artist=>@artist).all.should == [album]
     Album.exclude(:tags=>@tag).all.should == [album]
+    Album.exclude(:alias_tags=>@tag).all.should == [album]
     Tag.exclude(:albums=>@album).all.should == [tag]
     Album.exclude(:artist=>@artist, :tags=>@tag).all.should == [album]
   end
@@ -171,6 +182,7 @@ shared_examples_for "regular and composite key associations" do
     Artist.filter(:first_album=>[@album, album]).all.should == [@artist]
     Album.filter(:artist=>[@artist, artist]).all.should == [@album]
     Album.filter(:tags=>[@tag, tag]).all.should == [@album]
+    Album.filter(:alias_tags=>[@tag, tag]).all.should == [@album]
     Tag.filter(:albums=>[@album, album]).all.should == [@tag]
     Album.filter(:artist=>[@artist, artist], :tags=>[@tag, tag]).all.should == [@album]
     @artist.albums_dataset.filter(:tags=>[@tag, tag]).all.should == [@album]
@@ -181,6 +193,7 @@ shared_examples_for "regular and composite key associations" do
     Artist.filter(:first_album=>[@album, album]).all.should == [@artist]
     Album.filter(:artist=>[@artist, artist]).all.should == [@album]
     Album.filter(:tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [@album, album]
+    Album.filter(:alias_tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [@album, album]
     Tag.filter(:albums=>[@album, album]).all.sort_by{|x| x.pk}.should == [@tag, tag]
     Album.filter(:artist=>[@artist, artist], :tags=>[@tag, tag]).all.should == [@album]
 
@@ -190,6 +203,7 @@ shared_examples_for "regular and composite key associations" do
     Artist.filter(:first_album=>[@album, album]).all.sort_by{|x| x.pk}.should == [@artist, artist]
     Album.filter(:artist=>[@artist, artist]).all.sort_by{|x| x.pk}.should == [@album, album]
     Album.filter(:tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [@album, album]
+    Album.filter(:alias_tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [@album, album]
     Tag.filter(:albums=>[@album, album]).all.sort_by{|x| x.pk}.should == [@tag, tag]
     Album.filter(:artist=>[@artist, artist], :tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [@album, album]
   end
@@ -201,6 +215,7 @@ shared_examples_for "regular and composite key associations" do
     Artist.exclude(:first_album=>[@album, album]).all.sort_by{|x| x.pk}.should == [@artist, artist]
     Album.exclude(:artist=>[@artist, artist]).all.sort_by{|x| x.pk}.should == [@album, album]
     Album.exclude(:tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [@album, album]
+    Album.exclude(:alias_tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [@album, album]
     Tag.exclude(:albums=>[@album, album]).all.sort_by{|x| x.pk}.should == [@tag, tag]
     Album.exclude(:artist=>[@artist, artist], :tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [@album, album]
 
@@ -211,6 +226,7 @@ shared_examples_for "regular and composite key associations" do
     Artist.exclude(:first_album=>[@album, album]).all.sort_by{|x| x.pk}.should == [artist]
     Album.exclude(:artist=>[@artist, artist]).all.sort_by{|x| x.pk}.should == [album]
     Album.exclude(:tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [album]
+    Album.exclude(:alias_tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [album]
     Tag.exclude(:albums=>[@album, album]).all.sort_by{|x| x.pk}.should == [tag]
     Album.exclude(:artist=>[@artist, artist], :tags=>[@tag, tag]).all.sort_by{|x| x.pk}.should == [album]
 
@@ -220,6 +236,7 @@ shared_examples_for "regular and composite key associations" do
     Artist.exclude(:first_album=>[@album, album]).all.should == [artist]
     Album.exclude(:artist=>[@artist, artist]).all.should == [album]
     Album.exclude(:tags=>[@tag, tag]).all.should == []
+    Album.exclude(:alias_tags=>[@tag, tag]).all.should == []
     Tag.exclude(:albums=>[@album, album]).all.should == []
     Album.exclude(:artist=>[@artist, artist], :tags=>[@tag, tag]).all.should == [album]
 
@@ -229,6 +246,7 @@ shared_examples_for "regular and composite key associations" do
     Artist.exclude(:first_album=>[@album, album]).all.should == []
     Album.exclude(:artist=>[@artist, artist]).all.should == []
     Album.exclude(:tags=>[@tag, tag]).all.should == []
+    Album.exclude(:alias_tags=>[@tag, tag]).all.should == []
     Tag.exclude(:albums=>[@album, album]).all.should == []
     Album.exclude(:artist=>[@artist, artist], :tags=>[@tag, tag]).all.should == []
   end
@@ -238,6 +256,7 @@ shared_examples_for "regular and composite key associations" do
     Artist.exclude(:first_album=>@album).all.should == [@artist]
     Album.exclude(:artist=>@artist).all.should == [@album]
     Album.exclude(:tags=>@tag).all.should == [@album]
+    Album.exclude(:alias_tags=>@tag).all.should == [@album]
     Tag.exclude(:albums=>@album).all.should == [@tag]
     Album.exclude(:artist=>@artist, :tags=>@tag).all.should == [@album]
 
@@ -248,11 +267,15 @@ shared_examples_for "regular and composite key associations" do
   specify "should handle NULL values in join table correctly when filtering/excluding many_to_many associations" do
     @ins.call
     Album.exclude(:tags=>@tag).all.should == [@album]
+    Album.exclude(:alias_tags=>@tag).all.should == [@album]
     @album.add_tag(@tag)
     Album.filter(:tags=>@tag).all.should == [@album]
+    Album.filter(:alias_tags=>@tag).all.should == [@album]
     album, artist, tag = @pr.call
     Album.exclude(:tags=>@tag).all.should == [album]
+    Album.exclude(:alias_tags=>@tag).all.should == [album]
     Album.exclude(:tags=>tag).all.sort_by{|x| x.pk}.should == [@album, album]
+    Album.exclude(:alias_tags=>tag).all.sort_by{|x| x.pk}.should == [@album, album]
   end
 
   specify "should work correctly when filtering by association datasets" do
@@ -274,6 +297,9 @@ shared_examples_for "regular and composite key associations" do
     Album.filter(:tags=>Tag.dataset).all.sort_by{|x| x.pk}.should == [@album, album]
     Album.filter(:tags=>Tag.dataset.filter(Array(Tag.primary_key).zip(Array(tag.pk)))).all.sort_by{|x| x.pk}.should == [album]
     Album.filter(:tags=>Tag.dataset.filter(1=>0)).all.sort_by{|x| x.pk}.should == []
+    Album.filter(:alias_tags=>Tag.dataset).all.sort_by{|x| x.pk}.should == [@album, album]
+    Album.filter(:alias_tags=>Tag.dataset.filter(Array(Tag.primary_key).zip(Array(tag.pk)))).all.sort_by{|x| x.pk}.should == [album]
+    Album.filter(:alias_tags=>Tag.dataset.filter(1=>0)).all.sort_by{|x| x.pk}.should == []
     Tag.filter(:albums=>Album.dataset).all.sort_by{|x| x.pk}.should == [@tag, tag]
     Tag.filter(:albums=>Album.dataset.filter(Array(Album.primary_key).zip(Array(album.pk)))).all.sort_by{|x| x.pk}.should == [tag]
     Tag.filter(:albums=>Album.dataset.filter(1=>0)).all.sort_by{|x| x.pk}.should == []
@@ -295,17 +321,70 @@ shared_examples_for "regular and composite key associations" do
     Album.exclude(:tags=>Tag.dataset).all.sort_by{|x| x.pk}.should == []
     Album.exclude(:tags=>Tag.dataset.filter(Array(Tag.primary_key).zip(Array(tag.pk)))).all.sort_by{|x| x.pk}.should == [@album]
     Album.exclude(:tags=>Tag.dataset.filter(1=>0)).all.sort_by{|x| x.pk}.should == [@album, album]
+    Album.exclude(:alias_tags=>Tag.dataset).all.sort_by{|x| x.pk}.should == []
+    Album.exclude(:alias_tags=>Tag.dataset.filter(Array(Tag.primary_key).zip(Array(tag.pk)))).all.sort_by{|x| x.pk}.should == [@album]
+    Album.exclude(:alias_tags=>Tag.dataset.filter(1=>0)).all.sort_by{|x| x.pk}.should == [@album, album]
     Tag.exclude(:albums=>Album.dataset).all.sort_by{|x| x.pk}.should == []
     Tag.exclude(:albums=>Album.dataset.filter(Array(Album.primary_key).zip(Array(album.pk)))).all.sort_by{|x| x.pk}.should == [@tag]
     Tag.exclude(:albums=>Album.dataset.filter(1=>0)).all.sort_by{|x| x.pk}.should == [@tag, tag]
   end
 
+  specify "should have working dataset associations" do
+    album, artist, tag = @pr.call
+
+    Tag.albums.all.should == []
+    Album.artists.all.should == []
+    Album.tags.all.should == []
+    Album.alias_tags.all.should == []
+    Artist.albums.all.should == []
+    Artist.tags.all.should == []
+    Artist.albums.tags.all.should == []
+
+    @album.update(:artist => @artist)
+    @album.add_tag(@tag)
+
+    Tag.albums.all.should == [@album]
+    Album.artists.all.should == [@artist]
+    Album.tags.all.should == [@tag]
+    Album.alias_tags.all.should == [@tag]
+    Artist.albums.all.should == [@album]
+    Artist.tags.all.should == [@tag]
+    Artist.albums.tags.all.should == [@tag]
+
+    album.add_tag(tag)
+    album.update(:artist => artist)
+
+    Tag.albums.order(:name).all.should == [@album, album]
+    Album.artists.order(:name).all.should == [@artist, artist]
+    Album.tags.order(:name).all.should == [@tag, tag]
+    Album.alias_tags.order(:name).all.should == [@tag, tag]
+    Artist.albums.order(:name).all.should == [@album, album]
+    Artist.tags.order(:name).all.should == [@tag, tag]
+    Artist.albums.tags.order(:name).all.should == [@tag, tag]
+
+    Tag.filter(Tag.qualified_primary_key_hash(tag.pk)).albums.all.should == [album]
+    Album.filter(Album.qualified_primary_key_hash(album.pk)).artists.all.should == [artist]
+    Album.filter(Album.qualified_primary_key_hash(album.pk)).tags.all.should == [tag]
+    Album.filter(Album.qualified_primary_key_hash(album.pk)).alias_tags.all.should == [tag]
+    Artist.filter(Artist.qualified_primary_key_hash(artist.pk)).albums.all.should == [album]
+    Artist.filter(Artist.qualified_primary_key_hash(artist.pk)).tags.all.should == [tag]
+    Artist.filter(Artist.qualified_primary_key_hash(artist.pk)).albums.tags.all.should == [tag]
+
+    Artist.filter(Artist.qualified_primary_key_hash(artist.pk)).albums.filter(Album.qualified_primary_key_hash(album.pk)).tags.all.should == [tag]
+    Artist.filter(Artist.qualified_primary_key_hash(@artist.pk)).albums.filter(Album.qualified_primary_key_hash(@album.pk)).tags.all.should == [@tag]
+    Artist.filter(Artist.qualified_primary_key_hash(@artist.pk)).albums.filter(Album.qualified_primary_key_hash(album.pk)).tags.all.should == []
+    Artist.filter(Artist.qualified_primary_key_hash(artist.pk)).albums.filter(Album.qualified_primary_key_hash(@album.pk)).tags.all.should == []
+  end
+
   specify "should have remove methods work" do
     @album.update(:artist => @artist)
     @album.add_tag(@tag)
     
     @album.update(:artist => nil)
     @album.remove_tag(@tag)
+
+    @album.add_alias_tag(@tag)
+    @album.remove_alias_tag(@tag)
     
     @album.reload
     @artist.reload
@@ -315,6 +394,12 @@ shared_examples_for "regular and composite key associations" do
     @artist.albums.should == []
     @album.tags.should == []
     @tag.albums.should == []
+
+    @album.add_alias_tag(@tag)
+    @album.remove_alias_tag(@tag)
+
+    @album.reload
+    @album.alias_tags.should == []
   end
   
   specify "should have remove_all methods work" do
@@ -332,17 +417,24 @@ shared_examples_for "regular and composite key associations" do
     @artist.albums.should == []
     @album.tags.should == []
     @tag.albums.should == []
+
+    @album.add_alias_tag(@tag)
+    @album.remove_all_alias_tags
+
+    @album.reload
+    @album.alias_tags.should == []
   end
   
   specify "should eager load via eager correctly" do
     @album.update(:artist => @artist)
     @album.add_tag(@tag)
     
-    a = Artist.eager(:albums=>:tags).eager(:first_album).all
+    a = Artist.eager(:albums=>[:tags, :alias_tags]).eager(:first_album).all
     a.should == [@artist]
     a.first.albums.should == [@album]
     a.first.first_album.should == @album
     a.first.albums.first.tags.should == [@tag]
+    a.first.albums.first.alias_tags.should == [@tag]
     
     a = Tag.eager(:albums=>:artist).all
     a.should == [@tag]
@@ -372,11 +464,12 @@ shared_examples_for "regular and composite key associations" do
     @album.update(:artist => @artist)
     @album.add_tag(@tag)
     
-    a = Artist.eager_graph(:albums=>:tags).eager_graph(:first_album).all
+    a = Artist.eager_graph(:albums=>[:tags, :alias_tags]).eager_graph(:first_album).all
     a.should == [@artist]
     a.first.albums.should == [@album]
     a.first.first_album.should == @album
     a.first.albums.first.tags.should == [@tag]
+    a.first.albums.first.alias_tags.should == [@tag]
     
     a = Tag.eager_graph(:albums=>:artist).all
     a.should == [@tag]
@@ -415,7 +508,7 @@ shared_examples_for "regular and composite key associations" do
 end
 
 describe "Sequel::Model Simple Associations" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     [:albums_tags, :tags, :albums, :artists].each{|t| @db.drop_table(t) rescue nil}
     @db.create_table(:artists) do
@@ -435,8 +528,12 @@ describe "Sequel::Model Simple Associations" do
       foreign_key :album_id, :albums
       foreign_key :tag_id, :tags
     end
+  end
+  before do
+    [:albums_tags, :tags, :albums, :artists].each{|t| @db[t].delete}
     class ::Artist < Sequel::Model(@db)
-      one_to_many :albums
+      plugin :dataset_associations
+      one_to_many :albums, :order=>:name
       one_to_one :first_album, :class=>:Album, :order=>:name
       one_to_one :last_album, :class=>:Album, :order=>:name.desc
       one_to_many :first_two_albums, :class=>:Album, :order=>:name, :limit=>2
@@ -449,13 +546,16 @@ describe "Sequel::Model Simple Associations" do
       many_through_many :last_two_tags, :clone=>:tags, :order=>:tags__name.desc, :limit=>2
     end
     class ::Album < Sequel::Model(@db)
+      plugin :dataset_associations
       many_to_one :artist
       many_to_many :tags, :right_key=>:tag_id
+      many_to_many :alias_tags, :clone=>:tags, :join_table=>:albums_tags___at
       many_to_many :first_two_tags, :clone=>:tags, :order=>:name, :limit=>2
       many_to_many :second_two_tags, :clone=>:tags, :order=>:name, :limit=>[2, 1]
       many_to_many :last_two_tags, :clone=>:tags, :order=>:name.desc, :limit=>2
     end
     class ::Tag < Sequel::Model(@db)
+      plugin :dataset_associations
       many_to_many :albums
     end
     @album = Album.create(:name=>'Al')
@@ -469,9 +569,11 @@ describe "Sequel::Model Simple Associations" do
     @ins = lambda{@db[:albums_tags].insert(:tag_id=>@tag.id)}
   end
   after do
-    @db.drop_table(:albums_tags, :tags, :albums, :artists)
     [:Tag, :Album, :Artist].each{|x| Object.send(:remove_const, x)}
   end
+  after(:all) do
+    @db.drop_table(:albums_tags, :tags, :albums, :artists)
+  end
   
   it_should_behave_like "regular and composite key associations"
 
@@ -480,7 +582,7 @@ describe "Sequel::Model Simple Associations" do
       @els = {:eager_limit_strategy=>:correlated_subquery}
     end
     it_should_behave_like "eager limit strategies"
-  end unless [:mysql, :db2].include?(INTEGRATION_DB.database_type)
+  end unless Sequel.guarded?(:mysql, :db2, :oracle)
 
   specify "should handle aliased tables when eager_graphing" do
     @album.update(:artist => @artist)
@@ -588,7 +690,7 @@ describe "Sequel::Model Simple Associations" do
 end
 
 describe "Sequel::Model Composite Key Associations" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     [:albums_tags, :tags, :albums, :artists].each{|t| @db.drop_table(t) rescue nil}
     @db.create_table(:artists) do
@@ -620,10 +722,14 @@ describe "Sequel::Model Composite Key Associations" do
       foreign_key [:album_id1, :album_id2], :albums
       foreign_key [:tag_id1, :tag_id2], :tags
     end
+  end
+  before do
+    [:albums_tags, :tags, :albums, :artists].each{|t| @db[t].delete}
     class ::Artist < Sequel::Model(@db)
+      plugin :dataset_associations
       set_primary_key :id1, :id2
       unrestrict_primary_key
-      one_to_many :albums, :key=>[:artist_id1, :artist_id2]
+      one_to_many :albums, :key=>[:artist_id1, :artist_id2], :order=>:name
       one_to_one :first_album, :clone=>:albums, :order=>:name
       one_to_one :last_album, :clone=>:albums, :order=>:name.desc
       one_to_many :first_two_albums, :clone=>:albums, :order=>:name, :limit=>2
@@ -636,15 +742,18 @@ describe "Sequel::Model Composite Key Associations" do
       many_through_many :last_two_tags, :clone=>:tags, :order=>:tags__name.desc, :limit=>2
     end
     class ::Album < Sequel::Model(@db)
+      plugin :dataset_associations
       set_primary_key :id1, :id2
       unrestrict_primary_key
       many_to_one :artist, :key=>[:artist_id1, :artist_id2]
       many_to_many :tags, :left_key=>[:album_id1, :album_id2], :right_key=>[:tag_id1, :tag_id2]
+      many_to_many :alias_tags, :clone=>:tags, :join_table=>:albums_tags___at
       many_to_many :first_two_tags, :clone=>:tags, :order=>:name, :limit=>2
       many_to_many :second_two_tags, :clone=>:tags, :order=>:name, :limit=>[2, 1]
       many_to_many :last_two_tags, :clone=>:tags, :order=>:name.desc, :limit=>2
     end
     class ::Tag < Sequel::Model(@db)
+      plugin :dataset_associations
       set_primary_key :id1, :id2
       unrestrict_primary_key
       many_to_many :albums, :right_key=>[:album_id1, :album_id2], :left_key=>[:tag_id1, :tag_id2]
@@ -660,9 +769,11 @@ describe "Sequel::Model Composite Key Associations" do
     @ins = lambda{@db[:albums_tags].insert(:tag_id1=>@tag.id1, :tag_id2=>@tag.id2)}
   end
   after do
-    @db.drop_table(:albums_tags, :tags, :albums, :artists)
     [:Tag, :Album, :Artist].each{|x| Object.send(:remove_const, x)}
   end
+  after(:all) do
+    @db.drop_table(:albums_tags, :tags, :albums, :artists)
+  end
 
   it_should_behave_like "regular and composite key associations"
 
@@ -671,7 +782,7 @@ describe "Sequel::Model Composite Key Associations" do
       @els = {:eager_limit_strategy=>:correlated_subquery}
     end
     it_should_behave_like "eager limit strategies"
-  end if INTEGRATION_DB.dataset.supports_multiple_column_in? && ![:mysql, :db2].include?(INTEGRATION_DB.database_type)
+  end if INTEGRATION_DB.dataset.supports_multiple_column_in? && !Sequel.guarded?(:mysql, :db2, :oracle)
 
   specify "should have add method accept hashes and create new records" do
     @artist.remove_all_albums