sequel 3.44.0 → 3.45.0

data/spec/extensions/spec_helper.rb

@@ -8,14 +8,20 @@ if defined?(RSpec)
   end
 end
 
+if ENV['COVERAGE']
+  require File.join(File.dirname(File.expand_path(__FILE__)), "../sequel_coverage")
+  SimpleCov.sequel_coverage(:filter=>%r{lib/sequel/(extensions|plugins)/\w+\.rb\z})
+end
+
 unless Object.const_defined?('Sequel') && Sequel.const_defined?('Model')
   $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/no_core_ext'
 end
 
 begin
-  # Attempt to load ActiveSupport inflector first, so Sequel inflector
-  # can override it.
+  # Attempt to load ActiveSupport blank extension and inflector first, so Sequel
+  # can override them.
+  require 'active_support/core_ext/object/blank'
   require 'active_support/inflector'
   require 'active_support/core_ext/string/inflections'
 rescue LoadError

data/spec/extensions/sql_expr_spec.rb

@@ -14,7 +14,7 @@ describe "Sequel sql_expr extension" do
     @ds.literal(s & true).should == "(foo AND 't')"
     @ds.literal(s < 1).should == "(foo < 1)"
     @ds.literal(s.sql_subscript(1)).should == "foo[1]"
-    @ds.literal(s.like('a')).should == "(foo LIKE 'a')"
+    @ds.literal(s.like('a')).should == "(foo LIKE 'a' ESCAPE '\\')"
     @ds.literal(s.as(:a)).should == "foo AS a"
     @ds.literal(s.cast(Integer)).should == "CAST(foo AS integer)"
     @ds.literal(s.desc).should == "foo DESC"

data/spec/extensions/unlimited_update_spec.rb

@@ -0,0 +1,20 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "Sequel::Plugins::UnlimitedUpdate" do
+  before do
+    @db = Sequel.mock(:host=>'mysql', :numrows=>1)
+    @c = Class.new(Sequel::Model(@db[:test]))
+    @c.columns :id, :name
+    @o = @c.load(:id=>1, :name=>'a')
+    @db.sqls
+  end
+
+  it "should remove limit from update dataset" do
+    @o.save
+    @db.sqls.should == ["UPDATE test SET name = 'a' WHERE (id = 1) LIMIT 1"]
+
+    @c.plugin :unlimited_update
+    @o.save
+    @db.sqls.should == ["UPDATE test SET name = 'a' WHERE (id = 1)"]
+  end
+end

data/spec/extensions/xml_serializer_spec.rb

@@ -8,12 +8,14 @@ else
 describe "Sequel::Plugins::XmlSerializer" do
   before do
     class ::Artist < Sequel::Model
+      unrestrict_primary_key
       plugin :xml_serializer
       columns :id, :name
       @db_schema = {:id=>{:type=>:integer}, :name=>{:type=>:string}}
       one_to_many :albums
     end
     class ::Album < Sequel::Model
+      unrestrict_primary_key
       attr_accessor :blah
       plugin :xml_serializer
       columns :id, :name, :artist_id
@@ -39,9 +41,10 @@ describe "Sequel::Plugins::XmlSerializer" do
   it "should round trip successfully for namespaced models" do
     module XmlSerializerTest
       class Artist < Sequel::Model
-      plugin :xml_serializer
-      columns :id, :name
-      @db_schema = {:id=>{:type=>:integer}, :name=>{:type=>:string}}
+        unrestrict_primary_key
+        plugin :xml_serializer
+        columns :id, :name
+        @db_schema = {:id=>{:type=>:integer}, :name=>{:type=>:string}}
       end 
     end
     artist = XmlSerializerTest::Artist.load(:id=>2, :name=>'YJM')
@@ -69,8 +72,8 @@ describe "Sequel::Plugins::XmlSerializer" do
   end
 
   it "should handle the :include option for associations" do
-    Artist.from_xml(@artist.to_xml(:include=>:albums)).albums.should == [@album]
-    Album.from_xml(@album.to_xml(:include=>:artist)).artist.should == @artist
+    Artist.from_xml(@artist.to_xml(:include=>:albums), :associations=>:albums).albums.should == [@album]
+    Album.from_xml(@album.to_xml(:include=>:artist), :associations=>:artist).artist.should == @artist
   end
 
   it "should handle the :include option for arbitrary attributes" do
