sequel 3.48.0 → 4.0.0

data/lib/sequel/dataset/sql.rb

@@ -40,8 +40,6 @@ module Sequel
       when 1
         case vals = values.at(0)
         when Hash
-          vals = @opts[:defaults].merge(vals) if @opts[:defaults]
-          vals = vals.merge(@opts[:overrides]) if @opts[:overrides]
           values = []
           vals.each do |k,v| 
             columns << k
@@ -163,7 +161,7 @@ module Sequel
     #
     # Raises an +Error+ if the dataset is grouped or includes more
     # than one table.
-    def update_sql(values = {})
+    def update_sql(values = OPTS)
       return static_sql(opts[:sql]) if opts[:sql]
       check_modification_allowed!
       clone(:values=>values)._update_sql
@@ -202,6 +200,7 @@ module Sequel
     CASE_THEN = " THEN ".freeze
     CASE_WHEN = " WHEN ".freeze
     CAST_OPEN = 'CAST('.freeze
+    COLON = ':'.freeze
     COLUMN_REF_RE1 = Sequel::COLUMN_REF_RE1
     COLUMN_REF_RE2 = Sequel::COLUMN_REF_RE2
     COLUMN_REF_RE3 = Sequel::COLUMN_REF_RE3
@@ -285,80 +284,6 @@ module Sequel
     V190 = '1.9.0'.freeze
     WHERE = " WHERE ".freeze
 
-    PUBLIC_APPEND_METHODS = (<<-END).split.map{|x| x.to_sym}
-      literal
-      aliased_expression_sql
-      array_sql
-      boolean_constant_sql
-      case_expression_sql
-      cast_sql
-      column_all_sql
-      complex_expression_sql
-      constant_sql
-      delayed_evaluation_sql
-      function_sql
-      join_clause_sql
-      join_on_clause_sql
-      join_using_clause_sql
-      negative_boolean_constant_sql
-      ordered_expression_sql
-      placeholder_literal_string_sql
-      qualified_identifier_sql
-      quote_identifier
-      quote_schema_table
-      quoted_identifier
-      subscript_sql
-      window_sql
-      window_function_sql
-    END
-    PRIVATE_APPEND_METHODS = (<<-END).split.map{|x| x.to_sym}
-      as_sql
-      column_list
-      compound_dataset_sql
-      expression_list
-      literal_array
-      literal_blob
-      literal_dataset
-      literal_expression
-      literal_hash
-      literal_other
-      literal_string
-      literal_symbol
-      source_list
-      subselect_sql
-      table_ref
-    END
-
-    # For each of the methods in the given array, define a method with
-    # that name that returns a string with the SQL fragment that the
-    # related *_append method would add.
-    #
-    # Do not call this method with untrusted input, as that can result in
-    # arbitrary code execution.
-    def self.def_append_methods(meths)
-      Sequel::Deprecation.deprecate('Dataset.def_append_methods', "There is no replacement planned")
-      meths.each do |meth|
-        class_eval(<<-END, __FILE__, __LINE__ + 1)
-          def #{meth}(*args, &block)
-            s = ''
-            #{meth}_append(s, *args, &block)
-            s
-          end
-        END
-      end
-    end
-    (PUBLIC_APPEND_METHODS + PRIVATE_APPEND_METHODS - [:literal, :quote_identifier, :quote_schema_table]).each do |meth|
-      class_eval(<<-END, __FILE__, __LINE__ + 1)
-        def #{meth}(*args, &block)
-          Sequel::Deprecation.deprecate('Dataset##{meth}', "Please switch to Dataset##{meth}_append")
-          s = ''
-          #{meth}_append(s, *args, &block)
-          s
-        end
-      END
-    end
-    private(*PRIVATE_APPEND_METHODS)
-
     [:literal, :quote_identifier, :quote_schema_table].each do |meth|
       class_eval(<<-END, __FILE__, __LINE__ + 1)
         def #{meth}(*args, &block)
@@ -622,17 +547,18 @@ module Sequel
           literal_append(sql, args[i]) unless i == len
         end
         unless str.length == args.length || str.length == args.length + 1
-          Sequel::Deprecation.deprecate("Using a mismatched number of placeholders (#{str.length}) and placeholder arguments (#{args.length}) is deprecated and will raise an Error in Sequel 4.")
+          raise Error, "Mismatched number of placeholders (#{str.length}) and placeholder arguments (#{args.length}) when using placeholder array"
         end
       else
         i = -1
+        match_len = args.length - 1
         loop do
           previous, q, str = str.partition(QUESTION_MARK)
           sql << previous
           literal_append(sql, args.at(i+=1)) unless q.empty?
           if str.empty?
