sequel 3.28.0 → 3.29.0

data/spec/integration/eager_loader_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 describe "Eagerly loading a tree structure" do
-  before do
+  before(:all) do
     INTEGRATION_DB.instance_variable_set(:@schemas, {})
     INTEGRATION_DB.create_table!(:nodes) do
       primary_key :id
@@ -66,9 +66,8 @@ describe "Eagerly loading a tree structure" do
     Node.insert(:parent_id=>4)
     Node.insert(:parent_id=>5)
     Node.insert(:parent_id=>6)
-    clear_sqls
   end
-  after do
+  after(:all) do
     INTEGRATION_DB.drop_table :nodes
     Object.send(:remove_const, :Node)
   end
@@ -145,7 +144,6 @@ describe "Association Extensions" do
       many_to_one :author
     end
     @author = Author.create
-    clear_sqls
   end
   after do
     INTEGRATION_DB.drop_table :authorships, :authors
@@ -172,7 +170,7 @@ describe "Association Extensions" do
 end
 
 describe "has_many :through has_many and has_one :through belongs_to" do
-  before do
+  before(:all) do
     INTEGRATION_DB.instance_variable_set(:@schemas, {})
     INTEGRATION_DB.create_table!(:firms) do
       primary_key :id
@@ -251,9 +249,8 @@ describe "has_many :through has_many and has_one :through belongs_to" do
     @invoice3 = Invoice.create(:client => @client2)
     @invoice4 = Invoice.create(:client => @client3)
     @invoice5 = Invoice.create(:client => @client3)
-    clear_sqls
   end
-  after do
+  after(:all) do
     INTEGRATION_DB.drop_table :invoices, :clients, :firms
     Object.send(:remove_const, :Firm)
     Object.send(:remove_const, :Client)
@@ -324,7 +321,7 @@ describe "has_many :through has_many and has_one :through belongs_to" do
 end
 
 describe "Polymorphic Associations" do
-  before do
+  before(:all) do
     INTEGRATION_DB.instance_variable_set(:@schemas, {})
     INTEGRATION_DB.create_table!(:assets) do
       primary_key :id
@@ -413,6 +410,9 @@ describe "Polymorphic Associations" do
           .update(:attachable_id=>nil, :attachable_type=>nil)
       end
     end
+  end
+  before do
+    [:assets, :posts, :notes].each{|t| INTEGRATION_DB[t].delete}
     @post = Post.create
     Note.create
     @note = Note.create
@@ -420,9 +420,8 @@ describe "Polymorphic Associations" do
     @asset2 = Asset.create(:attachable=>@note)
     @asset1.associations.clear
     @asset2.associations.clear
-    clear_sqls
   end
-  after do
+  after(:all) do
     INTEGRATION_DB.drop_table :assets, :posts, :notes
     Object.send(:remove_const, :Asset)
     Object.send(:remove_const, :Post)
@@ -483,7 +482,7 @@ describe "Polymorphic Associations" do
 end
 
 describe "many_to_one/one_to_many not referencing primary key" do
-  before do
+  before(:all) do
     INTEGRATION_DB.instance_variable_set(:@schemas, {})
     INTEGRATION_DB.create_table!(:clients) do
       primary_key :id
@@ -540,14 +539,16 @@ describe "many_to_one/one_to_many not referencing primary key" do
         self.client_name = (client.name if client)
       end
     end
-
+  end
+  before do
+    Client.delete
+    Invoice.delete
     @client1 = Client.create(:name=>'X')
     @client2 = Client.create(:name=>'Y')
     @invoice1 = Invoice.create(:client_name=>'X')
     @invoice2 = Invoice.create(:client_name=>'X')
-    clear_sqls
   end
-  after do
+  after(:all) do
     INTEGRATION_DB.drop_table :invoices, :clients
     Object.send(:remove_const, :Client)
     Object.send(:remove_const, :Invoice)
@@ -618,7 +619,7 @@ describe "many_to_one/one_to_many not referencing primary key" do
 end
 
 describe "statistics associations" do
-  before do
+  before(:all) do
     INTEGRATION_DB.create_table!(:projects) do
       primary_key :id
       String :name
@@ -658,9 +659,8 @@ describe "statistics associations" do
     @ticket2 = Ticket.create(:project=>@project1, :hours=>10)
     @ticket3 = Ticket.create(:project=>@project2, :hours=>2)
     @ticket4 = Ticket.create(:project=>@project2, :hours=>20)
-    clear_sqls
   end
-  after do
+  after(:all) do
     INTEGRATION_DB.drop_table :tickets, :projects
     Object.send(:remove_const, :Project)
     Object.send(:remove_const, :Ticket)
@@ -679,7 +679,7 @@ describe "statistics associations" do
 end
 
 describe "one to one associations" do
-  before do
+  before(:all) do
     INTEGRATION_DB.create_table!(:books) do
       primary_key :id
     end
@@ -703,10 +703,8 @@ describe "one to one associations" do
     @page2 = Page.create(:book=>@book1, :page_number=>2)
     @page3 = Page.create(:book=>@book2, :page_number=>1)
     @page4 = Page.create(:book=>@book2, :page_number=>2)
