sequel 4.6.0 → 4.7.0

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

@@ -382,6 +382,11 @@ module Sequel
         end
       end
       
+      # DB2 supports quoted function names.
+      def supports_quoted_function_names?
+        true
+      end
+
       def _truncate_sql(table)
         # "TRUNCATE #{table} IMMEDIATE" is only for newer version of db2, so we
         # use the following one

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

@@ -301,7 +301,7 @@ module Sequel
       end
     
       DATABASE_ERROR_REGEXPS = {
-        /Violation of UNIQUE KEY constraint/ => UniqueConstraintViolation,
+        /Violation of UNIQUE KEY constraint|Violation of PRIMARY KEY constraint.+Cannot insert duplicate key/ => UniqueConstraintViolation,
         /conflicted with the (FOREIGN KEY.*|REFERENCE) constraint/ => ForeignKeyConstraintViolation,
         /conflicted with the CHECK constraint/ => CheckConstraintViolation,
         /column does not allow nulls/ => NotNullConstraintViolation,

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

@@ -485,6 +485,11 @@ module Sequel
         sql << FROM
         source_list_append(sql, @opts[:from] || DUAL)
       end
+
+      # Oracle supports quoted function names.
+      def supports_quoted_function_names?
+        true
+      end
     end
   end
 end

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

@@ -1485,6 +1485,11 @@ module Sequel
         db.server_version(@opts[:server])
       end
 
+      # PostgreSQL supports quoted function names.
+      def supports_quoted_function_names?
+        true
+      end
+
       # Concatenate the expressions with a space in between
       def full_text_string_join(cols)
         cols = Array(cols).map{|x| SQL::Function.new(:COALESCE, x, EMPTY_STRING)}

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

@@ -121,7 +121,7 @@ module Sequel
       private
 
       DATABASE_ERROR_REGEXPS = {
-        /would not be unique/ => Sequel::UniqueConstraintViolation,
+        /would not be unique|Primary key for table.+is not unique/ => Sequel::UniqueConstraintViolation,
         /Column .* in table .* cannot be NULL/ => Sequel::NotNullConstraintViolation,
         /Constraint .* violated: Invalid value in table .*/ => Sequel::CheckConstraintViolation,
         /No primary key value for foreign key .* in table .*/ => Sequel::ForeignKeyConstraintViolation,

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

@@ -332,7 +332,7 @@ module Sequel
       end
 
       DATABASE_ERROR_REGEXPS = {
-        /is not unique\z/ => UniqueConstraintViolation,
+        /(is|are) not unique\z/ => UniqueConstraintViolation,
         /foreign key constraint failed\z/ => ForeignKeyConstraintViolation,
         /\A(SQLITE ERROR 19 \(CONSTRAINT\) : )?constraint failed\z/ => ConstraintViolation,
         /may not be NULL\z/ => NotNullConstraintViolation,
@@ -692,6 +692,11 @@ module Sequel
         super unless @opts[:lock] == :update
       end
 
+      # SQLite supports quoted function names.
+      def supports_quoted_function_names?
+        true
+      end
+
       # SQLite treats a DELETE with no WHERE clause as a TRUNCATE
       def _truncate_sql(table)
         "DELETE FROM #{table}"

data/lib/sequel/adapters/utils/emulate_offset_with_row_number.rb

@@ -26,7 +26,7 @@ module Sequel
       sql = @opts[:append_sql] || ''
       subselect_sql_append(sql, unlimited.
         unordered.
-        select_append{ROW_NUMBER(:over, :order=>order){}.as(rn)}.
+        select_append{ROW_NUMBER{}.over(:order=>order).as(rn)}.
         from_self(:alias=>dsa1).
         select(*columns).
         limit(@opts[:limit]).

data/lib/sequel/database/schema_methods.rb

@@ -44,6 +44,7 @@ module Sequel
     #
     # Options:
     # :ignore_errors :: Ignore any DatabaseErrors that are raised
+    # :name :: Name to use for index instead of default
     #
     # See <tt>alter_table</tt>.
     def add_index(table, columns, options=OPTS)

data/lib/sequel/database/transactions.rb

@@ -216,32 +216,17 @@ module Sequel
       SQL_BEGIN
     end
 
-    if (! defined?(RUBY_ENGINE) or RUBY_ENGINE == 'ruby' or RUBY_ENGINE == 'rbx') and RUBY_VERSION < '1.9'
-    # :nocov:
-      # Whether to commit the current transaction. On ruby 1.8 and rubinius,
-      # Thread.current.status is checked because Thread#kill skips rescue
-      # blocks (so exception would be nil), but the transaction should
-      # still be rolled back.
-      def commit_or_rollback_transaction(exception, conn, opts)
-        if exception
-          false
-        else
-          if Thread.current.status == 'aborting'
-            rollback_transaction(conn, opts)
-            false
-          else
-            commit_transaction(conn, opts)
-            true
-          end
-        end
-      end
-    # :nocov:
-    else
-      # Whether to commit the current transaction.  On ruby 1.9 and JRuby,
-      # transactions will be committed if Thread#kill is used on an thread
-      # that has a transaction open, and there isn't a work around.
-      def commit_or_rollback_transaction(exception, conn, opts)
-        if exception
+    # Whether to commit the current transaction. Thread.current.status is
+    # checked because Thread#kill skips rescue blocks (so exception would be
+    # nil), but the transaction should still be rolled back. On Ruby 1.9 (but
+    # not 1.8 or 2.0), the thread status will still be "run", so Thread#kill
+    # will erroneously commit the transaction, and there isn't a workaround.
+    def commit_or_rollback_transaction(exception, conn, opts)
+      if exception
+        false
+      else
+        if Thread.current.status == 'aborting'
+          rollback_transaction(conn, opts)
           false
         else
           commit_transaction(conn, opts)

data/lib/sequel/dataset/actions.rb

@@ -102,14 +102,14 @@ module Sequel
       if no_arg
         if block
           arg = Sequel.virtual_row(&block)
-          aggregate_dataset.get{count(arg).as(count)}
+          aggregate_dataset.get{count(arg).as(:count)}
         else
-          aggregate_dataset.get{count(:*){}.as(count)}.to_i
+          aggregate_dataset.get{count{}.*.as(:count)}.to_i
         end
       elsif block
         raise Error, 'cannot provide both argument and block to Dataset#count'
       else
-        aggregate_dataset.get{count(arg).as(count)}
+        aggregate_dataset.get{count(arg).as(:count)}
       end
     end
     

data/lib/sequel/dataset/features.rb

@@ -167,6 +167,11 @@ module Sequel
       true
     end
 
+    # Whether the database supports quoting function names, false by default.
+    def supports_quoted_function_names?
+      false
+    end
+
     # Whether the RETURNING clause is used for the given dataset.
     # +type+ can be :insert, :update, or :delete.
     def uses_returning?(type)

data/lib/sequel/dataset/sql.rb

@@ -743,7 +743,22 @@ module Sequel
 
     # Backbone of function_sql_append and emulated_function_sql_append.
     def _function_sql_append(sql, name, args)
-      sql << name.to_s
+      case name
+      when SQL::Identifier
+        if supports_quoted_function_names?
+          literal_append(sql, name)
+        else
+          sql << name.value.to_s
+        end
+      when SQL::QualifiedIdentifier
+        if supports_quoted_function_names?
+          literal_append(sql, name)
+        else
+          sql << split_qualifiers(name).join(DOT)
+        end
+      else
+        sql << name.to_s
+      end
       if args.empty?
         sql << FUNCTION_EMPTY
       else

data/lib/sequel/model/associations.rb

@@ -152,6 +152,12 @@ module Sequel
           {filter_by_associations_conditions_key=>ds}
         end
 
+        # Whether to handle silent modification failure when adding/removing
+        # associated records, false by default.
+        def handle_silent_modification_failure?
+          false
+        end
+
         # The limit and offset for this association (returned as a two element array).
         def limit_and_offset
           if (v = self[:limit]).is_a?(Array)
@@ -479,6 +485,11 @@ module Sequel
           :"#{underscore(demodulize(self[:model].name))}_id"
         end
         
+        # Handle silent failure of add/remove methods if raise_on_save_failure is false.
+        def handle_silent_modification_failure?
+          self[:raise_on_save_failure] == false
+        end
+
         # The hash key to use for the eager loading predicate (left side of IN (1, 2, 3))
         def predicate_key
           cached_fetch(:predicate_key){qualify_assoc(self[:key])}
@@ -975,6 +986,8 @@ module Sequel
         #                        to the model method call, where :primary_key_column refers to the underlying column.
         #                        Should only be used if the model method differs from the primary key column, in
         #                        conjunction with defining a model alias method for the primary key column.
+        # :raise_on_save_failure :: Do not raise exceptions for hook or validation failures when saving associated
+        #                           objects in the add/remove methods (return nil instead) [one_to_many only].
         # === :many_to_many
         # :graph_join_table_block :: The block to pass to +join_table+ for
         #                            the join table when eagerly loading the association via +eager_graph+.
@@ -1116,7 +1129,7 @@ module Sequel
         def apply_window_function_eager_limit_strategy(ds, opts)
           rn = ds.row_number_column 
           limit, offset = opts.limit_and_offset
-          ds = ds.unordered.select_append{row_number(:over, :partition=>opts.predicate_key, :order=>ds.opts[:order]){}.as(rn)}.from_self
+          ds = ds.unordered.select_append{row_number{}.over(:partition=>opts.predicate_key, :order=>ds.opts[:order]).as(rn)}.from_self
           ds = if opts[:type] == :one_to_one
             ds.where(rn => offset ? offset+1 : 1)
           elsif offset
@@ -1426,7 +1439,7 @@ module Sequel
           cks.each{|k| ck_nil_hash[k] = nil}
 
           unless opts[:read_only]
-            validate = opts[:validate]
+            save_opts = {:validate=>opts[:validate]}
 
             if one_to_one
               setter = opts[:setter] || proc do |o|
@@ -1437,21 +1450,23 @@ module Sequel
                 end
                 checked_transaction do
                   up_ds.update(ck_nil_hash)
-                  o.save(:validate=>validate) || raise(Sequel::Error, "invalid associated object, cannot save") if o
+                  o.save(save_opts) || raise(Sequel::Error, "invalid associated object, cannot save") if o
                 end
               end
               association_module_private_def(opts._setter_method, opts, &setter)
               association_module_def(opts.setter_method, opts){|o| set_one_to_one_associated_object(opts, o)}
             else 
+              save_opts[:raise_on_failure] = opts[:raise_on_save_failure] != false
+
               adder = opts[:adder] || proc do |o|
                 cks.zip(cpks).each{|k, pk| o.send(:"#{k}=", send(pk))}
-                o.save(:validate=>validate) || raise(Sequel::Error, "invalid associated object, cannot save")
+                o.save(save_opts)
               end
               association_module_private_def(opts._add_method, opts, &adder)
       
               remover = opts[:remover] || proc do |o|
                 cks.each{|k| o.send(:"#{k}=", nil)}
-                o.save(:validate=>validate) || raise(Sequel::Error, "invalid associated object, cannot save")
+                o.save(save_opts)
               end
               association_module_private_def(opts._remove_method, opts, &remover)
 
@@ -1590,7 +1605,7 @@ module Sequel
           raise(Sequel::Error, "model object #{inspect} does not have a primary key") if opts.dataset_need_primary_key? && !pk
           ensure_associated_primary_key(opts, o, *args)
           return if run_association_callbacks(opts, :before_add, o) == false
-          send(opts._add_method, o, *args)
+          return if !send(opts._add_method, o, *args) && opts.handle_silent_modification_failure?
           if array = associations[opts[:name]] and !array.include?(o)
             array.push(o)
           end
@@ -1699,7 +1714,7 @@ module Sequel
           raise(Sequel::Error, "model object #{inspect} does not have a primary key") if opts.dataset_need_primary_key? && !pk
           raise(Sequel::Error, "associated object #{o.inspect} does not have a primary key") if opts.need_associated_primary_key? && !o.pk
           return if run_association_callbacks(opts, :before_remove, o) == false
-          send(opts._remove_method, o, *args)
+          return if !send(opts._remove_method, o, *args) && opts.handle_silent_modification_failure?
           associations[opts[:name]].delete_if{|x| o === x} if associations.include?(opts[:name])
           remove_reciprocal_object(opts, o)
           run_association_callbacks(opts, :after_remove, o)

data/lib/sequel/model/base.rb

@@ -41,8 +41,8 @@ module Sequel
       attr_reader :primary_key
   
       # Whether to raise an error instead of returning nil on a failure
-      # to save/create/save_changes/etc due to a validation failure or
-      # a before_* hook returning false.
+      # to save/create/save_changes/update/destroy due to a validation failure or
+      # a before_* hook returning false (default: true). 
       attr_accessor :raise_on_save_failure
   
       # Whether to raise an error when unable to typecast data for a column

data/lib/sequel/plugins/auto_validations.rb

@@ -136,7 +136,11 @@ module Sequel
 
           validates_schema_types if model.auto_validate_types?
 
-          model.auto_validate_unique_columns.each{|cols| validates_unique(cols)}
+          unique_opts = {}
+          if model.respond_to?(:sti_dataset)
+            unique_opts[:dataset] = model.sti_dataset
+          end
+          model.auto_validate_unique_columns.each{|cols| validates_unique(cols, unique_opts)}
         end
       end
     end

data/lib/sequel/plugins/instance_hooks.rb

@@ -4,7 +4,7 @@ module Sequel
     # by passing a block to a _hook method (e.g. before_save_hook{do_something}).
     # The block is executed when the hook is called (e.g. before_save).
     #
-    # All of the standard hooks are supported, except for after_initialize.
+    # All of the standard hooks are supported.
     # Instance level before hooks are executed in reverse order of addition before
     # calling super.  Instance level after hooks are executed in order of addition
     # after calling super.  If any of the instance level before hook blocks return
@@ -16,6 +16,8 @@ module Sequel
     # be run the first time you save the object (creating it), and the before_update
     # hook will be run the second time you save the object (updating it), and no
     # hooks will be run the third time you save the object.
+    #
+    # Validation hooks are not cleared until after a successful save.
     # 
     # Usage:
     #
@@ -27,7 +29,7 @@ module Sequel
     module InstanceHooks
       module InstanceMethods 
         BEFORE_HOOKS = Sequel::Model::BEFORE_HOOKS
-        AFTER_HOOKS = Sequel::Model::AFTER_HOOKS - [:after_initialize]
+        AFTER_HOOKS = Sequel::Model::AFTER_HOOKS
         HOOKS = BEFORE_HOOKS + AFTER_HOOKS
         HOOKS.each{|h| class_eval(<<-END , __FILE__, __LINE__+1)}
           def #{h}_hook(&block)
@@ -38,7 +40,7 @@ module Sequel
         END
         
         BEFORE_HOOKS.each{|h| class_eval("def #{h}; run_before_instance_hooks(:#{h}) == false ? false : super end", __FILE__, __LINE__)}
-        AFTER_HOOKS.each{|h| class_eval(<<-END, __FILE__, __LINE__ + 1)}
+        (AFTER_HOOKS - [:after_validation, :after_save]).each{|h| class_eval(<<-END, __FILE__, __LINE__ + 1)}
           def #{h}
             super
             run_after_instance_hooks(:#{h})
@@ -46,6 +48,22 @@ module Sequel
             @instance_hooks.delete(:#{h.to_s.sub('after', 'before')})
           end
         END
+
+        # Run after validation hooks, without clearing the validation hooks.
+        def after_validation
+          super
+          run_after_instance_hooks(:after_validation)
+        end
+        
+        # Run after save hooks, clearing both the save and validation hooks.
+        def after_save
+          super
+          run_after_instance_hooks(:after_save)
+          @instance_hooks.delete(:after_save)
+          @instance_hooks.delete(:before_save)
+          @instance_hooks.delete(:after_validation)
+          @instance_hooks.delete(:before_validation)
+        end
         
         private
         

data/lib/sequel/plugins/pg_array_associations.rb

@@ -52,6 +52,8 @@ module Sequel
     #                such as when this plugin needs to create an array type,
     #                and typecasting is turned off or not setup correctly
     #                for the model object.
+    # :raise_on_save_failure :: Do not raise exceptions for hook or validation failures when saving associated
+    #                           objects in the add/remove methods (return nil instead).
     # :save_after_modify :: For pg_array_to_many associations, this makes the
     #                       the modification methods save the current object,
     #                       so they operate more similarly to the one_to_many
@@ -93,6 +95,11 @@ module Sequel
           :"#{underscore(demodulize(self[:model].name))}_ids"
         end
         
+        # Handle silent failure of add/remove methods if raise_on_save_failure is false.
+        def handle_silent_modification_failure?
+          self[:raise_on_save_failure] == false
+        end
+
         # The hash key to use for the eager loading predicate (left side of IN (1, 2, 3))
         def predicate_key
           cached_fetch(:predicate_key){qualify_assoc(self[:key_column])}
@@ -159,6 +166,12 @@ module Sequel
           :"#{singularize(self[:name])}_ids"
         end
 
+        # Handle silent failure of add/remove methods if raise_on_save_failure is false
+        # and save_after_modify is true.
+        def handle_silent_modification_failure?
+          self[:raise_on_save_failure] == false && self[:save_after_modify]
+        end
+
         # A qualified version of the associated primary key.
         def predicate_key
           cached_fetch(:predicate_key){qualify_assoc(primary_key)}
@@ -286,7 +299,8 @@ module Sequel
           def_association_dataset_methods(opts)
 
           unless opts[:read_only]
-            validate = opts[:validate]
+            save_opts = {:validate=>opts[:validate]}
+            save_opts[:raise_on_failure] = opts[:raise_on_save_failure] != false
 
             array_type = opts[:array_type] ||= :integer
             adder = opts[:adder] || proc do |o|
@@ -295,14 +309,14 @@ module Sequel
               else
                 o.send("#{key}=", Sequel.pg_array([send(pk)], array_type))
               end
-              o.save(:validate=>validate) || raise(Sequel::Error, "invalid associated object, cannot save")
+              o.save(save_opts)
             end
             association_module_private_def(opts._add_method, opts, &adder)
     
             remover = opts[:remover] || proc do |o|
               if (array = o.send(key)) && !array.empty?
                 array.delete(send(pk))
-                o.save(:validate=>validate) || raise(Sequel::Error, "invalid associated object, cannot save")
+                o.save(save_opts)
               end
             end
             association_module_private_def(opts._remove_method, opts, &remover)
@@ -388,11 +402,13 @@ module Sequel
           def_association_dataset_methods(opts)
 
           unless opts[:read_only]
-            validate = opts[:validate]
+            save_opts = {:validate=>opts[:validate]}
+            save_opts[:raise_on_failure] = opts[:raise_on_save_failure] != false
             array_type = opts[:array_type] ||= :integer
+
             if opts[:save_after_modify]
               save_after_modify = proc do |obj|
-                obj.save(:validate=>validate) || raise(Sequel::Error, "invalid associated object, cannot save")
+                obj.save(save_opts)
               end
             end