-            unless i + 1 == args.length
-              Sequel::Deprecation.deprecate("Using a mismatched number of placeholders (#{i+1}) and placeholder arguments (#{args.length}) is deprecated and will raise an Error in Sequel 4.")
+            unless i == match_len
+              raise Error, "Mismatched number of placeholders (#{i+1}) and placeholder arguments (#{args.length}) when using placeholder array"
             end
             break
           end
@@ -693,7 +619,7 @@ module Sequel
     # Note that this function does not handle tables with more than one
     # level of qualification (e.g. database.schema.table on Microsoft
     # SQL Server).
-    def schema_and_table(table_name, sch=(db._default_schema if db))
+    def schema_and_table(table_name, sch=nil)
       sch = sch.to_s if sch
       case table_name
       when Symbol
@@ -730,7 +656,15 @@ module Sequel
     def subscript_sql_append(sql, s)
       literal_append(sql, s.f)
       sql << BRACKET_OPEN
-      expression_list_append(sql, s.sub)
+      if s.sub.length == 1 && (range = s.sub.first).is_a?(Range)
+        literal_append(sql, range.begin)
+        sql << COLON
+        e = range.end
+        e -= 1 if range.exclude_end? && e.is_a?(Integer)
+        literal_append(sql, e)
+      else
+        expression_list_append(sql, s.sub)
+      end
       sql << BRACKET_CLOSE
     end
 
@@ -949,14 +883,10 @@ module Sequel
       end
     end
 
-    # An expression for how to handle an empty array lookup
+    # An expression for how to handle an empty array lookup.
     def empty_array_value(op, cols)
-      if Sequel.empty_array_handle_nulls
-        c = Array(cols)
-        SQL::BooleanExpression.from_value_pairs(c.zip(c), :AND, op == :IN)
-      else
-        {1 => ((op == :IN) ? 0 : 1)}
-      end
+      c = Array(cols)
+      SQL::BooleanExpression.from_value_pairs(c.zip(c), :AND, op == :IN)
     end
     
     # Format the timestamp based on the default_timestamp_format, with a couple
@@ -1008,12 +938,6 @@ module Sequel
       end
     end
 
-    # REMOVE40
-    def table_ref_append(sql, v)
-      Sequel::Deprecation.deprecate('Dataset#table_ref_append', "Please switch to Dataset#identifier_append")
-      identifier_append(sql, v)
-    end
-    
     # Append all identifiers in args interspersed by commas.
     def identifier_list_append(sql, args)
       c = false
@@ -1467,8 +1391,6 @@ module Sequel
       values = opts[:values]
       sql << SET
       if values.is_a?(Hash)
-        values = opts[:defaults].merge(values) if opts[:defaults]
-        values = values.merge(opts[:overrides]) if opts[:overrides]
         c = false
         eq = EQUAL
         values.each do |k, v|

data/lib/sequel/deprecated.rb

@@ -54,21 +54,5 @@ module Sequel
       end
       nil
     end
-
-    # Return a module that includes deprecation warnings for all public
-    # instance methods in the given module, such that including the returned
-    # module will not result in the given module being included.
-    def self.deprecated_module(mod, &block)
-      Module.new do
-        include mod.dup
-        mod.public_instance_methods.each do |meth|
-          msg = block.call(meth)
-          define_method(meth) do |*a, &blk|
-            Sequel::Deprecation.deprecate(*msg)
-            super(*a, &blk)
-          end
-        end
-      end
-    end
   end
 end

data/lib/sequel/exceptions.rb

@@ -54,9 +54,6 @@ module Sequel
   # method, and the dataset does not yield any rows.
   class NoMatchingRow < Error; end
 
-  # Error raised when the adapter adapter hasn't implemented a method such as +tables+:
-  class NotImplemented < Error; end
-
   # Error raised when the connection pool cannot acquire a database connection
   # before the timeout.
   class PoolTimeout < Error; end

data/lib/sequel/extensions/_pretty_table.rb

@@ -60,7 +60,7 @@ module Sequel
       case v
       when Bignum, Fixnum
         "%#{size}d" % v
-      when Float
+      when Float, BigDecimal
         "%#{size}g" % v
       else
         "%-#{size}s" % v.to_s

data/lib/sequel/extensions/columns_introspection.rb

@@ -27,7 +27,7 @@ module Sequel
       if (pcs = probable_columns) && pcs.all?
         @columns = pcs
       else
-        columns_without_introspection
+        super
       end
     end
 
@@ -77,17 +77,6 @@ module Sequel
     end
   end
 
