sequel 4.16.0 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 505bc666a3de9a394dd0bb31e07afff6feca86da
-  data.tar.gz: 2082ac9b3731827b5c4e0c39859e8471e706a99d
+  metadata.gz: 1d6fa8ec8783c8834b984323d9e1c73bef006df5
+  data.tar.gz: 40e551bc46ec90be6a411ca2eec0e4114394b03d
 SHA512:
-  metadata.gz: f728df92423ad2e207a2db67d89cc7c79819351973c348845978d7ba93826f33caf21b4251dec609c5fcc48c0c13b55460ac2800f7cd36b328d87463c804cc3a
-  data.tar.gz: 836ab1fb7bc23c595070f15dff4cf300b80d4b4eaf3e024c305d073a84a3a84c19782bef11359e9e96c0cb739206995ac8a4828ece1a5057c66a8c50fee0f87b
+  metadata.gz: 06d6af6daccc3ae11f55e17d6b39472509c3ddd90af821e0e6e353dfab49b6b30ea4c213b4596f46f048a6ff3807bcfc9257a13d08d8ccdc9a52d18478e59e6a
+  data.tar.gz: 6c31bed38421bb9acf75235b01229fe777baeb311fef31554c4b6070454147d37b4a249650e4c6c788602d5550c0db373546af9066a398aa9d01b2882568b810

data/CHANGELOG