@@ -78,24 +81,28 @@ describe "Sequel::Plugins::XmlSerializer" do
   end
 
   it "should handle multiple inclusions using an array for the :include option" do
-    a = Album.from_xml(@album.to_xml(:include=>[:blah, :artist]))
+    a = Album.from_xml(@album.to_xml(:include=>[:blah, :artist]), :associations=>:artist)
     a.blah.should == @album.blah
     a.artist.should == @artist
   end
 
   it "should handle cascading using a hash for the :include option" do
-    Artist.from_xml(@artist.to_xml(:include=>{:albums=>{:include=>:artist}})).albums.map{|a| a.artist}.should == [@artist]
-    Album.from_xml(@album.to_xml(:include=>{:artist=>{:include=>:albums}})).artist.albums.should == [@album]
+    Artist.from_xml(@artist.to_xml(:include=>{:albums=>{:include=>:artist}}), :associations=>{:albums=>{:associations=>:artist}}).albums.map{|a| a.artist}.should == [@artist]
+    Album.from_xml(@album.to_xml(:include=>{:artist=>{:include=>:albums}}), :associations=>{:artist=>{:associations=>:albums}}).artist.albums.should == [@album]
 
-    Artist.from_xml(@artist.to_xml(:include=>{:albums=>{:only=>:name}})).albums.should == [Album.load(:name=>@album.name)]
-    Album.from_xml(@album.to_xml(:include=>{:artist=>{:except=>:name}})).artist.should == Artist.load(:id=>@artist.id)
+    Artist.from_xml(@artist.to_xml(:include=>{:albums=>{:only=>:name}}), :associations=>{:albums=>{:fields=>%w'name'}}).albums.should == [Album.load(:name=>@album.name)]
+    Album.from_xml(@album.to_xml(:include=>{:artist=>{:except=>:name}}), :associations=>:artist).artist.should == Artist.load(:id=>@artist.id)
 
-    Artist.from_xml(@artist.to_xml(:include=>{:albums=>{:include=>{:artist=>{:include=>:albums}}}})).albums.map{|a| a.artist.albums}.should == [[@album]]
-    Album.from_xml(@album.to_xml(:include=>{:artist=>{:include=>{:albums=>{:only=>:name}}}})).artist.albums.should == [Album.load(:name=>@album.name)]
+    Artist.from_xml(@artist.to_xml(:include=>{:albums=>{:include=>{:artist=>{:include=>:albums}}}}), :associations=>{:albums=>{:associations=>{:artist=>{:associations=>:albums}}}}).albums.map{|a| a.artist.albums}.should == [[@album]]
+    Album.from_xml(@album.to_xml(:include=>{:artist=>{:include=>{:albums=>{:only=>:name}}}}), :associations=>{:artist=>{:associations=>{:albums=>{:fields=>%w'name'}}}}).artist.albums.should == [Album.load(:name=>@album.name)]
   end
 
+  it "should automatically cascade parsing for all associations if :all_associations is used" do
+    Artist.from_xml(@artist.to_xml(:include=>{:albums=>{:include=>:artist}}), :all_associations=>true).albums.map{|a| a.artist}.should == [@artist]
+   end
+  
   it "should handle the :include option cascading with an empty hash" do
-    Album.from_xml(@album.to_xml(:include=>{:artist=>{}})).artist.should == @artist
+    Album.from_xml(@album.to_xml(:include=>{:artist=>{}}), :associations=>:artist).artist.should == @artist
     Album.from_xml(@album.to_xml(:include=>{:blah=>{}})).blah.should == @album.blah
   end
 
@@ -153,7 +160,7 @@ describe "Sequel::Plugins::XmlSerializer" do
     album = @album
     Album.dataset.meta_def(:all){[album]}
     Album.array_from_xml(Album.to_xml).should == [@album]
-    Album.array_from_xml(Album.to_xml(:include=>:artist)).map{|x| x.artist}.should == [@artist]
+    Album.array_from_xml(Album.to_xml(:include=>:artist), :associations=>:artist).map{|x| x.artist}.should == [@artist]
     Album.array_from_xml(Album.dataset.to_xml(:only=>:name)).should == [Album.load(:name=>@album.name)]
   end
 