-    clear_sqls
   end
-
-  after do
+  after(:all) do
     INTEGRATION_DB.drop_table :pages, :books
     Object.send(:remove_const, :Book)
     Object.send(:remove_const, :Page)

data/spec/integration/model_test.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 describe "Sequel::Model basic support" do 
   before do
     @db = INTEGRATION_DB
-    @db.create_table!(:items) do
+    @db.create_table!(:items, :engine=>:InnoDB) do
       primary_key :id
       String :name
     end
@@ -38,6 +38,14 @@ describe "Sequel::Model basic support" do
     Item::Thing.first.should == Item::Thing.load(:id=>1, :name=>'J')
   end
 
+  specify "should create accessors for all table columns even if all dataset columns aren't selected" do
+    c = Class.new(Sequel::Model(@db[:items].select(:id)))
+    o = c.new
+    o.name = 'A'
+    o.save.should == c.load(:id=>1)
+    c.select_map(:name).should == ['A']
+  end
+
   specify "should work correctly when a dataset restricts the colums it selects" do
     class ::Item::Thing < Sequel::Model(@db[:items].select(:name))
     end
@@ -52,6 +60,68 @@ describe "Sequel::Model basic support" do
     Item.count.should == 0
   end
 
+  specify "#save should return nil if raise_on_save_failure is false and save isn't successful" do
+    i = Item.new(:name=>'J')
+    i.use_transactions = true
+    def i.after_save
+      raise Sequel::Rollback
+    end
+    i.save.should be_nil
+  end
+
+  specify "#should respect after_commit, after_rollback, after_destroy_commit, and after_destroy_rollback hooks" do
+    i = Item.create(:name=>'J')
+    i.use_transactions = true
+    def i.hooks
+      @hooks
+    end
+    def i.rb=(x)
+      @hooks = []
+      @rb = x
+    end
+    def i.after_save
+      @hooks << :as
+      raise Sequel::Rollback if @rb
+    end
+    def i.after_destroy
+      @hooks << :ad
+      raise Sequel::Rollback if @rb
+    end
+    def i.after_commit
+      @hooks << :ac
+    end
+    def i.after_rollback
+      @hooks << :ar
+    end
+    def i.after_destroy_commit
+      @hooks << :adc
+    end
+    def i.after_destroy_rollback
+      @hooks << :adr
+    end
+    i.name = 'K'
+    i.rb = true
+    i.save.should be_nil
+    i.reload.name.should == 'J'
+    i.hooks.should == [:as, :ar]
+
+    i.rb = true
+    i.destroy.should be_nil
+    i.exists?.should be_true
+    i.hooks.should == [:ad, :adr]
+
+    i.name = 'K'
+    i.rb = false
+    i.save.should_not be_nil
+    i.reload.name.should == 'K'
+    i.hooks.should == [:as, :ac]
+
+    i.rb = false
+    i.destroy.should_not be_nil
+    i.exists?.should be_false
+    i.hooks.should == [:ad, :adc]
+  end
+
   specify "#exists? should return whether the item is still in the database" do
     i = Item.create(:name=>'J')
     i.exists?.should == true
@@ -128,3 +198,12 @@ describe "Sequel::Model basic support" do
     end
   end
 end
+
+describe "Sequel::Model with no existing table" do 
+  specify "should not raise an error when setting the dataset" do
+    db = INTEGRATION_DB
+    db.drop_table(:items) if db.table_exists?(:items)
+    proc{class ::Item < Sequel::Model(db); end}.should_not raise_error
+    proc{c = Class.new(Sequel::Model); c.set_dataset(db[:items])}.should_not raise_error
+  end
+end

data/spec/integration/plugin_test.rb

@@ -3,28 +3,32 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 # H2 and MSSQL don't support USING joins
 # DB2 does not seem to support USING joins in every version; it seems to be
 # valid expression in DB2 iSeries UDB though.
-unless [:h2, :mssql, :db2].include?(INTEGRATION_DB.database_type)
+unless Sequel.guarded?(:h2, :mssql, :db2)
 describe "Class Table Inheritance Plugin" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.instance_variable_set(:@schemas, {})
-    @db.create_table!(:employees) do
+    [:staff, :executives, :managers, :employees].each{|t| @db.drop_table(t) if @db.table_exists?(t)}
+    @db.create_table(:employees) do
       primary_key :id
       String :name
       String :kind
     end
-    @db.create_table!(:managers) do
+    @db.create_table(:managers) do
       foreign_key :id, :employees, :primary_key=>true
       Integer :num_staff
     end
-    @db.create_table!(:executives) do
+    @db.create_table(:executives) do
       foreign_key :id, :managers, :primary_key=>true
       Integer :num_managers
     end
-    @db.create_table!(:staff) do
+    @db.create_table(:staff) do
       foreign_key :id, :employees, :primary_key=>true
       foreign_key :manager_id, :managers
     end
