sequel 4.22.0 → 4.23.0

data/lib/sequel/adapters/jdbc.rb

@@ -698,6 +698,7 @@ module Sequel
             sql = @sproc_name
             opts = Hash[opts]
             opts[:args] = @sproc_args
+            opts[:sproc] = true
             opts[:type] = :insert
             super
           end

data/lib/sequel/adapters/mock.rb

@@ -37,7 +37,6 @@ module Sequel
         'cubrid'=>'Cubrid',
         'db2'=>'DB2',
         'firebird'=>'Firebird',
-        'fdbsql'=>'Fdbsql',
         'informix'=>'Informix',
         'mssql'=>'MSSQL',
         'mysql'=>'MySQL',

data/lib/sequel/adapters/postgres.rb

@@ -189,6 +189,7 @@ module Sequel
       INFINITE_TIMESTAMP_STRINGS = ['infinity'.freeze, '-infinity'.freeze].freeze
       INFINITE_DATETIME_VALUES = ([PLUS_INFINITY, MINUS_INFINITY] + INFINITE_TIMESTAMP_STRINGS).freeze
       
+      set_adapter_scheme :postgresql
       set_adapter_scheme :postgres
 
       # Whether infinite timestamps/dates should be converted on retrieval.  By default, no

data/lib/sequel/adapters/postgresql.rb

@@ -0,0 +1 @@
+Sequel.require 'adapters/postgres'

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

@@ -706,7 +706,7 @@ module Sequel
       # Convert the hash of named conversion procs into a hash a oid conversion procs. 
       def convert_named_procs_to_procs(named_procs)
         h = {}
-        from(:pg_type).where(:typtype=>'b', :typname=>named_procs.keys.map(&:to_s)).select_map([:oid, :typname]).each do |oid, name|
+        from(:pg_type).where(:typtype=>['b', 'e'], :typname=>named_procs.keys.map(&:to_s)).select_map([:oid, :typname]).each do |oid, name|
           h[oid.to_i] = named_procs[name.untaint.to_sym]
         end
         h
@@ -1294,9 +1294,9 @@ module Sequel
       #            returned rows also include the exact phrase used.
       # :rank :: Set to true to order by the rank, so that closer matches are returned first.
       # :tsquery :: Specifies the terms argument is already a valid SQL expression returning a
-      #            tsquery, and can be used directly in the query.
+      #             tsquery, and can be used directly in the query.
       # :tsvector :: Specifies the cols argument is already a valid SQL expression returning a
-      #            tsvector, and can be used directly in the query.
+      #              tsvector, and can be used directly in the query.
       def full_text_search(cols, terms, opts = OPTS)
         lang = Sequel.cast(opts[:language] || 'simple', :regconfig)
 

data/lib/sequel/connection_pool/sharded_threaded.rb

@@ -192,8 +192,13 @@ class Sequel::ShardedThreadedConnectionPool < Sequel::ThreadedConnectionPool
           deadline ||= time + @timeout
           current_time = Time.now
           raise(::Sequel::PoolTimeout, "timeout: #{@timeout}, elapsed: #{current_time - time}") if current_time > deadline
+          # :nocov:
+          # It's difficult to get to this point, it can only happen if there is a race condition
+          # where a connection cannot be acquired even after the thread is signalled by the condition
+          # variable that a connection is ready.
           @waiters[server].wait(@mutex, deadline - current_time)
           Thread.pass
+          # :nocov:
         end
 
         conn

data/lib/sequel/connection_pool/threaded.rb

@@ -4,7 +4,9 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
   # Whether or not a ConditionVariable should be used to wait for connections.
   # True except on ruby 1.8, where ConditionVariable#wait does not support a
   # timeout.
-  USE_WAITER = RUBY_VERSION >= '1.9'
+  unless defined?(USE_WAITER)
+    USE_WAITER = RUBY_VERSION >= '1.9'
+  end
 
   # The maximum number of connections this pool will create (per shard/server
   # if sharding).
@@ -40,7 +42,9 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
     if USE_WAITER
       @waiter = ConditionVariable.new
     else
+      # :nocov:
       @sleep_time = Float(opts[:pool_sleep_time] || 0.001)
+      # :nocov:
     end
   end
   
@@ -155,8 +159,12 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
           deadline ||= time + @timeout
           current_time = Time.now
           raise(::Sequel::PoolTimeout, "timeout: #{@timeout}, elapsed: #{current_time - time}") if current_time > deadline