@@ -162,10 +169,10 @@ describe "Sequel::Plugins::XmlSerializer" do
     Album.array_from_xml(Album.to_xml(:array=>[a])).should == [a]
 
     a.associations[:artist] = artist = Artist.load(:id=>3, :name=>'YJM')
-    Album.array_from_xml(Album.to_xml(:array=>[a], :include=>:artist)).first.artist.should == artist
+    Album.array_from_xml(Album.to_xml(:array=>[a], :include=>:artist), :associations=>:artist).first.artist.should == artist
 
     artist.associations[:albums] = [a]
-    x = Artist.array_from_xml(Artist.to_xml(:array=>[artist], :include=>:albums))
+    x = Artist.array_from_xml(Artist.to_xml(:array=>[artist], :include=>:albums), :associations=>:albums)
     x.should == [artist]
     x.first.albums.should == [a]
   end
@@ -173,5 +180,50 @@ describe "Sequel::Plugins::XmlSerializer" do
   it "should raise an error if the dataset does not have a row_proc" do
     proc{Album.dataset.naked.to_xml}.should raise_error(Sequel::Error)
   end
+
+  it "should have :associations option take precedence over :all_assocations" do
+    Artist.from_xml(@artist.to_xml(:include=>:albums), :associations=>[], :all_associations=>true, :fields=>[]).associations.should == {}
+  end
+
+  it "should allow overriding of :all_columns options in associated objects" do
+    Album.restrict_primary_key
+    Artist.from_xml(@artist.to_xml(:include=>:albums), :associations=>{:albums=>{:fields=>[:id, :name, :artist_id], :missing=>:raise}}, :all_columns=>true).albums
+  end
+
+  it "should allow setting columns that are restricted if :all_columns is used" do
+    Artist.restrict_primary_key
+    Artist.from_xml(@artist.to_xml, :all_columns=>true).should == @artist
+  end
+
+  it "should raise an error if using parsing empty xml" do
+    proc{Artist.from_xml("<?xml version=\"1.0\"?>\n")}.should raise_error(Sequel::Error)
+    proc{Artist.array_from_xml("<?xml version=\"1.0\"?>\n")}.should raise_error(Sequel::Error)
+  end
+
+  it "should raise an error if using :all_columns and non-column is in the XML" do
+    proc{Artist.from_xml("<?xml version=\"1.0\"?>\n<artist>\n  <foo>bar</foo>\n  <id>2</id>\n</artist>\n", :all_columns=>true)}.should raise_error(Sequel::Error)
+  end
+
+  it "should raise an error if attempting to set a restricted column and :all_columns is not used" do
+    Artist.restrict_primary_key
+    proc{Artist.from_xml(@artist.to_xml)}.should raise_error(Sequel::Error)
+  end
+
+  it "should raise an error if an unsupported association is passed in the :associations option" do
+    Artist.association_reflections.delete(:albums)
+    proc{Artist.from_xml(@artist.to_xml(:include=>:albums), :associations=>:albums)}.should raise_error(Sequel::Error)
+  end
+
+  it "should raise an error if using from_xml and XML represents an array" do
+    proc{Artist.from_xml(Artist.to_xml(:array=>[@artist]))}.should raise_error(Sequel::Error)
+  end
+
+  it "should raise an error if using array_from_xml and XML does not represent an array" do
+    proc{Artist.array_from_xml(@artist.to_xml)}.should raise_error(Sequel::Error)
+  end
+
+  it "should raise an error if using an unsupported :associations option" do
+    proc{Artist.from_xml(@artist.to_xml, :associations=>'')}.should raise_error(Sequel::Error)
+  end
 end
 end

data/spec/integration/dataset_test.rb

@@ -1464,6 +1464,34 @@ describe "Dataset string methods" do
     @ds.exclude(Sequel.expr(:a).ilike('FOO', 'BAR')).all.should == []
   end
   
