sequel 3.21.0 → 3.41.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
@@ -12,7 +12,7 @@ describe "Eagerly loading a tree structure" do
       one_to_many :children, :key=>:parent_id
     
       # Only useful when eager loading
-      many_to_one :ancestors, :eager_loader=>(proc do |eo|
+      many_to_one :ancestors, :eager_loader_key=>nil, :eager_loader=>(proc do |eo|
         # Handle cases where the root node has the same parent_id as primary_key
         # and also when it is NULL
         non_root_nodes = eo[:rows].reject do |n| 
@@ -36,7 +36,7 @@ describe "Eagerly loading a tree structure" do
           end
         end
       end)
-      many_to_one :descendants, :eager_loader=>(proc do |eo|
+      many_to_one :descendants, :eager_loader_key=>nil, :eager_loader=>(proc do |eo|
         id_map = {}
         eo[:rows].each do |n|
           # Initialize an empty array of child associations for each parent node
@@ -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
@@ -187,7 +185,7 @@ describe "has_many :through has_many and has_one :through belongs_to" do
           end
         end), \
         :eager_loader=>(proc do |eo|
-          id_map = eo[:key_hash][Firm.primary_key]
+          id_map = eo[:id_map]
           eo[:rows].each{|firm| firm.associations[:invoices] = []}
           Invoice.eager_graph(:client).filter(:client__firm_id=>id_map.keys).all do |inv|
             id_map[inv.client.firm_id].each do |firm|
@@ -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
@@ -336,7 +333,7 @@ describe "Polymorphic Associations" do
       many_to_one :attachable, :reciprocal=>:assets, \
         :dataset=>(proc do
           klass = m.call(attachable_type)
-          klass.filter(klass.primary_key=>attachable_id)
+          klass.where(klass.primary_key=>attachable_id)
         end), \
         :eager_loader=>(proc do |eo|
           id_map = {}
@@ -346,7 +343,7 @@ describe "Polymorphic Associations" do
           end 
           id_map.each do |klass_name, id_map|
             klass = m.call(klass_name)
-            klass.filter(klass.primary_key=>id_map.keys).all do |attach|
+            klass.where(klass.primary_key=>id_map.keys).all do |attach|
               id_map[attach.pk].each do |asset|
                 asset.associations[:attachable] = attach
               end 
@@ -366,25 +363,18 @@ describe "Polymorphic Associations" do
       primary_key :id
     end
     class ::Post < Sequel::Model
-      one_to_many :assets, :key=>:attachable_id, :reciprocal=>:attachable do |ds|
-        ds.filter(:attachable_type=>'Post')
-      end 
+      one_to_many :assets, :key=>:attachable_id, :reciprocal=>:attachable, :conditions=>{:attachable_type=>'Post'}
       
       private
 
       def _add_asset(asset)
-        asset.attachable_id = pk
-        asset.attachable_type = 'Post'
-        asset.save
+        asset.update(:attachable_id=>pk, :attachable_type=>'Post')
       end
       def _remove_asset(asset)
-        asset.attachable_id = nil
-        asset.attachable_type = nil
-        asset.save
+        asset.update(:attachable_id=>nil, :attachable_type=>nil)
       end
       def _remove_all_assets
-        Asset.filter(:attachable_id=>pk, :attachable_type=>'Post')\
-          .update(:attachable_id=>nil, :attachable_type=>nil)
+        assets_dataset.update(:attachable_id=>nil, :attachable_type=>nil)
       end
     end 
   
@@ -392,27 +382,23 @@ describe "Polymorphic Associations" do
       primary_key :id
     end
     class ::Note < Sequel::Model
-      one_to_many :assets, :key=>:attachable_id, :reciprocal=>:attachable do |ds|
-        ds.filter(:attachable_type=>'Note')
-      end 
-      
+      one_to_many :assets, :key=>:attachable_id, :reciprocal=>:attachable, :conditions=>{:attachable_type=>'Note'}     
+
       private
 
       def _add_asset(asset)
-        asset.attachable_id = pk
-        asset.attachable_type = 'Note'
-        asset.save
+        asset.update(:attachable_id=>pk, :attachable_type=>'Note')
       end
       def _remove_asset(asset)
-        asset.attachable_id = nil
-        asset.attachable_type = nil
-        asset.save
+        asset.update(:attachable_id=>nil, :attachable_type=>nil)
       end
       def _remove_all_assets
-        Asset.filter(:attachable_id=>pk, :attachable_type=>'Note')\
-          .update(:attachable_id=>nil, :attachable_type=>nil)
+        assets_dataset.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 +406,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 +468,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
@@ -527,7 +512,7 @@ describe "many_to_one/one_to_many not referencing primary key" do
       many_to_one :client, :key=>:client_name, \
         :dataset=>proc{Client.filter(:name=>client_name)}, \
         :eager_loader=>(proc do |eo|
-          id_map = eo[:key_hash][:client_name]
+          id_map = eo[:id_map]
           eo[:rows].each{|inv| inv.associations[:client] = nil}
           Client.filter(:name=>id_map.keys).all do |client|
             id_map[client.name].each{|inv| inv.associations[:client] = client}
@@ -540,14 +525,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 +605,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
@@ -628,11 +615,11 @@ describe "statistics associations" do
        :dataset=>proc{Ticket.filter(:project_id=>id).select{sum(hours).as(hours)}},
        :eager_loader=>(proc do |eo|
         eo[:rows].each{|p| p.associations[:ticket_hours] = nil}
-        Ticket.filter(:project_id=>eo[:key_hash][:id].keys).
-         group(:project_id).
-         select{[project_id.as(project_id), sum(hours).as(hours)]}.
+        Ticket.filter(:project_id=>eo[:id_map].keys).
+         select_group(:project_id).
+         select_append{sum(hours).as(hours)}.
          all do |t|
-          p = eo[:key_hash][:id][t.values.delete(:project_id)].first
+          p = eo[:id_map][t.values.delete(:project_id)].first
           p.associations[:ticket_hours] = t
          end
        end)  
@@ -658,9 +645,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 +665,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 +689,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/migrator_test.rb

@@ -7,7 +7,7 @@ describe Sequel::Migrator do
     @m = Sequel::Migrator
   end
   after do
-    [:schema_info, :schema_migrations, :sm1111, :sm1122, :sm2222, :sm2233, :sm3333, :sm11111, :sm22222].each{|n| @db.drop_table(n) rescue nil}
+    @db.drop_table?(:schema_info, :schema_migrations, :sm1111, :sm1122, :sm2222, :sm2233, :sm3333, :sm11111, :sm22222)
   end
   
   specify "should be able to migrate up and down all the way successfully" do
@@ -187,8 +187,7 @@ describe Sequel::Migrator do
 
   specify "should handle reversible migrations" do
     @dir = 'spec/files/reversible_migrations'
-    @db.drop_table(:a) rescue nil
-    @db.drop_table(:b) rescue nil
+    @db.drop_table?(:a, :b)
     @m.apply(@db, @dir, 1)
     [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
     [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}

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
@@ -11,7 +11,7 @@ describe "Sequel::Model basic support" do
     end
   end
   after do
-    @db.drop_table(:items)
+    @db.drop_table?(:items)
     Object.send(:remove_const, :Item)
   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)
+    proc{class ::Item < Sequel::Model(db); end; Object.send(:remove_const, :Item)}.should_not raise_error
+    proc{c = Class.new(Sequel::Model); c.set_dataset(db[:items])}.should_not raise_error
+  end
+end