sequel 3.29.0 → 3.30.0

data/spec/model/eager_loading_spec.rb

@@ -740,6 +740,14 @@ describe Sequel::Model, "#eager_graph" do
     ds.all.should == [GraphAlbum.load(:id=>1, :band_id=>2, :band_id_0=>2, :vocalist_id=>3)]
   end
 
+  it "should not modify existing dataset" do
+    ds1 = GraphAlbum.dataset
+    ds2 = ds1.eager_graph(:band)
+    proc{ds1.eager_graph(:band)}.should_not raise_error
+    proc{ds2.eager_graph(:tracks)}.should_not raise_error
+    proc{ds2.eager_graph(:tracks)}.should_not raise_error
+  end
+
   it "should eagerly load a single many_to_one association" do
     ds = GraphAlbum.eager_graph(:band)
     ds.sql.should == 'SELECT albums.id, albums.band_id, band.id AS band_id_0, band.vocalist_id FROM albums LEFT OUTER JOIN bands AS band ON (band.id = albums.band_id)'
@@ -1081,6 +1089,14 @@ describe Sequel::Model, "#eager_graph" do
     GraphAlbum.eager_graph(:inner_genres).sql.should == 'SELECT albums.id, albums.band_id FROM albums LEFT OUTER JOIN ag ON (ag.album_id = albums.id) LEFT OUTER JOIN genres AS inner_genres ON (inner_genres.id = ag.genre_id)'
   end
 
+  it "should respect the association's :graph_alias_base option" do 
+    GraphAlbum.many_to_one :inner_band, :class=>'GraphBand', :key=>:band_id, :graph_alias_base=>:foo
+    ds = GraphAlbum.eager_graph(:inner_band)
+    ds.sql.should == 'SELECT albums.id, albums.band_id, foo.id AS foo_id, foo.vocalist_id FROM albums LEFT OUTER JOIN bands AS foo ON (foo.id = albums.band_id)'
+    GraphAlbum.one_to_many :right_tracks, :class=>'GraphTrack', :key=>:album_id, :graph_alias_base=>:foo
+    ds.eager_graph(:right_tracks).sql.should == 'SELECT albums.id, albums.band_id, foo.id AS foo_id, foo.vocalist_id, foo_0.id AS foo_0_id, foo_0.album_id FROM albums LEFT OUTER JOIN bands AS foo ON (foo.id = albums.band_id) LEFT OUTER JOIN tracks AS foo_0 ON (foo_0.album_id = albums.id)'
+  end
+
   it "should respect the association's :graph_join_type option" do 
     GraphAlbum.many_to_one :inner_band, :class=>'GraphBand', :key=>:band_id, :graph_join_type=>:inner
     GraphAlbum.eager_graph(:inner_band).sql.should == 'SELECT albums.id, albums.band_id, inner_band.id AS inner_band_id, inner_band.vocalist_id FROM albums INNER JOIN bands AS inner_band ON (inner_band.id = albums.band_id)'

data/spec/model/model_spec.rb

@@ -214,11 +214,25 @@ describe Sequel::Model, "dataset & schema" do
     proc{@model.set_dataset(Object.new)}.should raise_error(Sequel::Error)
   end
 
-  it "set_dataset should add the destroy method to the dataset" do
+  it "set_dataset should add the destroy method to the dataset that destroys each object" do
     ds = MODEL_DB[:foo]
     ds.should_not respond_to(:destroy)
     @model.set_dataset(ds)
     ds.should respond_to(:destroy)
+    MODEL_DB.sqls
+    ds._fetch = [{:id=>1}, {:id=>2}]
+    ds.destroy.should == 2
+    MODEL_DB.sqls.should == ["SELECT * FROM foo", "DELETE FROM foo WHERE (id = 1)", "DELETE FROM foo WHERE (id = 2)"]
+  end
+
+  it "set_dataset should add the destroy method that respects sharding with transactions" do
+    db = Sequel.mock(:servers=>{:s1=>{}})
+    ds = db[:foo].server(:s1)
+    @model.use_transactions = true
+    @model.set_dataset(ds)
+    db.sqls
+    ds.destroy.should == 0
+    db.sqls.should == ["BEGIN -- s1", "SELECT * FROM foo -- s1", "COMMIT -- s1"]
   end
 
   it "should raise an error on set_dataset if there is an error connecting to the database" do

data/spec/model/record_spec.rb

@@ -270,6 +270,66 @@ describe "Model#save" do
     proc { o.save(:y) }.should raise_error(Sequel::Rollback)
     MODEL_DB.sqls.should == []
   end