+  it "#escape_like should escape any metacharacters" do
+    @ds.insert('foo', 'bar')
+    @ds.insert('foo.', 'bar..')
+    @ds.insert('foo\\..', 'bar\\..')
+    @ds.insert('foo\\_', 'bar\\%')
+    @ds.insert('foo_', 'bar%')
+    @ds.insert('foo_.', 'bar%.')
+    @ds.insert('foo_..', 'bar%..')
+    @ds.insert('[f#*?oo_]', '[bar%]')
+    @ds.filter(Sequel.expr(:a).like(@ds.escape_like('foo_'))).select_order_map(:a).should == ['foo_']
+    @ds.filter(Sequel.expr(:b).like(@ds.escape_like('bar%'))).select_order_map(:b).should == ['bar%']
+    @ds.filter(Sequel.expr(:a).like(@ds.escape_like('foo\\_'))).select_order_map(:a).should == ['foo\\_']
+    @ds.filter(Sequel.expr(:b).like(@ds.escape_like('bar\\%'))).select_order_map(:b).should == ['bar\\%']
+    @ds.filter(Sequel.expr(:a).like(@ds.escape_like('[f#*?oo_]'))).select_order_map(:a).should == ['[f#*?oo_]']
+    @ds.filter(Sequel.expr(:b).like(@ds.escape_like('[bar%]'))).select_order_map(:b).should == ['[bar%]']
+    @ds.filter(Sequel.expr(:b).like("#{@ds.escape_like('bar%')}_")).select_order_map(:b).should == ['bar%.']
+    @ds.filter(Sequel.expr(:b).like("#{@ds.escape_like('bar%')}%")).select_order_map(:b).should == ['bar%', 'bar%.', 'bar%..']
+
+    @ds.filter(Sequel.expr(:a).ilike(@ds.escape_like('Foo_'))).select_order_map(:a).should == ['foo_']
+    @ds.filter(Sequel.expr(:b).ilike(@ds.escape_like('Bar%'))).select_order_map(:b).should == ['bar%']
+    @ds.filter(Sequel.expr(:a).ilike(@ds.escape_like('Foo\\_'))).select_order_map(:a).should == ['foo\\_']
+    @ds.filter(Sequel.expr(:b).ilike(@ds.escape_like('Bar\\%'))).select_order_map(:b).should == ['bar\\%']
+    @ds.filter(Sequel.expr(:a).ilike(@ds.escape_like('[F#*?oo_]'))).select_order_map(:a).should == ['[f#*?oo_]']
+    @ds.filter(Sequel.expr(:b).ilike(@ds.escape_like('[Bar%]'))).select_order_map(:b).should == ['[bar%]']
+    @ds.filter(Sequel.expr(:b).ilike("#{@ds.escape_like('Bar%')}_")).select_order_map(:b).should == ['bar%.']
+    @ds.filter(Sequel.expr(:b).ilike("#{@ds.escape_like('Bar%')}%")).select_order_map(:b).should == ['bar%', 'bar%.', 'bar%..']
+  end
+  
   if INTEGRATION_DB.dataset.supports_regexp?
     it "#like with regexp return matching rows" do
       @ds.insert('foo', 'bar')

data/spec/integration/spec_helper.rb

@@ -1,5 +1,11 @@
 require 'rubygems'
 require 'logger'
+
+if ENV['COVERAGE']
+  require File.join(File.dirname(File.expand_path(__FILE__)), "../sequel_coverage")
+  SimpleCov.sequel_coverage(:group=>%r{lib/sequel/adapters})
+end
+
 unless Object.const_defined?('Sequel')
   $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/no_core_ext'

data/spec/integration/transaction_test.rb