-  class Dataset
-    alias columns_without_introspection columns
-
-    # Enable column introspection for every dataset.
-    def self.introspect_all_columns
-      Sequel::Deprecation.deprecate('Sequel::Dataset.introspect_all_columns', "Please use Database.extension :columns_introspection to load the extension into all databases")
-      include ColumnsIntrospection
-      remove_method(:columns) if instance_methods(false).map{|x| x.to_s}.include?('columns')
-    end
-  end
-
   Dataset.register_extension(:columns_introspection, Sequel::ColumnsIntrospection)
 end
 

data/lib/sequel/extensions/constraint_validations.rb

@@ -144,7 +144,7 @@ module Sequel
       # Create constraint validation methods that don't take an argument 
       %w'presence unique'.each do |v|
         class_eval(<<-END, __FILE__, __LINE__+1)
-          def #{v}(columns, opts={})
+          def #{v}(columns, opts=OPTS)
             @generator.validation({:type=>:#{v}, :columns=>Array(columns)}.merge(opts))
           end
         END
@@ -153,7 +153,7 @@ module Sequel
       # Create constraint validation methods that take an argument 
       %w'exact_length min_length max_length length_range format like ilike includes'.each do |v|
         class_eval(<<-END, __FILE__, __LINE__+1)
-          def #{v}(arg, columns, opts={})
+          def #{v}(arg, columns, opts=OPTS)
             @generator.validation({:type=>:#{v}, :columns=>Array(columns), :arg=>arg}.merge(opts))
           end
         END
@@ -244,7 +244,7 @@ module Sequel
     # the related metadata, it could make it impossible to save
     # rows, since a validation for a nonexistent column will be
     # created.
-    def drop_constraint_validations_for(opts={})
+    def drop_constraint_validations_for(opts=OPTS)
       ds = from(constraint_validations_table)
       if table = opts[:table]
         ds = ds.where(:table=>constraint_validations_literal_table(table))

data/lib/sequel/extensions/core_extensions.rb

@@ -208,9 +208,6 @@ class Symbol
   include Sequel::SQL::StringMethods
   include Sequel::SQL::SubscriptMethods
   include Sequel::SQL::ComplexExpressionMethods
-  if RUBY_VERSION < '1.9.0'
-    include Sequel::Deprecation.deprecated_module(Sequel::SQL::InequalityMethods){|meth| ["Symbol##{meth}", "Please use Sequel.expr(symbol).#{meth} instead, or Sequel.extension(:ruby18_symbol_extensions) to continue using it"]}
-  end
 
   # Returns receiver wrapped in an <tt>Sequel::SQL::Identifier</tt>.  Usually used to
   # prevent splitting the symbol.
@@ -232,10 +229,4 @@ class Symbol
   def sql_function(*args)
     Sequel::SQL::Function.new(self, *args)
   end
-  if RUBY_VERSION < '1.9.0'
-    def [](*args)
-      Sequel::Deprecation.deprecate('Symbol#[]', 'Please use Sequel.function instead, or Sequel.extension(:ruby18_symbol_extensions) to continue using it')
-      Sequel::SQL::Function.new(self, *args)
-    end
-  end
 end

data/lib/sequel/extensions/date_arithmetic.rb

@@ -122,8 +122,7 @@ module Sequel
             end
             false
           else
-            Sequel::Deprecation.deprecate('Sequel::NotImplemented', 'Sequel 4 will just raise Error if date_arithmetic is not supported on the database')
-            raise NotImplemented, "date arithmetic is not implemented on #{db.database_type}"
+            raise Error, "date arithmetic is not implemented on #{db.database_type}"
           end
 
           if cast

data/lib/sequel/extensions/graph_each.rb

@@ -17,6 +17,17 @@
 
 module Sequel
   module GraphEach
+    # Call graph_each for graphed datasets that are not being eager graphed.
+    def each
+      if @opts[:graph] && !@opts[:eager_graph]
+        graph_each{|r| yield r}
+      else
+        super
+      end
+    end
+
+    private
+
     # Fetch the rows, split them into component table parts,
     # tranform and run the row_proc on each part (if applicable),
     # and yield a hash of the parts.

data/lib/sequel/extensions/migration.rb

@@ -369,7 +369,7 @@ module Sequel
 
     # Return whether the migrator is current (i.e. it does not need to make
     # any changes).  Takes the same arguments as #run.
-    def self.is_current?(db, directory, opts={})
+    def self.is_current?(db, directory, opts=OPTS)
       migrator_class(directory).new(db, directory, opts).is_current?
     end
 
@@ -386,7 +386,7 @@ module Sequel
     #   Sequel::Migrator.run(DB, "migrations", :target=>15, :current=>10)
     #   Sequel::Migrator.run(DB, "app1/migrations", :column=> :app2_version)
     #   Sequel::Migrator.run(DB, "app2/migrations", :column => :app2_version, :table=>:schema_info2)
-    def self.run(db, directory, opts={})
+    def self.run(db, directory, opts=OPTS)
       migrator_class(directory).new(db, directory, opts).run
     end
 
@@ -432,7 +432,7 @@ module Sequel
     attr_reader :target
 
     # Setup the state for the migrator
-    def initialize(db, directory, opts={})
+    def initialize(db, directory, opts=OPTS)
       raise(Error, "Must supply a valid migration path") unless File.directory?(directory)
       @db = db
       @directory = directory
@@ -502,7 +502,7 @@ module Sequel
     attr_reader :migrations
 
     # Set up all state for the migrator instance
-    def initialize(db, directory, opts={})
+    def initialize(db, directory, opts=OPTS)
       super
       @target = opts[:target] || latest_migration_version
       @current = opts[:current] || current_migration_version
@@ -628,7 +628,7 @@ module Sequel
     attr_reader :migration_tuples
 
     # Set up all state for the migrator instance
-    def initialize(db, directory, opts={})
+    def initialize(db, directory, opts=OPTS)
       super
       @target = opts[:target]
       @applied_migrations = get_applied_migrations

data/lib/sequel/extensions/null_dataset.rb

@@ -30,6 +30,15 @@
 module Sequel
   class Dataset
     module Nullifiable
+      # Return a cloned nullified dataset.
+      def nullify
+        clone.nullify!
+      end
+
+      # Nullify the current dataset
+      def nullify!
+        extend NullDataset
+      end
     end
 
     module NullDataset
@@ -65,7 +74,7 @@ module Sequel
       end
 
       # Return 0 without sending a database query.
-      def update(v={})
+      def update(v=OPTS)
         0
       end
 
@@ -82,20 +91,9 @@ module Sequel
       # make them noops.  There's nothing we can do if the db
       # is accessed directly to make a change, though.
       (%w'_ddl _dui _insert' << '').each do |m|
-        class_eval("private; def execute#{m}(sql, opts={}) end", __FILE__, __LINE__)
+        class_eval("private; def execute#{m}(sql, opts=OPTS) end", __FILE__, __LINE__)
       end
     end
-
-    # Return a cloned nullified dataset.
-    def nullify
-      clone.nullify!
-    end
-
-    # Nullify the current dataset
-    def nullify!
-      Sequel::Deprecation.deprecate('Loading the null_dataset extension globally', "Please use Database/Dataset#extension to load the extension into this dataset") unless is_a?(Nullifiable)
-      extend NullDataset
-    end
   end
 
   Dataset.register_extension(:null_dataset, Dataset::Nullifiable)

data/lib/sequel/extensions/pagination.rb

@@ -16,32 +16,29 @@
 
 module Sequel
   module DatasetPagination
-  end
-
-  class Dataset
     # Returns a paginated dataset. The returned dataset is limited to
     # the page size at the correct offset, and extended with the Pagination
     # module.  If a record count is not provided, does a count of total
     # number of records for this dataset.
     def paginate(page_no, page_size, record_count=nil)
-      Sequel::Deprecation.deprecate('Loading the pagination extension globally', "Please use Database/Dataset#extension to load the extension into this dataset") unless is_a?(DatasetPagination)
       raise(Error, "You cannot paginate a dataset that already has a limit") if @opts[:limit]
       paginated = limit(page_size, (page_no - 1) * page_size)
-      paginated.extend(Pagination)
+      paginated.extend(Dataset::Pagination)
       paginated.set_pagination_info(page_no, page_size, record_count || count)
     end
       
     # Yields a paginated dataset for each page and returns the receiver. Does
     # a count to find the total number of records for this dataset.
     def each_page(page_size)
-      Sequel::Deprecation.deprecate('Loading the pagination extension globally', "Please use Database/Dataset#extension to load the extension into this dataset") unless is_a?(DatasetPagination)
       raise(Error, "You cannot paginate a dataset that already has a limit") if @opts[:limit]
       record_count = count
       total_pages = (record_count / page_size.to_f).ceil
       (1..total_pages).each{|page_no| yield paginate(page_no, page_size, record_count)}
       self
     end
+  end
 
+  class Dataset
     # Holds methods that only relate to paginated datasets. Paginated dataset
     # have pages starting at 1 (page 1 is offset 0, page 1 is offset page_size).
     module Pagination