+          # :nocov:
+          # It's difficult to get to this point, it can only happen if there is a race condition
+          # where a connection cannot be acquired even after the thread is signalled by the condition
           @waiter.wait(@mutex, deadline - current_time)
           Thread.pass
+          # :nocov:
         end
 
         conn

data/lib/sequel/database/connecting.rb

@@ -6,7 +6,7 @@ module Sequel
     # ---------------------
 
     # Array of supported database adapters
-    ADAPTERS = %w'ado amalgalite cubrid db2 dbi do fdbsql firebird ibmdb informix jdbc mock mysql mysql2 odbc openbase oracle postgres sqlanywhere sqlite swift tinytds'.collect(&:to_sym)
+    ADAPTERS = %w'ado amalgalite cubrid db2 dbi do firebird ibmdb informix jdbc mock mysql mysql2 odbc oracle postgres sqlanywhere sqlite swift tinytds'.collect(&:to_sym)
 
     @single_threaded = false
 

data/lib/sequel/database/transactions.rb

@@ -124,7 +124,7 @@ module Sequel
         begin_transaction(conn, opts)
         if rollback == :always
           begin
-            yield(conn)
+            ret = yield(conn)
           rescue Exception => e1
             raise e1
           ensure
@@ -139,6 +139,7 @@ module Sequel
         rescue Exception
         end
         transaction_error(e, :conn=>conn, :rollback=>rollback)
+        ret
       ensure
         begin
           committed = commit_or_rollback_transaction(e, conn, opts)

data/lib/sequel/dataset/prepared_statements.rb

@@ -30,7 +30,7 @@ module Sequel
         meths.each do |meth|
           module_eval("def #{meth}(sql, opts=Sequel::OPTS) #{code}; super end", __FILE__, __LINE__)
         end
-        private *meths
+        private(*meths)
       end
     end
     private_class_method :prepared_statements_module

data/lib/sequel/extensions/constraint_validations.rb

@@ -224,6 +224,16 @@ module Sequel
       end
     end
 
+    # Modify the default create_table generator to include
+    # the constraint validation methods.
+    def create_table_generator(&block)
+      super do
+        extend CreateTableGeneratorMethods
+        @validations = []
+        instance_eval(&block) if block
+      end
+    end
+
     # Drop the constraint validations table.
     def drop_constraint_validations_table
       drop_table(constraint_validations_table)
@@ -262,8 +272,6 @@ module Sequel
       ds.delete
     end
 
-    private
-
     # Modify the default alter_table generator to include
     # the constraint validation methods.
     def alter_table_generator(&block)
@@ -274,6 +282,8 @@ module Sequel
       end
     end
 
+    private
+
     # After running all of the table alteration statements,
     # if there were any constraint validations, run table alteration
     # statements to create related constraints.  This is purposely
@@ -317,16 +327,6 @@ module Sequel
       super
     end
 
-    # Modify the default create_table generator to include
-    # the constraint validation methods.
-    def create_table_generator(&block)
-      super do
-        extend CreateTableGeneratorMethods
-        @validations = []
-        instance_eval(&block) if block
-      end
-    end
-
     # For the given table, generator, and validations, add constraints
     # to the generator for each of the validations, as well as adding
     # validation metadata to the constraint validations table.

data/lib/sequel/extensions/date_arithmetic.rb

@@ -123,10 +123,6 @@ module Sequel
               expr = Sequel.+(expr, Sequel.lit(["", " "], value, sql_unit))
             end
             false
-          when :fdbsql
-            each_valid_interval_unit(h, FDBSQL_DURATION_UNITS) do |value, sql_unit|
-              expr = Sequel.+(expr, Sequel.lit(["INTERVAL ", " "], value, sql_unit))
-            end
           else
             raise Error, "date arithmetic is not implemented on #{db.database_type}"
           end

data/lib/sequel/extensions/pagination.rb

@@ -1,6 +1,18 @@
 # The pagination extension adds the Sequel::Dataset#paginate and #each_page methods,
-# which return paginated (limited and offset) datasets with some helpful methods
-# that make creating a paginated display easier.
+# which return paginated (limited and offset) datasets with the following methods
+# added that make creating a paginated display easier:
+#
+# * +page_size+
+# * +page_count+
+# * +page_range+
+# * +current_page+
+# * +next_page+
+# * +prev_page+
+# * +first_page?+
+# * +last_page?+
+# * +pagination_record_count+
+# * +current_page_record_count+
+# * +current_page_record_range+
 #
 # This extension uses Object#extend at runtime, which can hurt performance.
 #

data/lib/sequel/extensions/pg_enum.rb