@@ -310,3 +310,42 @@ if (! defined?(RUBY_ENGINE) or RUBY_ENGINE == 'ruby' or (RUBY_ENGINE == 'rbx' &&
     end
   end
 end
+
+describe "Database transaction retrying" do
+  before(:all) do
+    @db = INTEGRATION_DB
+    @db.create_table!(:items, :engine=>'InnoDB'){String :a, :unique=>true, :null=>false}
+    @d = @db[:items]
+  end
+  before do
+    @d.delete
+  end
+  after(:all) do
+    @db.drop_table?(:items)
+  end
+
+  cspecify "should be supported using the :retry_on option", [:db2] do
+    @d.insert('b')
+    @d.insert('c')
+    s = 'a'
+    @db.transaction(:retry_on=>Sequel::ConstraintViolation) do
+      s = s.succ
+      @d.insert(s)
+    end
+    @d.select_order_map(:a).should == %w'b c d'
+  end
+
+  cspecify "should limit number of retries via the :num_retries option", [:db2] do
+    @d.insert('b')
+    @d.insert('c')
+    s = 'a'
+    lambda do
+      @db.transaction(:num_retries=>1, :retry_on=>Sequel::ConstraintViolation) do
+        s = s.succ
+        @d.insert(s)
+      end
+    end.should raise_error(Sequel::ConstraintViolation)
+    @d.select_order_map(:a).should == %w'b c'
+  end
+end
+

data/spec/model/model_spec.rb

@@ -394,7 +394,7 @@ describe Sequel::Model, ".find" do
     MODEL_DB.sqls.should == ["SELECT * FROM items WHERE (name = 'sharon') LIMIT 1"]
 
     @c.find(Sequel.expr(:name).like('abc%')).should be_a_kind_of(@c)
-    MODEL_DB.sqls.should == ["SELECT * FROM items WHERE (name LIKE 'abc%') LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT * FROM items WHERE (name LIKE 'abc%' ESCAPE '\\') LIMIT 1"]
   end
   
   specify "should accept filter blocks" do

data/spec/sequel_coverage.rb

@@ -0,0 +1,15 @@
+require 'coverage'
+require 'simplecov'
+
+def SimpleCov.sequel_coverage(opts = {})
+  start do
+    add_filter "/spec/"
+    add_group('Missing-Revelent'){|src| src.filename =~ opts[:group] && src.covered_percent < 100} if opts[:group]
+    add_group('Missing'){|src| src.covered_percent < 100}
+    add_group('Covered'){|src| src.covered_percent == 100}
+    add_filter{|src| src.filename !~ opts[:filter]} if opts[:filter]
+    yield self if block_given?
+  end
+end
+
+ENV.delete('COVERAGE')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 3.44.0
+  version: 3.45.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -107,6 +107,7 @@ extra_rdoc_files:
 - doc/release_notes/3.42.0.txt
 - doc/release_notes/3.43.0.txt
 - doc/release_notes/3.44.0.txt
+- doc/release_notes/3.45.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -188,6 +189,7 @@ files:
 - doc/release_notes/3.42.0.txt
 - doc/release_notes/3.43.0.txt
 - doc/release_notes/3.44.0.txt
+- doc/release_notes/3.45.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc
@@ -265,6 +267,7 @@ files:
 - spec/extensions/association_pks_spec.rb
 - spec/extensions/json_serializer_spec.rb
 - spec/extensions/eager_each_spec.rb
+- spec/extensions/pg_json_spec.rb
 - spec/extensions/list_spec.rb
 - spec/extensions/tree_spec.rb
 - spec/extensions/xml_serializer_spec.rb
@@ -293,7 +296,6 @@ files:
 - spec/extensions/static_cache_spec.rb
 - spec/extensions/query_literals_spec.rb
 - spec/extensions/dirty_spec.rb
-- spec/extensions/pg_json_spec.rb
 - spec/extensions/pg_inet_spec.rb
 - spec/extensions/eval_inspect_spec.rb
 - spec/extensions/pg_range_spec.rb
@@ -311,6 +313,7 @@ files:
 - spec/extensions/validation_class_methods_spec.rb
 - spec/extensions/meta_def_spec.rb
 - spec/extensions/core_refinements_spec.rb
+- spec/extensions/unlimited_update_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
@@ -384,6 +387,7 @@ files:
 - spec/files/transaction_unspecified_migrations/001_create_alt_basic.rb
 - spec/files/transaction_unspecified_migrations/002_create_basic.rb
 - spec/core_extensions_spec.rb
+- spec/sequel_coverage.rb
 - lib/sequel.rb
 - lib/sequel/adapters/ado.rb
 - lib/sequel/adapters/ado/mssql.rb
@@ -576,6 +580,7 @@ files:
 - lib/sequel/plugins/pg_row.rb
 - lib/sequel/plugins/pg_typecast_on_load.rb
 - lib/sequel/plugins/constraint_validations.rb
+- lib/sequel/plugins/unlimited_update.rb
 - lib/sequel/timezones.rb
 - lib/sequel/ast_transformer.rb
 - lib/sequel/no_core_ext.rb