+
+  it "should support a :server option to set the server/shard to use" do
+    db = Sequel.mock(:fetch=>{:id=>13, :x=>1}, :autoid=>proc{13}, :numrows=>1, :servers=>{:s1=>{}})
+    c = Class.new(Sequel::Model(db[:items]))
+    c.columns :id, :x
+    db.sqls
+    o = c.new(:x => 1)
+    o.save(:server=>:s1)
+    db.sqls.should == ["INSERT INTO items (x) VALUES (1) -- s1", "SELECT * FROM items WHERE (id = 13) LIMIT 1 -- s1"]
+    o.save(:server=>:s1, :transaction=>true)
+    db.sqls.should == ["BEGIN -- s1", "UPDATE items SET x = 1 WHERE (id = 13) -- s1", 'COMMIT -- s1']
+  end
+end
+
+describe "Model#set_server" do
+  before do
+    @db = Sequel.mock(:fetch=>{:id=>13, :x=>1}, :autoid=>proc{13}, :numrows=>1, :servers=>{:s1=>{}})
+    @c = Class.new(Sequel::Model(@db[:items])) do
+      columns :id, :x
+    end
+    @db.sqls
+  end
+
+  it "should set the server to use when inserting" do
+    @c.new(:x => 1).set_server(:s1).save
+    @db.sqls.should == ["INSERT INTO items (x) VALUES (1) -- s1", "SELECT * FROM items WHERE (id = 13) LIMIT 1 -- s1"]
+  end
+
+  it "should set the server to use when updating" do
+     @c.load(:id=>13, :x => 1).set_server(:s1).save
+    @db.sqls.should == ["UPDATE items SET x = 1 WHERE (id = 13) -- s1"]
+  end
+
+  it "should set the server to use for transactions when saving" do
+    @c.load(:id=>13, :x => 1).set_server(:s1).save(:transaction=>true)
+    @db.sqls.should == ["BEGIN -- s1", "UPDATE items SET x = 1 WHERE (id = 13) -- s1", 'COMMIT -- s1']
+  end
+
+  it "should set the server to use when deleting" do
+    @c.load(:id=>13).set_server(:s1).delete
+    @db.sqls.should == ["DELETE FROM items WHERE (id = 13) -- s1"]
+  end
+
+  it "should set the server to use for transactions when destroying" do
+    o = @c.load(:id=>13).set_server(:s1)
+    o.use_transactions = true
+    o.destroy
+    @db.sqls.should == ["BEGIN -- s1", "DELETE FROM items WHERE (id = 13) -- s1", 'COMMIT -- s1']
+  end
+
+  it "should set the server on this if this is already loaded" do
+    o = @c.load(:id=>13, :x => 1)
+    o.this
+    o.set_server(:s1)
+    o.this.opts[:server].should == :s1
+  end
+
+  it "should set the server on this if this is not already loaded" do
+    @c.load(:id=>13, :x => 1).set_server(:s1).this.opts[:server].should == :s1
+  end
 end
 
 describe "Model#marshallable" do

metadata

@@ -1,30 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sequel
-version: !ruby/object:Gem::Version 
-  hash: 115
+version: !ruby/object:Gem::Version
+  version: 3.30.0
   prerelease: 
-  segments: 
-  - 3
-  - 29
-  - 0
-  version: 3.29.0
 platform: ruby
-authors: 
+authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-01 00:00:00 Z
+date: 2011-12-01 00:00:00.000000000 Z
 dependencies: []
-
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
-executables: 
+executables:
 - sequel
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 - MIT-LICENSE
@@ -96,7 +88,8 @@ extra_rdoc_files:
 - doc/release_notes/3.27.0.txt
 - doc/release_notes/3.28.0.txt
 - doc/release_notes/3.29.0.txt
-files: 
+- doc/release_notes/3.30.0.txt
+files:
 - MIT-LICENSE
 - CHANGELOG
 - README.rdoc
@@ -162,6 +155,7 @@ files:
 - doc/release_notes/3.27.0.txt
 - doc/release_notes/3.28.0.txt
 - doc/release_notes/3.29.0.txt
+- doc/release_notes/3.30.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc
@@ -475,44 +469,33 @@ files:
 - lib/sequel_model.rb
 homepage: http://sequel.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --quiet
 - --line-numbers
 - --inline-source
 - --title
-- "Sequel: The Database Toolkit for Ruby"
+- ! 'Sequel: The Database Toolkit for Ruby'
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 63
-      segments: 
-      - 1
-      - 8
-      - 4
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.4
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sequel
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: The Database Toolkit for Ruby
 test_files: []
-