@@ -18,7 +18,7 @@
 # Just like any user-created type, after creating the type, you
 # can create tables that have a column of that type:
 #
-#   DB.create_table(:table_name)
+#   DB.create_table(:table_name) do
 #     enum_type_name :column_name
 #   end
 #
@@ -31,7 +31,7 @@
 # If the pg_array extension is used, arrays of enums are returned as a
 # PGArray:
 #
-#   DB.create_table(:table_name)
+#   DB.create_table(:table_name) do
 #     column :column_name, 'enum_type_name[]'
 #   end
 #   DB[:table_name].get(:column_name)

data/lib/sequel/extensions/pg_hstore.rb

@@ -8,7 +8,7 @@
 # as instances of Sequel::Postgres::HStore.  HStore is
 # a DelegateClass of Hash, so it mostly acts like a hash, but not
 # completely (is_a?(Hash) is false).  If you want the actual hash,
-# you can call Hstore#to_hash.  This is done so that Sequel does not
+# you can call HStore#to_hash.  This is done so that Sequel does not
 # treat a HStore like a Hash by default, which would cause issues.
 #
 # In addition to the parsers, this extension comes with literalizers

data/lib/sequel/extensions/pg_json_ops.rb

@@ -210,9 +210,9 @@ module Sequel
       private
 
       # Return a placeholder literal with the given str and args, wrapped
-      # in an JSONOp, used by operators that return json.
+      # in an JSONOp or JSONBOp, used by operators that return json or jsonb.
       def json_op(str, args)
-        JSONOp.new(Sequel::SQL::PlaceholderLiteralString.new(str, [self, args]))
+        self.class.new(Sequel::SQL::PlaceholderLiteralString.new(str, [self, args]))
       end
 
       # Return a function with the given name, and the receiver as the first

data/lib/sequel/plugins/csv_serializer.rb

@@ -1,5 +1,7 @@
 if RUBY_VERSION < "1.9"
+  # :nocov:
   require 'fastercsv'
+  # :nocov:
 else
   require 'csv'
 end

data/lib/sequel/plugins/delay_add_association.rb

@@ -0,0 +1,50 @@
+module Sequel
+  module Plugins
+    # The delay_add_association plugin delays the adding of
+    # associated objects to a new (unsaved) object until after the new
+    # object is saved.  By default, if you attempt to add
+    # associated objects to a new object, Sequel will raise
+    # an error, because you need to have a primary key before
+    # saving the objects.
+    #
+    # When delaying the add of an associated object, the object
+    # will be immediately added to the cached association array.
+    # When saving the current object, it will also attempt to
+    # validate any associated objects, and if the associated objects
+    # are not valid, the current object will also be considered
+    # not valid.
+    #
+    # Usage:
+    #
+    #   # Make all model subclass delay add_association for new objects
+    #   Sequel::Model.plugin :delay_add_association
+    #
+    #   # Make the Album class delay add_association for new objects
+    #   Album.plugin :delay_add_association
+    module DelayAddAssociation
+      # Depend on the validate_associated plugin.
+      def self.apply(mod)
+        mod.plugin :validate_associated
+      end
+
+      module InstanceMethods
+        private
+
+        # Delay the addition of the associated object till after
+        # saving the current object, if the current object is new
+        # and the associated dataset requires a primary key on the
+        # current object.
+        def add_associated_object(opts, o, *args)
+          if opts.dataset_need_primary_key? && new?
+            delay_validate_associated_object(opts, o)
+            send(opts[:name]) << o
+            after_create_hook{super(opts, o, *args)}
+            o
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sequel/plugins/list.rb

@@ -129,11 +129,11 @@ module Sequel
             checked_transaction do
               ds = list_dataset
               op, ds = if target < current
-                raise(Sequel::Error, "Moving too far up (target = #{target})") if target < 1
+                target = 1 if target < 1
                 [:+, ds.filter(position_field=>target...current)]
               else
                 lp ||= last_position
-                raise(Sequel::Error, "Moving too far down (target = #{target}, last_position = #{lp})") if target > lp
+                target = lp if target > lp
                 [:-, ds.filter(position_field=>(current + 1)..target)]
               end
               ds.update(position_field => Sequel::SQL::NumericExpression.new(op, position_field, 1))

data/lib/sequel/plugins/nested_attributes.rb

@@ -37,14 +37,16 @@ module Sequel
     # of creating a new album.
     #
     # If you would like to delete the associated object instead of updating it, you add a _delete
-    # entry to the hash:
+    # entry to the hash, and also pass the :destroy option when calling +nested_attributes+:
     #