+  end
+  before do
+    [:staff, :executives, :managers, :employees].each{|t| @db[t].delete}
     class ::Employee < Sequel::Model(@db)
       plugin :class_table_inheritance, :key=>:kind, :table_map=>{:Staff=>:staff}
     end 
@@ -34,7 +38,7 @@ describe "Class Table Inheritance Plugin" do
     class ::Executive < Manager
     end 
     class ::Staff < Employee
-      many_to_one :manager
+      many_to_one :manager, :qualify=>false
     end 
     
     @i1 =@db[:employees].insert(:name=>'E', :kind=>'Employee')
@@ -45,13 +49,13 @@ describe "Class Table Inheritance Plugin" do
     @db[:managers].insert(:id=>@i4, :num_staff=>5)
     @db[:executives].insert(:id=>@i4, :num_managers=>6)
     @db[:staff].insert(:id=>@i2, :manager_id=>@i4)
-    
-    clear_sqls
   end
   after do
-    @db.drop_table :staff, :executives, :managers, :employees
     [:Executive, :Manager, :Staff, :Employee].each{|s| Object.send(:remove_const, s)}
   end
+  after(:all) do
+    @db.drop_table :staff, :executives, :managers, :employees
+  end
 
   specify "should return rows as subclass instances" do
     Employee.order(:id).all.should == [
@@ -122,7 +126,7 @@ describe "Class Table Inheritance Plugin" do
     Staff.limit(1).eager(:manager).all.map{|x| x.manager}.should == [Manager[@i4]]
   end
   
-  cspecify "should handle eagerly graphing many_to_one relationships", :sqlite do
+  specify "should handle eagerly graphing many_to_one relationships" do
     ss = Staff.eager_graph(:manager).all
     ss.should == [Staff[@i2]]
     ss.map{|x| x.manager}.should == [Manager[@i4]]
@@ -145,21 +149,25 @@ end
 end
 
 describe "Many Through Many Plugin" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.instance_variable_set(:@schemas, {})
-    @db.create_table!(:albums) do
+    [:albums_artists, :albums, :artists].each{|t| @db.drop_table(t) if @db.table_exists?(t)}
+    @db.create_table(:albums) do
       primary_key :id
       String :name
     end
-    @db.create_table!(:artists) do
+    @db.create_table(:artists) do
       primary_key :id
       String :name
     end
-    @db.create_table!(:albums_artists) do
+    @db.create_table(:albums_artists) do
       foreign_key :album_id, :albums
       foreign_key :artist_id, :artists
     end
+  end
+  before do
+    [:albums_artists, :albums, :artists].each{|t| @db[t].delete}
     class ::Album < Sequel::Model(@db)
       many_to_many :artists
     end 
@@ -183,26 +191,26 @@ describe "Many Through Many Plugin" do
     @album4 = Album.create(:name=>'D')
     @album4.add_artist(@artist1)
     @album4.add_artist(@artist4)
-    
-    clear_sqls
   end
   after do
-    @db.drop_table :albums_artists, :albums, :artists
     [:Album, :Artist].each{|s| Object.send(:remove_const, s)}
   end
+  after(:all) do
+    @db.drop_table :albums_artists, :albums, :artists
+  end
   
   specify "should handle super simple case with 1 join table" do
     Artist.many_through_many :albums, [[:albums_artists, :artist_id, :album_id]]
-    Artist[1].albums.map{|x| x.name}.sort.should == %w'A D'
-    Artist[2].albums.map{|x| x.name}.sort.should == %w'A C'
-    Artist[3].albums.map{|x| x.name}.sort.should == %w'B C'
-    Artist[4].albums.map{|x| x.name}.sort.should == %w'B D'
+    Artist[@artist1.id].albums.map{|x| x.name}.sort.should == %w'A D'
+    Artist[@artist2.id].albums.map{|x| x.name}.sort.should == %w'A C'
+    Artist[@artist3.id].albums.map{|x| x.name}.sort.should == %w'B C'
+    Artist[@artist4.id].albums.map{|x| x.name}.sort.should == %w'B D'
     
     Artist.plugin :prepared_statements_associations
-    Artist[1].albums.map{|x| x.name}.sort.should == %w'A D'
-    Artist[2].albums.map{|x| x.name}.sort.should == %w'A C'
-    Artist[3].albums.map{|x| x.name}.sort.should == %w'B C'
-    Artist[4].albums.map{|x| x.name}.sort.should == %w'B D'
+    Artist[@artist1.id].albums.map{|x| x.name}.sort.should == %w'A D'
+    Artist[@artist2.id].albums.map{|x| x.name}.sort.should == %w'A C'
+    Artist[@artist3.id].albums.map{|x| x.name}.sort.should == %w'B C'
+    Artist[@artist4.id].albums.map{|x| x.name}.sort.should == %w'B D'
 
     Artist.filter(:id=>1).eager(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.should == %w'A D'
     Artist.filter(:id=>2).eager(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.should == %w'A C'
@@ -236,26 +244,26 @@ describe "Many Through Many Plugin" do
 
   specify "should handle typical case with 3 join tables" do
     Artist.many_through_many :related_artists, [[:albums_artists, :artist_id, :album_id], [:albums, :id, :id], [:albums_artists, :album_id, :artist_id]], :class=>Artist, :distinct=>true
-    Artist[1].related_artists.map{|x| x.name}.sort.should == %w'1 2 4'
-    Artist[2].related_artists.map{|x| x.name}.sort.should == %w'1 2 3'
-    Artist[3].related_artists.map{|x| x.name}.sort.should == %w'2 3 4'
-    Artist[4].related_artists.map{|x| x.name}.sort.should == %w'1 3 4'
+    Artist[@artist1.id].related_artists.map{|x| x.name}.sort.should == %w'1 2 4'
+    Artist[@artist2.id].related_artists.map{|x| x.name}.sort.should == %w'1 2 3'
+    Artist[@artist3.id].related_artists.map{|x| x.name}.sort.should == %w'2 3 4'
+    Artist[@artist4.id].related_artists.map{|x| x.name}.sort.should == %w'1 3 4'
     
     Artist.plugin :prepared_statements_associations
-    Artist[1].related_artists.map{|x| x.name}.sort.should == %w'1 2 4'
-    Artist[2].related_artists.map{|x| x.name}.sort.should == %w'1 2 3'
-    Artist[3].related_artists.map{|x| x.name}.sort.should == %w'2 3 4'
-    Artist[4].related_artists.map{|x| x.name}.sort.should == %w'1 3 4'
+    Artist[@artist1.id].related_artists.map{|x| x.name}.sort.should == %w'1 2 4'
+    Artist[@artist2.id].related_artists.map{|x| x.name}.sort.should == %w'1 2 3'
+    Artist[@artist3.id].related_artists.map{|x| x.name}.sort.should == %w'2 3 4'
+    Artist[@artist4.id].related_artists.map{|x| x.name}.sort.should == %w'1 3 4'
     
-    Artist.filter(:id=>1).eager(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 2 4'
-    Artist.filter(:id=>2).eager(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 2 3'
-    Artist.filter(:id=>3).eager(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'2 3 4'
-    Artist.filter(:id=>4).eager(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 3 4'
+    Artist.filter(:id=>@artist1.id).eager(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 2 4'
+    Artist.filter(:id=>@artist2.id).eager(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 2 3'
+    Artist.filter(:id=>@artist3.id).eager(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'2 3 4'
+    Artist.filter(:id=>@artist4.id).eager(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 3 4'
     
-    Artist.filter(:artists__id=>1).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 2 4'
-    Artist.filter(:artists__id=>2).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 2 3'
-    Artist.filter(:artists__id=>3).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'2 3 4'
-    Artist.filter(:artists__id=>4).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 3 4'
+    Artist.filter(:artists__id=>@artist1.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 2 4'
+    Artist.filter(:artists__id=>@artist2.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 2 3'
+    Artist.filter(:artists__id=>@artist3.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'2 3 4'
+    Artist.filter(:artists__id=>@artist4.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.should == %w'1 3 4'
 
     Artist.filter(:related_artists=>@artist1).all.map{|a| a.name}.sort.should == %w'1 2 4'
     Artist.filter(:related_artists=>@artist2).all.map{|a| a.name}.sort.should == %w'1 2 3'
@@ -285,26 +293,26 @@ describe "Many Through Many Plugin" do
     @album4.add_artist(@artist3)
     @album4.add_artist(@artist4)
     
-    Artist[1].related_albums.map{|x| x.name}.sort.should == %w'A B C'
-    Artist[2].related_albums.map{|x| x.name}.sort.should == %w'A B C D'
-    Artist[3].related_albums.map{|x| x.name}.sort.should == %w'A B D'
-    Artist[4].related_albums.map{|x| x.name}.sort.should == %w'B D'
+    Artist[@artist1.id].related_albums.map{|x| x.name}.sort.should == %w'A B C'
+    Artist[@artist2.id].related_albums.map{|x| x.name}.sort.should == %w'A B C D'
+    Artist[@artist3.id].related_albums.map{|x| x.name}.sort.should == %w'A B D'
+    Artist[@artist4.id].related_albums.map{|x| x.name}.sort.should == %w'B D'
     
     Artist.plugin :prepared_statements_associations
-    Artist[1].related_albums.map{|x| x.name}.sort.should == %w'A B C'
-    Artist[2].related_albums.map{|x| x.name}.sort.should == %w'A B C D'
-    Artist[3].related_albums.map{|x| x.name}.sort.should == %w'A B D'
-    Artist[4].related_albums.map{|x| x.name}.sort.should == %w'B D'
+    Artist[@artist1.id].related_albums.map{|x| x.name}.sort.should == %w'A B C'
+    Artist[@artist2.id].related_albums.map{|x| x.name}.sort.should == %w'A B C D'
+    Artist[@artist3.id].related_albums.map{|x| x.name}.sort.should == %w'A B D'
+    Artist[@artist4.id].related_albums.map{|x| x.name}.sort.should == %w'B D'
     
-    Artist.filter(:id=>1).eager(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B C'
-    Artist.filter(:id=>2).eager(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B C D'
-    Artist.filter(:id=>3).eager(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B D'
-    Artist.filter(:id=>4).eager(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'B D'
+    Artist.filter(:id=>@artist1.id).eager(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B C'
+    Artist.filter(:id=>@artist2.id).eager(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B C D'
+    Artist.filter(:id=>@artist3.id).eager(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B D'
+    Artist.filter(:id=>@artist4.id).eager(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'B D'
     
-    Artist.filter(:artists__id=>1).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B C'
-    Artist.filter(:artists__id=>2).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B C D'
-    Artist.filter(:artists__id=>3).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B D'
-    Artist.filter(:artists__id=>4).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'B D'
+    Artist.filter(:artists__id=>@artist1.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B C'
+    Artist.filter(:artists__id=>@artist2.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B C D'
+    Artist.filter(:artists__id=>@artist3.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'A B D'
+    Artist.filter(:artists__id=>@artist4.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.should == %w'B D'
 
     Artist.filter(:related_albums=>@album1).all.map{|a| a.name}.sort.should == %w'1 2 3'
     Artist.filter(:related_albums=>@album2).all.map{|a| a.name}.sort.should == %w'1 2 3 4'
@@ -328,19 +336,20 @@ describe "Many Through Many Plugin" do
 end
 
 describe "Lazy Attributes plugin" do 
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:items) do
       primary_key :id
       String :name
       Integer :num
     end
+    @db[:items].delete
     class ::Item < Sequel::Model(@db)
       plugin :lazy_attributes, :num
     end
     Item.create(:name=>'J', :num=>1)
   end
-  after do
+  after(:all) do
     @db.drop_table(:items)
     Object.send(:remove_const, :Item)
   end
@@ -373,7 +382,7 @@ describe "Lazy Attributes plugin" do
 end
 
 describe "Tactical Eager Loading Plugin" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.instance_variable_set(:@schemas, {})
     @db.create_table!(:artists) do
@@ -385,6 +394,10 @@ describe "Tactical Eager Loading Plugin" do
       String :name
       foreign_key :artist_id, :artists
     end
+  end
+  before do
+    @db[:albums].delete
+    @db[:artists].delete
     class ::Album < Sequel::Model(@db)
       plugin :tactical_eager_loading
       many_to_one :artist
@@ -402,13 +415,13 @@ describe "Tactical Eager Loading Plugin" do
     @album2 = Album.create(:name=>'B', :artist=>@artist1)
     @album3 = Album.create(:name=>'C', :artist=>@artist2)
     @album4 = Album.create(:name=>'D', :artist=>@artist3)
-    
-    clear_sqls
   end
   after do
-    @db.drop_table :albums, :artists
     [:Album, :Artist].each{|s| Object.send(:remove_const, s)}
   end
+  after(:all) do
+    @db.drop_table :albums, :artists
+  end
 
   specify "should eagerly load associations for all items when accessing any item" do
     a = Artist.order(:name).all
@@ -456,7 +469,7 @@ describe "Identity Map plugin" do
 end
 
 describe "Touch plugin" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.instance_variable_set(:@schemas, {})
     @db.create_table!(:artists) do
@@ -470,6 +483,10 @@ describe "Touch plugin" do
       foreign_key :artist_id, :artists
       DateTime :updated_at
     end
+  end
+  before do
+    @db[:albums].delete
+    @db[:artists].delete
     class ::Album < Sequel::Model(@db)
       many_to_one :artist
       plugin :touch, :associations=>:artist
@@ -481,9 +498,11 @@ describe "Touch plugin" do
     @album = Album.create(:name=>'A', :artist=>@artist)
   end
   after do
-    @db.drop_table :albums, :artists
     [:Album, :Artist].each{|s| Object.send(:remove_const, s)}
   end
+  after(:all) do
+    @db.drop_table :albums, :artists
+  end
 
   specify "should update the timestamp column when touching the record" do
     @album.updated_at.should == nil
@@ -538,7 +557,7 @@ describe "Serialization plugin" do
 end
 
 describe "OptimisticLocking plugin" do 
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:people) do
       primary_key :id
@@ -547,30 +566,33 @@ describe "OptimisticLocking plugin" do
     end
     class ::Person < Sequel::Model(@db)
       plugin :optimistic_locking
-      create(:name=>'John')
     end
   end
-  after do
+  before do
+    @db[:people].delete
+    @p = Person.create(:name=>'John')
+  end
+  after(:all) do
     @db.drop_table(:people)
     Object.send(:remove_const, :Person)
   end
 
   specify "should raise an error when updating a stale record" do
-    p1 = Person[1]
-    p2 = Person[1]
+    p1 = Person[@p.id]
+    p2 = Person[@p.id]
     p1.update(:name=>'Jim')
     proc{p2.update(:name=>'Bob')}.should raise_error(Sequel::Plugins::OptimisticLocking::Error)
   end
 
   specify "should raise an error when destroying a stale record" do
-    p1 = Person[1]
-    p2 = Person[1]
+    p1 = Person[@p.id]
+    p2 = Person[@p.id]
     p1.update(:name=>'Jim')
     proc{p2.destroy}.should raise_error(Sequel::Plugins::OptimisticLocking::Error)
   end
 
   specify "should not raise an error when updating the same record twice" do
-    p1 = Person[1]
+    p1 = Person[@p.id]
     p1.update(:name=>'Jim')
     proc{p1.update(:name=>'Bob')}.should_not raise_error
   end
@@ -630,9 +652,9 @@ describe "Composition plugin" do
 end
 
 # DB2's implemention of CTE is too limited to use this plugin
-if INTEGRATION_DB.dataset.supports_cte? and INTEGRATION_DB.database_type != :db2
+if INTEGRATION_DB.dataset.supports_cte? and !Sequel.guarded?(:db2)
   describe "RcteTree Plugin" do
-    before do
+    before(:all) do
       @db = INTEGRATION_DB
       @db.create_table!(:nodes) do
         primary_key :id
@@ -643,21 +665,25 @@ if INTEGRATION_DB.dataset.supports_cte? and INTEGRATION_DB.database_type != :db2
         plugin :rcte_tree, :order=>:name
       end
       
-      @a = Node.create(:name=>'a')
-      @b = Node.create(:name=>'b')
-      @aa = Node.create(:name=>'aa', :parent=>@a)
-      @ab = Node.create(:name=>'ab', :parent=>@a)
-      @ba = Node.create(:name=>'ba', :parent=>@b)
-      @bb = Node.create(:name=>'bb', :parent=>@b)
-      @aaa = Node.create(:name=>'aaa', :parent=>@aa)
-      @aab = Node.create(:name=>'aab', :parent=>@aa)
-      @aba = Node.create(:name=>'aba', :parent=>@ab)
-      @abb = Node.create(:name=>'abb', :parent=>@ab)
-      @aaaa = Node.create(:name=>'aaaa', :parent=>@aaa)
-      @aaab = Node.create(:name=>'aaab', :parent=>@aaa)
-      @aaaaa = Node.create(:name=>'aaaaa', :parent=>@aaaa)
-    end
-    after do
+      @nodes = []
+      @nodes << @a = Node.create(:name=>'a')
+      @nodes << @b = Node.create(:name=>'b')
+      @nodes << @aa = Node.create(:name=>'aa', :parent=>@a)
+      @nodes << @ab = Node.create(:name=>'ab', :parent=>@a)
+      @nodes << @ba = Node.create(:name=>'ba', :parent=>@b)
+      @nodes << @bb = Node.create(:name=>'bb', :parent=>@b)
+      @nodes << @aaa = Node.create(:name=>'aaa', :parent=>@aa)
+      @nodes << @aab = Node.create(:name=>'aab', :parent=>@aa)
+      @nodes << @aba = Node.create(:name=>'aba', :parent=>@ab)
+      @nodes << @abb = Node.create(:name=>'abb', :parent=>@ab)
+      @nodes << @aaaa = Node.create(:name=>'aaaa', :parent=>@aaa)
+      @nodes << @aaab = Node.create(:name=>'aaab', :parent=>@aaa)
+      @nodes << @aaaaa = Node.create(:name=>'aaaaa', :parent=>@aaaa)
+    end
+    before do
+      @nodes.each{|n| n.associations.clear}
+    end
+    after(:all) do
       @db.drop_table :nodes
       Object.send(:remove_const, :Node)
     end
@@ -734,13 +760,15 @@ if INTEGRATION_DB.dataset.supports_cte? and INTEGRATION_DB.database_type != :db2
     end
 
     specify "should work correctly if not all columns are selected" do
-      Node.plugin :lazy_attributes, :name
-      @aaaa.descendants.should == [Node.load(:parent_id=>11, :id=>13)]
-      @aa.ancestors.should == [Node.load(:parent_id=>nil, :id=>1)]
-      nodes = Node.filter(:id=>[@a.id, @b.id, @aaa.id]).order(:name).eager(:ancestors, :descendants).all
-      nodes.should == [{:parent_id=>nil, :id=>1}, {:parent_id=>3, :id=>7}, {:parent_id=>nil, :id=>2}].map{|x| Node.load(x)}
-      nodes[2].descendants.should == [{:parent_id=>2, :id=>5}, {:parent_id=>2, :id=>6}].map{|x| Node.load(x)}
-      nodes[1].ancestors.should == [{:parent_id=>nil, :id=>1}, {:parent_id=>1, :id=>3}].map{|x| Node.load(x)}
+      c = Class.new(Sequel::Model(@db[:nodes]))
+      c.plugin :rcte_tree, :order=>:name
+      c.plugin :lazy_attributes, :name
+      c[:name=>'aaaa'].descendants.should == [c.load(:parent_id=>11, :id=>13)]
+      c[:name=>'aa'].ancestors.should == [c.load(:parent_id=>nil, :id=>1)]
+      nodes = c.filter(:id=>[@a.id, @b.id, @aaa.id]).order(:name).eager(:ancestors, :descendants).all
+      nodes.should == [{:parent_id=>nil, :id=>1}, {:parent_id=>3, :id=>7}, {:parent_id=>nil, :id=>2}].map{|x| c.load(x)}
+      nodes[2].descendants.should == [{:parent_id=>2, :id=>5}, {:parent_id=>2, :id=>6}].map{|x| c.load(x)}
+      nodes[1].ancestors.should == [{:parent_id=>nil, :id=>1}, {:parent_id=>1, :id=>3}].map{|x| c.load(x)}
     end
     
     specify "should eagerly load descendants to a given level" do
@@ -858,7 +886,7 @@ if INTEGRATION_DB.dataset.supports_cte? and INTEGRATION_DB.database_type != :db2
 end
 
 describe "Instance Filters plugin" do 
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:items) do
       primary_key :id
@@ -869,11 +897,14 @@ describe "Instance Filters plugin" do
     class ::Item < Sequel::Model(@db)
       plugin :instance_filters
     end
+  end
+  before do
+    @db[:items].delete
     @i = Item.create(:name=>'J', :number=>1, :cost=>2)
     @i.instance_filter(:number=>1)
     @i.set(:name=>'K')
   end
-  after do
+  after(:all) do
     @db.drop_table(:items)
     Object.send(:remove_const, :Item)
   end
@@ -918,20 +949,23 @@ describe "Instance Filters plugin" do
 end
 
 describe "UpdatePrimaryKey plugin" do 
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:t) do
       Integer :a, :primary_key=>true
       Integer :b
     end
     @ds = @db[:t]
-    @ds.insert(:a=>1, :b=>3)
     @c = Class.new(Sequel::Model(@ds))
     @c.set_primary_key(:a)
     @c.unrestrict_primary_key
     @c.plugin :update_primary_key
   end
-  after do
+  before do
+    @ds.delete
+    @ds.insert(:a=>1, :b=>3)
+  end
+  after(:all) do
     @db.drop_table(:t)
   end
 
@@ -973,22 +1007,23 @@ describe "UpdatePrimaryKey plugin" do
 end
 
 describe "AssociationPks plugin" do 
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
-    @db.create_table!(:artists) do
+    [:albums_tags, :tags, :albums, :artists].each{|t| @db.drop_table(t) if @db.table_exists?(t)}
+    @db.create_table(:artists) do
       primary_key :id
       String :name
     end
-    @db.create_table!(:albums) do
+    @db.create_table(:albums) do
       primary_key :id
       String :name
       foreign_key :artist_id, :artists
     end
-    @db.create_table!(:tags) do
+    @db.create_table(:tags) do
       primary_key :id
       String :name
     end
-    @db.create_table!(:albums_tags) do
+    @db.create_table(:albums_tags) do
       foreign_key :album_id, :albums
       foreign_key :tag_id, :tags
     end
@@ -1002,7 +1037,9 @@ describe "AssociationPks plugin" do
     end 
     class ::Tag < Sequel::Model
     end 
-    
+  end
+  before do
+    [:albums_tags, :tags, :albums, :artists].each{|t| @db[t].delete}
     @ar1 =@db[:artists].insert(:name=>'YJM')
     @ar2 =@db[:artists].insert(:name=>'AS')
     @al1 =@db[:albums].insert(:name=>'RF', :artist_id=>@ar1)
@@ -1015,7 +1052,7 @@ describe "AssociationPks plugin" do
       tids.each{|tid| @db[:albums_tags].insert([aid, tid])}
     end
   end
-  after do
+  after(:all) do
     @db.drop_table :albums_tags, :tags, :albums, :artists
     [:Artist, :Album, :Tag].each{|s| Object.send(:remove_const, s)}
   end
@@ -1069,9 +1106,9 @@ end
 
 
 describe "List plugin without a scope" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
-    @db.create_table :sites do
+    @db.create_table!(:sites) do
       primary_key :id
       String :name
       Integer :position
@@ -1079,13 +1116,14 @@ describe "List plugin without a scope" do
 
     @c = Class.new(Sequel::Model(@db[:sites]))
     @c.plugin :list
+  end
+  before do
     @c.delete
     @c.create :name => "hig", :position => 3
     @c.create :name => "def", :position => 2
     @c.create :name => "abc", :position => 1
   end
-
-  after do
+  after(:all) do
     @db.drop_table(:sites)
   end
 
@@ -1142,9 +1180,9 @@ describe "List plugin without a scope" do
 end
 
 describe "List plugin with a scope" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
-    @db.create_table :pages do
+    @db.create_table!(:pages) do
       primary_key :id
       String :name
       Integer :pos
@@ -1153,6 +1191,9 @@ describe "List plugin with a scope" do
 
     @c = Class.new(Sequel::Model(@db[:pages]))
     @c.plugin :list, :field => :pos, :scope => :parent_id
+  end
+  before do
+    @c.delete
     p1 = @c.create :name => "Hm", :pos => 1, :parent_id => 0
     p2 = @c.create :name => "Ps", :pos => 1, :parent_id => p1.id
     @c.create :name => "P1", :pos => 1, :parent_id => p2.id
@@ -1160,8 +1201,7 @@ describe "List plugin with a scope" do
     @c.create :name => "P3", :pos => 3, :parent_id => p2.id
     @c.create :name => "Au", :pos => 2, :parent_id => p1.id
   end
-
-  after do
+  after(:all) do
     @db.drop_table(:pages)
   end
 
@@ -1218,12 +1258,12 @@ describe "List plugin with a scope" do
 end
 
 describe "Sequel::Plugins::Tree" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
   end
 
   describe "with natural database order" do
-    before do
+    before(:all) do
       @db.create_table!(:nodes) do
         Integer :id, :primary_key=>true
         String :name
@@ -1249,7 +1289,7 @@ describe "Sequel::Plugins::Tree" do
         plugin :tree
       end
     end
-    after do
+    after(:all) do
       @db.drop_table(:nodes)
       Object.send(:remove_const, :Node)
     end
@@ -1324,12 +1364,12 @@ describe "Sequel::Plugins::Tree" do
     end
 
     describe "Nodes in specified order" do
-      before do
+      before(:all) do
         class ::OrderedNode < Sequel::Model(:nodes)
           plugin :tree, :order => :position
         end
       end
-      after do
+      after(:all) do
         Object.send(:remove_const, :OrderedNode)
       end
 
@@ -1347,7 +1387,7 @@ describe "Sequel::Plugins::Tree" do
   end
 
   describe "Lorems in specified order" do
-    before do
+    before(:all) do
       @db.create_table!(:lorems) do
         Integer :id, :primary_key=>true
         String :name
@@ -1365,7 +1405,7 @@ describe "Sequel::Plugins::Tree" do
         plugin :tree, :key => :ipsum_id, :order => :neque
       end
     end
-    after do
+    after(:all) do
       @db.drop_table(:lorems)
       Object.send(:remove_const, :Lorem)
     end
@@ -1383,7 +1423,7 @@ describe "Sequel::Plugins::Tree" do
 end
 
 describe "Sequel::Plugins::PreparedStatements" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:ps_test) do
       primary_key :id
@@ -1391,11 +1431,14 @@ describe "Sequel::Plugins::PreparedStatements" do
       Integer :i
     end
     @c = Class.new(Sequel::Model(@db[:ps_test]))
+    @c.plugin :prepared_statements_with_pk
+  end
+  before do
+    @c.delete
     @foo = @c.create(:name=>'foo', :i=>10)
     @bar = @c.create(:name=>'bar', :i=>20)
-    @c.plugin :prepared_statements_with_pk
   end
-  after do
+  after(:all) do
     @db.drop_table(:ps_test)
   end
 
@@ -1403,19 +1446,23 @@ describe "Sequel::Plugins::PreparedStatements" do
     @c[@foo.id].should == @foo
     @c[@bar.id].should == @bar
     @c[0].should == nil
+    @c[nil].should == nil
   end
 
   it "should work with looking up using Dataset#with_pk" do 
     @c.dataset.with_pk(@foo.id).should == @foo
     @c.dataset.with_pk(@bar.id).should == @bar
     @c.dataset.with_pk(0).should == nil
+    @c.dataset.with_pk(nil).should == nil
 
     @c.dataset.filter(:i=>0).with_pk(@foo.id).should == nil
     @c.dataset.filter(:i=>10).with_pk(@foo.id).should == @foo
     @c.dataset.filter(:i=>20).with_pk(@bar.id).should == @bar
+    @c.dataset.filter(:i=>10).with_pk(nil).should == nil
     @c.dataset.filter(:name=>'foo').with_pk(@foo.id).should == @foo
     @c.dataset.filter(:name=>'bar').with_pk(@bar.id).should == @bar
     @c.dataset.filter(:name=>'baz').with_pk(@bar.id).should == nil
+    @c.dataset.filter(:name=>'bar').with_pk(nil).should == nil
   end
 
   it "should work with Model#destroy" do 
@@ -1432,6 +1479,8 @@ describe "Sequel::Plugins::PreparedStatements" do
     @c[@foo.id].should == @c.load(:id=>@foo.id, :name=>'foo3', :i=>30)
     @foo.update(:i=>40)
     @c[@foo.id].should == @c.load(:id=>@foo.id, :name=>'foo3', :i=>40)
+    @foo.update(:i=>nil)
+    @c[@foo.id].should == @c.load(:id=>@foo.id, :name=>'foo3', :i=>nil)
   end
 
   it "should work with Model#create" do 
@@ -1441,5 +1490,7 @@ describe "Sequel::Plugins::PreparedStatements" do
     @c[o.id].should == @c.load(:id=>o.id, :name=>'foo2', :i=>nil)
     o = @c.create(:i=>30)
     @c[o.id].should == @c.load(:id=>o.id, :name=>nil, :i=>30)
+    o = @c.create(:name=>nil, :i=>40)
+    @c[o.id].should == @c.load(:id=>o.id, :name=>nil, :i=>40)
   end
 end