@@ -1,3 +1,25 @@
+=== 4.17.0 (2014-12-01)
+
+* Fix handling of Sequel::SQL::Blob instances in bound variables in the postgres adapter (jeremyevans) (#917)
+
+* Add :preconnect Database option for immediately creating the maximum number of connections (jeremyevans)
+
+* Support DB.pool.max_size for the single connection pools (jeremyevans)
+
+* Work around regression in jdbc-sqlite3 3.8.7 where empty blobs are returned as nil (jeremyevans)
+
+* Work around regression in jdbc-sqlite3 3.8.7 when using JDBC getDate method for date parsing (jeremyevans)
+
+* Make Model#update_or_create return object if existing object exists but updates are not necessary (contentfree) (#916)
+
+* Add Dataset#server? for conditionally setting a default server to use if no default is present (jeremyevans)
+
+* Add Database#sharded? for determining if database uses sharding (jeremyevans)
+
+* Fix server used by Dataset#insert_select on PostgreSQL (jeremyevans)
+
+* Fix server used for deleting model instances when using sharding (jeremyevans)
+
 === 4.16.0 (2014-11-01)
 
 * Make Database#create_table? and #create_join_table? not use IF NOT EXISTS if indexes are being added (jeremyevans) (#904)

data/README.rdoc

@@ -20,10 +20,15 @@ toolkit for Ruby.
 
 * {Website}[http://sequel.jeremyevans.net]
 * {Source code}[http://github.com/jeremyevans/sequel]
-* {Bug tracking}[http://github.com/jeremyevans/sequel/issues]
 * {Google group}[http://groups.google.com/group/sequel-talk]
+* {IRC}[irc://irc.freenode.net/sequel]
+* {Bug tracking}[http://github.com/jeremyevans/sequel/issues]
 * {RDoc}[http://sequel.jeremyevans.net/rdoc]
 
+If you have questions about how to use Sequel, please ask on the
+Google Group or IRC.  Only use the the bug tracker to report
+bugs in Sequel, not to ask for help on using Sequel.
+
 To check out the source code:
   
   git clone git://github.com/jeremyevans/sequel.git

data/doc/active_record.rdoc

@@ -756,7 +756,7 @@ ActiveRecord Method :: Notes, Workarounds
 +silence+ :: No equivalent.  Because the logger is handled at the <tt>Sequel::Database</tt> level, there is no thread-safe way to turn it off for specific blocks.
 +scopes+ :: No equivalent
 +sti_name+ :: No equivalent.
-+update_counters+ :: <tt>Album.where(:id=>:id).update(:counter_name=>:counter_name + 1, :other_counter=>:other_counter - 1)</tt>
++update_counters+ :: <tt>Album.where(:id=>:id).update(:counter_name=>Sequel.+(:counter_name, 1), :other_counter=>Sequel.-(:other_counter, 1))</tt>
 +uncached+ :: No equivalent
 
 === Instance Methods with Significantly Different Behavior

data/doc/model_hooks.rdoc

@@ -96,7 +96,7 @@ Sequel does not provide a simple way to turn off the running of save/create/upda
 
 However, you should note that there are plenty of ways to modify the database without saving a model object.  One example is by using plain datasets, or one of the model's dataset methods:
 
-  Album.where(:name=>'RF').update(:copies_sold=>:copies_sold + 1)
+  Album.where(:name=>'RF').update(:copies_sold=>Sequel.+(:copies_sold, 1))
   # UPDATE albums SET copies_sold = copies_sold + 1 WHERE name = 'RF'
 
 In this case, the +update+ method is called on the dataset returned by <tt>Album.where</tt>.  Even if there is only a single object with the name RF, this will not call any hooks.  If you want model hooks to be called, you need to make sure to operate on a model object:

data/doc/querying.rdoc

@@ -292,7 +292,7 @@ in another place.  This is what is meant by a functional style API.
 Let's say we only want to select the id and name columns, and that
 we want to order by name:
 
-  ds3 = ds.order(:name).select(:id, :name)
+  ds3 = ds2.order(:name).select(:id, :name)
   # SELECT id, name FROM artists WHERE name LIKE 'A%' ESCAPE '\' ORDER BY name
   
 Note how you don't need to assign the returned value of order to a variable,

data/doc/release_notes/4.16.0.txt

@@ -5,7 +5,7 @@
 
 * Dataset#distinct now accepts a virtual row block.
 
-* Database#drop_view with :foreign=>true option now drops foreign
+* Database#drop_table with :foreign=>true option now drops foreign
   tables on PostgreSQL.  Database#create_table with :foreign option
   is now reversible on PostgreSQL.
 

data/doc/release_notes/4.17.0.txt

@@ -0,0 +1,38 @@
+= New Features
+
+* A :preconnect Database option has been added, for automatically
+  creating the maximum number of connections to the database on
+  instantiation.  This is useful when there is high latency for
+  initial connection setup, where Sequel's usual approach of
+  connecting as needed can cause pauses at runtime.
+
+* Database#sharded? has been added for checking whether the Database
+  object uses multiple servers. 
+
+* Dataset#server? has been added, for returning a cloned dataset
+  associated with the given server/shard if the dataset does not
+  already have a server set.  This returns the receiver if the
+  server has already been set or the Database is not sharded.
+
+= Other Improvements
+
+* Sequel now uses the correct shard when deleting model instances.
+  Previously, the correct shard was only used in the unoptimized
+  case, not in the optimized case.
+
+* Sequel now uses the correct shard when using Dataset#insert_select
+  on PostgreSQL.  This was first broken in the 4.13.0 release.
+
+* Sequel now correctly handles Sequel::SQL::Blob instances used in
+  bound variables in the postgres adapter.  Previously this resulted
+  in duplicate apostrophes being used.
+
+* When using the jdbc/sqlite3 adapter with jdbc-sqlite3 3.8.7, Sequel
+  now handles date objects and empty blobs correctly, working around
+  bugs in the driver.
+
+= Backwards Compatibility
+
+* In the update_or_create plugin, Model.update_or_create now always
+  returns the object.  Previously it would not return the object if
+  the object already existed but no updates were necessary.

data/lib/sequel/adapters/jdbc/sqlite.rb

@@ -71,10 +71,23 @@ module Sequel
         end
 
         # Use getLong instead of getInt for converting integers on SQLite, since SQLite does not enforce a limit of 2**32.
+        # Work around regressions in jdbc-sqlite 3.8.7 for date and blob types.
         def setup_type_convertor_map
           super
           @type_convertor_map[Java::JavaSQL::Types::INTEGER] = @type_convertor_map[Java::JavaSQL::Types::BIGINT]
           @basic_type_convertor_map[Java::JavaSQL::Types::INTEGER] = @basic_type_convertor_map[Java::JavaSQL::Types::BIGINT]
+          @type_convertor_map[Java::JavaSQL::Types::DATE] = lambda do |r, i|
+            if v = r.getString(i)
+              Sequel.string_to_date(v)
+            end
+          end
+          @type_convertor_map[Java::JavaSQL::Types::BLOB] = lambda do |r, i|
+            if v = r.getBytes(i)
+              Sequel::SQL::Blob.new(String.from_java_bytes(v))
+            elsif !r.wasNull
+              Sequel::SQL::Blob.new('')
+            end
+          end
         end
       end
     end

data/lib/sequel/adapters/postgres.rb

@@ -192,7 +192,7 @@ module Sequel
       def bound_variable_arg(arg, conn)
         case arg
         when Sequel::SQL::Blob
-          conn.escape_bytea(arg)
+          {:value=>arg, :type=>17, :format=>1}
         when Sequel::SQLTime
           literal(arg)
         when DateTime, Time

data/lib/sequel/adapters/shared/postgres.rb

@@ -1329,7 +1329,7 @@ module Sequel
       # inserting a query if disable_insert_returning is used.
       def insert_select(*values)
         return unless supports_insert_select?
-        with_sql_first(insert_select_sql(*values))
+        server?(:default).with_sql_first(insert_select_sql(*values))
       end
 
       # The SQL to use for an insert_select, adds a RETURNING clause to the insert

data/lib/sequel/connection_pool.rb

@@ -13,6 +13,8 @@
 #            connection pool recognizes.
 # size :: an integer representing the total number of connections in the pool,
 #         or for the given shard/server if sharding is supported.
+# max_size :: an integer representing the maximum size of the connection pool,
+#             or the maximum size per shard/server if sharding is supported.
 #
 # For sharded connection pools, the sharded API adds the following methods:
 #
@@ -72,6 +74,9 @@ class Sequel::ConnectionPool
   # :after_connect :: A callable object called after each new connection is made, with the
   #                   connection object (and server argument if the callable accepts 2 arguments),
   #                   useful for customizations that you want to apply to all connections.
+  # :preconnect :: Automatically create the maximum number of connections, so that they don't
+  #                need to be created as needed.  This is useful when connecting takes a long time
+  #                and you want to avoid possible latency during runtime.
   def initialize(db, opts=OPTS)
     @db = db
     @after_connect = opts[:after_connect]

data/lib/sequel/connection_pool/sharded_single.rb

@@ -54,6 +54,11 @@ class Sequel::ShardedSingleConnectionPool < Sequel::ConnectionPool
     end
   end
   
+  # The ShardedSingleConnectionPool always has a maximum size of 1.
+  def max_size
+    1
+  end
+  
   # Remove servers from the connection pool. Primarily used in conjunction with master/slave
   # or shard configurations.  Similar to disconnecting from all given servers,
   # except that after it is used, future requests for the server will use the
@@ -94,5 +99,10 @@ class Sequel::ShardedSingleConnectionPool < Sequel::ConnectionPool
     @servers[server]
   end
   
+  # Make sure there is a valid connection for each server.
+  def preconnect
+    servers.each{|s| hold(s){}}
+  end
+  
   CONNECTION_POOL_MAP[[true, true]] = self
 end

data/lib/sequel/connection_pool/sharded_threaded.rb

@@ -1,4 +1,4 @@
-Sequel.require 'connection_pool/threaded'
+require 'sequel/connection_pool/threaded'
 
 # The slowest and most advanced connection, dealing with both multi-threaded
 # access and configurations with multiple shards/servers.
@@ -235,6 +235,11 @@ class Sequel::ShardedThreadedConnectionPool < Sequel::ThreadedConnectionPool
     sync{@servers[server]}
   end
   
+  # Create the maximum number of connections to each server immediately.
+  def preconnect
+    servers.each{|s| (max_size - size(s)).times{checkin_connection(s, make_new(s))}}
+  end
+  
   # Releases the connection assigned to the supplied thread and server. If the
   # server or connection given is scheduled for disconnection, remove the
   # connection instead of releasing it back to the pool.

data/lib/sequel/connection_pool/single.rb

@@ -2,17 +2,11 @@
 # It is just a wrapper around a single connection that uses the connection pool
 # API.
 class Sequel::SingleConnectionPool < Sequel::ConnectionPool  
-  # The SingleConnectionPool always has a size of 1 if connected
-  # and 0 if not.
-  def size
-    @conn ? 1 : 0
-  end
-  
   # Yield the connection if one has been made.
   def all_connections
     yield @conn if @conn
   end
-  
+
   # Disconnect the connection from the database.
   def disconnect(opts=nil)
     return unless @conn
@@ -30,9 +24,27 @@ class Sequel::SingleConnectionPool < Sequel::ConnectionPool
     end
   end
 
+  # The SingleConnectionPool always has a maximum size of 1.
+  def max_size
+    1
+  end
+  
   def pool_type
     :single
   end
   
+  # The SingleConnectionPool always has a size of 1 if connected
+  # and 0 if not.
+  def size
+    @conn ? 1 : 0
+  end
+
+  private
+
+  # Make sure there is a valid connection.
+  def preconnect
+    hold{}
+  end
+
   CONNECTION_POOL_MAP[[true, false]] = self
 end

data/lib/sequel/connection_pool/threaded.rb

@@ -34,12 +34,6 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
     @sleep_time = Float(opts[:pool_sleep_time] || 0.001)
   end
   
-  # The total number of connections opened, either available or allocated.
-  # This may not be completely accurate as it isn't protected by the mutex.
-  def size
-    @allocated.length + @available_connections.length
-  end
-  
   # Yield all of the available connections, and the one currently allocated to
   # this thread.  This will not yield connections currently allocated to other
   # threads, as it is not safe to operate on them.  This holds the mutex while
@@ -117,6 +111,12 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
     :threaded
   end
   
+  # The total number of connections opened, either available or allocated.
+  # This may not be completely accurate as it isn't protected by the mutex.
+  def size
+    @allocated.length + @available_connections.length
+  end
+  
   private
 
   # Assigns a connection to the supplied thread, if one
@@ -144,8 +144,10 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
     conn
   end
 
-  # Alias the default make_new method, so subclasses can call it directly.
-  alias default_make_new make_new
+  unless method_defined?(:default_make_new)
+    # Alias the default make_new method, so subclasses can call it directly.
+    alias default_make_new make_new
+  end
   
   # Creates a new connection to the given server if the size of the pool for
   # the server is less than the maximum size of the pool. The calling code
@@ -176,6 +178,11 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
     sync{@allocated[thread]}
   end
   
+  # Create the maximum number of connections immediately.
+  def preconnect
+    (max_size - size).times{checkin_connection(make_new(nil))}
+  end
+  
   # Releases the connection assigned to the supplied thread back to the pool.
   # The calling code should already have the mutex before calling this.
   def release(thread)

data/lib/sequel/database/misc.rb

@@ -100,13 +100,14 @@ module Sequel
     #
     # Accepts the following options:
     # :default_string_column_size :: The default size of string columns, 255 by default.
-    # :identifier_input_method :: A string method symbol to call on identifiers going into the database
-    # :identifier_output_method :: A string method symbol to call on identifiers coming from the database
-    # :logger :: A specific logger to use
-    # :loggers :: An array of loggers to use
-    # :quote_identifiers :: Whether to quote identifiers
-    # :servers :: A hash specifying a server/shard specific options, keyed by shard symbol 
-    # :single_threaded :: Whether to use a single-threaded connection pool
+    # :identifier_input_method :: A string method symbol to call on identifiers going into the database.
+    # :identifier_output_method :: A string method symbol to call on identifiers coming from the database.
+    # :logger :: A specific logger to use.
+    # :loggers :: An array of loggers to use.
+    # :preconnect :: Whether to automatically connect to the maximum number of servers.
+    # :quote_identifiers :: Whether to quote identifiers.
+    # :servers :: A hash specifying a server/shard specific options, keyed by shard symbol .
+    # :single_threaded :: Whether to use a single-threaded connection pool.
     # :sql_log_level :: Method to use to log SQL to a logger, :info by default.
     #
     # All options given are also passed to the connection pool.
@@ -117,6 +118,7 @@ module Sequel
       self.log_warn_duration = @opts[:log_warn_duration]
       block ||= proc{|server| connect(server)}
       @opts[:servers] = {} if @opts[:servers].is_a?(String)
+      @sharded = !!@opts[:servers]
       @opts[:adapter_class] = self.class
       
       @opts[:single_threaded] = @single_threaded = typecast_value_boolean(@opts.fetch(:single_threaded, Database.single_threaded))
@@ -143,6 +145,7 @@ module Sequel
         Sequel.synchronize{::Sequel::DATABASES.push(self)}
       end
       Sequel::Database.run_after_initialize(self)
+      @pool.send(:preconnect) if typecast_value_boolean(@opts[:preconnect]) && @pool.respond_to?(:preconnect, true)
     end
 
     # If a transaction is not currently in process, yield to the block immediately.
@@ -276,6 +279,12 @@ module Sequel
       Sequel.synchronize{prepared_statements[name] = ps}
     end
 
+    # Whether this database instance uses multiple servers, either for sharding
+    # or for master/slave.
+    def sharded?
+      @sharded
+    end
+
     # The timezone to use for this database, defaulting to <tt>Sequel.database_timezone</tt>.
     def timezone
       @timezone || Sequel.database_timezone

data/lib/sequel/dataset/query.rb

@@ -794,6 +794,17 @@ module Sequel
       clone(:server=>servr)
     end
 
+    # If the database uses sharding and the current dataset has not had a
+    # server set, return a cloned dataset that uses the given server.
+    # Otherwise, return the receiver directly instead of returning a clone.
+    def server?(server)
+      if db.sharded? && !opts[:server]
+        server(server)
+      else
+        self
+      end
+    end
+
     # Unbind bound variables from this dataset's filter and return an array of two
     # objects.  The first object is a modified dataset where the filter has been
     # replaced with one that uses bound variable placeholders.  The second object
@@ -1119,7 +1130,7 @@ module Sequel
     # Return self if the dataset already has a server, or a cloned dataset with the
     # default server otherwise.
     def default_server
-      @opts[:server] ? self : clone(:server=>:default)
+      server?(:default)
     end
 
     # Treat the +block+ as a virtual_row block if not +nil+ and

data/lib/sequel/model/base.rb

@@ -1752,7 +1752,8 @@ module Sequel
       def _delete_without_checking
         if sql = (m = model).fast_instance_delete_sql
           sql = sql.dup
-          (ds = m.dataset).literal_append(sql, pk)
+          ds = use_server(m.dataset)
+          ds.literal_append(sql, pk)
           ds.with_sql_delete(sql)
         else
           _delete_dataset.delete 
@@ -1903,7 +1904,7 @@ module Sequel
       # default values of all columns.  Separated from _save so it
       # can be overridden to avoid the refresh.
       def _save_refresh
-        _save_set_values(_refresh_get(this.opts[:server] ? this : this.server(:default)) || raise(Error, "Record not found"))
+        _save_set_values(_refresh_get(this.server?(:default)) || raise(Error, "Record not found"))
         changed_columns.clear
       end
 

data/lib/sequel/plugins/sharding.rb

@@ -30,7 +30,7 @@ module Sequel
             eb = eo[:eager_block]
             set_server = proc do |ds|
               ds = eb.call(ds) if eb
-              ds = ds.server(server) unless ds.opts[:server]
+              ds = ds.server?(server)
               ds
             end
             eo = eo.merge(:eager_block=>set_server)
@@ -53,7 +53,7 @@ module Sequel
         def eager_graph_dataset(opts, eager_options)
           ds = super
           if s = eager_options[:self].opts[:server]
-            ds = ds.server(s) unless ds.opts[:server]
+            ds = ds.server?(s)
           end
           ds
         end

data/lib/sequel/plugins/update_or_create.rb

@@ -41,14 +41,16 @@ module Sequel
         # create a new record with the columns specified by both +attrs+ and
         # +set_attrs+, with the ones in +set_attrs+ taking priority.  If
         # a block is given, the object is yielded to the block before the
-        # object is saved.
+        # object is saved.  Returns the new or updated object.
         def update_or_create(attrs, set_attrs=nil, &block)
-          find_or_new(attrs, set_attrs, &block).save_changes
+          obj = find_or_new(attrs, set_attrs, &block)
+          obj.save_changes
+          obj
         end
 
         # Operates the same as +update_or_create+, but returns the objects
         # without persisting changes (no UPDATE/INSERT queries).
-        def find_or_new(attrs, set_attrs=nil, &block)
+        def find_or_new(attrs, set_attrs=nil)
           obj = find(attrs) || new(attrs)
           obj.set(set_attrs) if set_attrs
           yield obj if block_given?

data/lib/sequel/version.rb

@@ -3,7 +3,7 @@ module Sequel
   MAJOR = 4
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 16
+  MINOR = 17
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
   TINY  = 0

data/spec/core/connection_pool_spec.rb

@@ -488,6 +488,13 @@ describe "A connection pool with multiple servers" do
     @pool = Sequel::ConnectionPool.get_pool(mock_db.call{|server| "#{server}#{ic[server] += 1}"}, CONNECTION_POOL_DEFAULTS.merge(:servers=>{:read_only=>{}}))
   end
   
+  specify "should support preconnect method that immediately creates the maximum number of connections" do
+    @pool.send(:preconnect)
+    i = 0
+    @pool.all_connections{|c1| i+=1}
+    i.should == @pool.max_size * 2
+  end
+
   specify "#all_connections should return connections for all servers" do
     @pool.hold{}
     @pool.all_connections{|c1| c1.should == "default1"}
@@ -755,6 +762,13 @@ describe "A single threaded pool with multiple servers" do
     @pool = Sequel::ConnectionPool.get_pool(mock_db.call(proc{|c| msp.call}){|c| c}, ST_CONNECTION_POOL_DEFAULTS.merge(:servers=>{:read_only=>{}}))
   end
   
+  specify "should support preconnect method that immediately creates the maximum number of connections" do
+    @pool.send(:preconnect)
+    i = 0
+    @pool.all_connections{|c1| i+=1}
+    i.should == 2
+  end
+
   specify "#all_connections should return connections for all servers" do
     @pool.hold{}
     @pool.all_connections{|c1| c1.should == :default}
@@ -879,6 +893,25 @@ shared_examples_for "All connection pools classes" do
     p.hold{|c| p.all_connections{|c1| c.should == c1}}
   end
 
+  specify "should have a size method that gives the current size of the pool" do
+    p = @class.new(mock_db.call{123}, {})
+    p.size.should == 0
+    p.hold{}
+    p.size.should == 1
+  end
+
+  specify "should have a max_size method that gives the maximum size of the pool" do
+    @class.new(mock_db.call{123}, {}).max_size.should >= 1
+  end
+
+  specify "should support preconnect method that immediately creates the maximum number of connections" do
+    p = @class.new(mock_db.call{123}, {})
+    p.send(:preconnect)
+    i = 0
+    p.all_connections{|c1| i+=1}
+    i.should == p.max_size
+  end
+
   specify "should be able to modify after_connect proc after the pool is created" do
     a = []
     p = @class.new(mock_db.call{123}, {})

data/spec/core/database_spec.rb

@@ -23,6 +23,17 @@ describe "A new Database" do
     Sequel::Database.new(1 => 2, :logger => [4], :loggers => [3]).loggers.should == [4,3]
   end
 
+  specify "should support :preconnect option to preconnect to database" do
+    @db.pool.size.should == 0
+    c = Class.new(Sequel::Database) do
+      def connect(_)
+        :connect
+      end
+    end
+    db = c.new(1 => 2, :logger => 3, :preconnect=>true)
+    db.pool.size.should == db.pool.max_size
+  end
+  
   specify "should handle the default string column size" do
     @db.default_string_column_size.should == 255
     db = Sequel::Database.new(:default_string_column_size=>50)

data/spec/core/dataset_spec.rb

@@ -3723,7 +3723,7 @@ describe "Sequel::Dataset#qualify" do
   end
 
   specify "should handle SQL::DelayedEvaluations that take dataset arguments" do
-    ds = @ds.filter(Sequel.delay{|ds| ds.first_source}).qualify
+    ds = @ds.filter(Sequel.delay{|x| x.first_source}).qualify
     ds.sql.should == 'SELECT t.* FROM t WHERE t.t'
   end
 

data/spec/core/expression_filters_spec.rb

@@ -1117,7 +1117,7 @@ describe "Sequel.delay" do
   end
 
   specify "should call the block with the current dataset if it accepts one argument" do
-    ds = Sequel.mock[:b].where(Sequel.delay{|ds| ds.first_source})
+    ds = Sequel.mock[:b].where(Sequel.delay{|x| x.first_source})
     ds.sql.should == "SELECT * FROM b WHERE b"
     ds.from(:c).sql.should == "SELECT * FROM c WHERE c"
   end
@@ -1132,7 +1132,7 @@ describe "Sequel.delay" do
   end
 
   specify "should have the condition specifier handling call block with the current dataset if it accepts one argument" do
-    ds = Sequel.mock[:b].where(:a=>Sequel.delay{|ds| ds.first_source})
+    ds = Sequel.mock[:b].where(:a=>Sequel.delay{|x| x.first_source})
     ds.sql.should == "SELECT * FROM b WHERE (a = b)"
     ds.from(:c).sql.should == "SELECT * FROM c WHERE (a = c)"
   end

data/spec/extensions/dataset_associations_spec.rb

@@ -196,7 +196,7 @@ describe "Sequel::Plugins::DatasetAssociations" do
   end
 
   it "should deal correctly with :order option for one_through_many associations" do
-    @Artist.one_through_many :otag, :clone=>:otag, :order=>:id, :order=>:tags__name
+    @Artist.one_through_many :otag, :clone=>:otag, :order=>:tags__name
     @Artist.otags.sql.should == 'SELECT tags.* FROM tags WHERE (tags.id IN (SELECT albums_tags.tag_id FROM artists INNER JOIN albums ON (albums.artist_id = artists.id) INNER JOIN albums_tags ON (albums_tags.album_id = albums.id) INNER JOIN tags ON (tags.id = albums_tags.tag_id) WHERE ((albums.artist_id IN (SELECT artists.id FROM artists)) AND ((albums.artist_id, tags.id) IN (SELECT DISTINCT ON (albums.artist_id) albums.artist_id, tags.id FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) ORDER BY albums.artist_id, tags.name))))) ORDER BY tags.name'
   end
 

data/spec/extensions/rcte_tree_spec.rb

@@ -367,7 +367,7 @@ describe Sequel::Model, "rcte_tree with composite keys" do
   
   it "should eagerly load descendants to a given level" do
     @c.plugin :rcte_tree, :key=>[:parent_id, :parent_id2]
-    @ds._fetch = [[{:id=>2, :id2=>3, :parent_id=>1, :parent_id=>2, :name=>'AA'}, {:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C'}, {:id=>7, :id2=>8, :parent_id=>1, :parent_id2=>2, :name=>'D'}],
+    @ds._fetch = [[{:id=>2, :id2=>3, :parent_id=>1, :parent_id2=>2, :name=>'AA'}, {:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C'}, {:id=>7, :id2=>8, :parent_id=>1, :parent_id2=>2, :name=>'D'}],
       [{:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C', :x_root_x_0=>2, :x_root_x_1=>3, :x_level_x=>0}, {:id=>9, :id2=>10, :parent_id=>2, :parent_id2=>3, :name=>'E', :x_root_x_0=>2, :x_root_x_1=>3, :x_level_x=>0},
        {:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7, :x_root_x_0=>6, :x_root_x_1=>7, :x_level_x=>0}, {:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7, :x_root_x_0=>2, :x_root_x_1=>3, :x_level_x=>1},
        {:id=>4, :id2=>5, :name=>'?', :parent_id=>7, :parent_id2=>8, :x_root_x_0=>7, :x_root_x_1=>8, :x_level_x=>0}, {:id=>5, :id2=>6, :name=>'?', :parent_id=>4, :parent_id2=>5, :x_root_x_0=>7, :x_root_x_1=>8, :x_level_x=>1}]]
@@ -375,7 +375,7 @@ describe Sequel::Model, "rcte_tree with composite keys" do
     sqls = @db.sqls
     sqls.first.should == "SELECT * FROM nodes"
     sqls.last.should =~ /WITH t AS \(SELECT parent_id AS x_root_x_0, parent_id2 AS x_root_x_1, nodes\.\*, CAST\(0 AS integer\) AS x_level_x FROM nodes WHERE \(\(parent_id, parent_id2\) IN \(\([267], [378]\), \([267], [378]\), \([267], [378]\)\)\) UNION ALL SELECT t\.x_root_x_0, t\.x_root_x_1, nodes\.\*, \(t\.x_level_x \+ 1\) AS x_level_x FROM nodes INNER JOIN t ON \(\(t\.id = nodes\.parent_id\) AND \(t\.id2 = nodes\.parent_id2\)\) WHERE \(t\.x_level_x < 1\)\) SELECT \* FROM t AS nodes/
-    os.should == [@c.load(:id=>2, :id2=>3, :parent_id=>1, :parent_id=>2, :name=>'AA'), @c.load(:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C'), @c.load(:id=>7, :id2=>8, :parent_id=>1, :parent_id2=>2, :name=>'D')]
+    os.should == [@c.load(:id=>2, :id2=>3, :parent_id=>1, :parent_id2=>2, :name=>'AA'), @c.load(:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C'), @c.load(:id=>7, :id2=>8, :parent_id=>1, :parent_id2=>2, :name=>'D')]
     os.map{|o| o.descendants}.should == [[@c.load(:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C'), @c.load(:id=>9, :id2=>10, :parent_id=>2, :parent_id2=>3, :name=>'E'), @c.load(:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7)],
       [@c.load(:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7)],
       [@c.load(:id=>4, :id2=>5, :name=>'?', :parent_id=>7, :parent_id2=>8), @c.load(:id=>5, :id2=>6, :name=>'?', :parent_id=>4, :parent_id2=>5)]]

data/spec/extensions/update_or_create_spec.rb

@@ -48,6 +48,12 @@ describe "Sequel::Plugins::UpdateOrCreate" do
     sqls.shift.should == "SELECT * FROM test WHERE (id = 1) LIMIT 1"
   end
 
+  it ".update_or_create should return an existing record even if no changes necessary" do
+    @db.fetch = [[{:id=>1, :a=>2, :b=>3}]]
+    @c.update_or_create(:a=>2){|t| t.b = 3}.should == @c.load(:id=>1, :a=>2, :b=>3)
+    @db.sqls.should == ["SELECT * FROM test WHERE (a = 2) LIMIT 1"]
+  end
+
   it ".find_or_new should return an existing record" do
     @db.fetch = [[{:id=>1, :a=>2, :b=>3}]]
     @c.find_or_new(:a=>2){|t| t.b = 4}.should == @c.load(:id=>1, :a=>2, :b=>4)

data/spec/integration/prepared_statement_test.rb

@@ -327,6 +327,13 @@ describe "Bound Argument Types" do
     @ds.get(:file).should == @vs[:file]
   end
 
+  cspecify "should handle blob type with special characters", [:odbc], [:oracle] do
+    @ds.delete
+    blob = Sequel.blob("\"'[]`a0 ")
+    @ds.prepare(:insert, :ps_blob, {:file=>:$x}).call(:x=>blob)
+    @ds.get(:file).should == blob
+  end
+
   cspecify "should handle blob type with nil values", [:oracle], [:tinytds], [:jdbc, proc{|db| defined?(Sequel::JDBC::SQLServer::DatabaseMethods) && db.is_a?(Sequel::JDBC::SQLServer::DatabaseMethods)}] do
     @ds.delete
     @ds.prepare(:insert, :ps_blob, {:file=>:$x}).call(:x=>nil)

data/spec/model/record_spec.rb

@@ -346,6 +346,12 @@ describe "Model#set_server" do
     @db.sqls.should == ["DELETE FROM items WHERE (id = 13) -- s1"]
   end
 
+  it "should set the server to use when deleting when using optimized delete" do
+    @c.set_primary_key :id
+    @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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.16.0
+  version: 4.17.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -133,6 +133,7 @@ extra_rdoc_files:
 - doc/release_notes/4.14.0.txt
 - doc/release_notes/4.15.0.txt
 - doc/release_notes/4.16.0.txt
+- doc/release_notes/4.17.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -236,6 +237,7 @@ files:
 - doc/release_notes/4.14.0.txt
 - doc/release_notes/4.15.0.txt
 - doc/release_notes/4.16.0.txt
+- doc/release_notes/4.17.0.txt
 - doc/release_notes/4.2.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt
@@ -734,7 +736,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: The Database Toolkit for Ruby