+    #   Artist.nested_attributes :albums, :destroy=>true
     #   a.update(:albums_attributes => [{:id=>1, :_delete=>true}])
     #
     # This will delete the related associated object from the database.  If you want to leave the
     # associated object in the database, but just remove it from the association, add a _remove
-    # entry in the hash:
+    # entry in the hash, and also pass the :remove option when calling +nested_attributes+:
     #
+    #   Artist.nested_attributes :albums, :remove=>true
     #   a.update(:albums_attributes => [{:id=>1, :_remove=>true}])
     #
     # The above example was for a one_to_many association, but the plugin also works similarly
@@ -71,9 +73,9 @@ module Sequel
     # To save changes to the artist, create the first album and associate it to the artist,
     # and update the other existing associated album.
     module NestedAttributes
-      # Depend on the instance_hooks plugin.
+      # Depend on the validate_associated plugin.
       def self.apply(model)
-        model.plugin(:instance_hooks)
+        model.plugin(:validate_associated)
       end
       
       module ClassMethods
@@ -166,7 +168,7 @@ module Sequel
           reflection = meta[:reflection]
           obj = reflection.associated_class.new
           nested_attributes_set_attributes(meta, obj, attributes)
-          after_validation_hook{validate_associated_object(meta, obj)}
+          delay_validate_associated_object(reflection, obj)
           if reflection.returns_array?
             send(reflection[:name]) << obj
             after_save_hook{send(reflection.add_method, obj)}
@@ -282,7 +284,7 @@ module Sequel
         # Returns the object updated.
         def nested_attributes_update(meta, obj, attributes)
           nested_attributes_update_attributes(meta, obj, attributes)
-          after_validation_hook{validate_associated_object(meta, obj)}
+          delay_validate_associated_object(meta[:reflection], obj)
           # Don't need to validate the object twice if :validate association option is not false
           # and don't want to validate it at all if it is false.
           after_save_hook{obj.save_changes(:validate=>false)}
@@ -295,28 +297,6 @@ module Sequel
             nested_attributes_set_attributes(meta, obj, attributes)
           end
         end
-
-        # Validate the given associated object, adding any validation error messages from the
-        # given object to the parent object.
-        def validate_associated_object(meta, obj)
-          reflection = meta[:reflection]
-          return if reflection[:validate] == false
-          association = reflection[:name]
-          if (reflection[:type] == :one_to_many || reflection[:type] == :one_to_one) && (key = reflection[:key]).is_a?(Symbol) && !(pk_val = obj.values[key])
-            # There could be a presence validation on the foreign key in the associated model,
-            # which will fail if we validate before saving the current object.  If there is
-            # no value for the foreign key, set it to the current primary key value, or a dummy
-            # value of 0 if we haven't saved the current object.
-            p_key = pk unless pk.is_a?(Array)
-            obj.values[key] = p_key || 0
-            key = nil if p_key
-          end
-          obj.errors.full_messages.each{|m| errors.add(association, m)} unless obj.valid?
-          if key && !pk_val
-            # If we used a dummy value of 0, remove it so it doesn't accidently remain.
-            obj.values.delete(key)
-          end
-        end
       end
     end
   end

data/lib/sequel/plugins/update_refresh.rb

@@ -0,0 +1,50 @@
+module Sequel
+  module Plugins
+    # The update_refresh plugin makes the model class refresh
+    # the object after updating.  By default, Sequel only
+    # refreshes automatically after inserting new rows, not
+    # after updating.  However, if you are using triggers
+    # to modify the contents of updated rows, it can be
+    # helpful to immediately get the current data after
+    # updating.
+    #
+    # If the dataset supports UPDATE RETURNING, this
+    # plugin will use it so that it can retrieve the current
+    # data in the same query it uses for the update.
+    #
+    # Usage:
+    #
+    #   # Make all model subclasses refresh after update
+    #   Sequel::Model.plugin :update_refresh
+    #
+    #   # Make the Album class refresh after update
+    #   Album.plugin :update_refresh
+    module UpdateRefresh
+      module InstanceMethods
+        def after_update
+          super
+          unless this.supports_returning?(:update)
+            refresh
+          end
+        end
+
+        private
+
+        def _update_without_checking(columns)
+          ds = _update_dataset
+          if ds.supports_returning?(:update)
+            ds = ds.opts[:returning] ? ds : ds.returning
+            rows = ds.update(columns)
+            n = rows.length
+            if n == 1
+              @values.merge!(rows.first)
+            end
+            n
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end