sequel 2.12.0 → 3.0.0

data/lib/sequel/database/schema_methods.rb

@@ -53,10 +53,15 @@ module Sequel
     #     index :title
     #   end
     #
+    # Options:
+    # * :temp - Create the table as a temporary table.
+    #
     # See Schema::Generator.
     def create_table(name, options={}, &block)
       options = {:generator=>options} if options.is_a?(Schema::Generator)
-      create_table_sql_list(name, *((options[:generator] || Schema::Generator.new(self, &block)).create_info << options)).flatten.each {|sql| execute_ddl(sql)}
+      generator = options[:generator] || Schema::Generator.new(self, &block)
+      execute_ddl(create_table_sql(name, generator, options))
+      index_sql_list(name, generator.indexes).each{|sql| execute_ddl(sql)}
     end
     
     # Forcibly creates a table, attempting to drop it unconditionally (and catching any errors), then creating it.
@@ -99,8 +104,8 @@ module Sequel
     #   DB.drop_index :posts, [:author, :title]
     #
     # See alter_table.
-    def drop_index(table, columns)
-      alter_table(table) {drop_index(columns)}
+    def drop_index(table, columns, options={})
+      alter_table(table){drop_index(columns, options)}
     end
     
     # Drops one or more tables corresponding to the given names:

data/lib/sequel/database/schema_sql.rb

@@ -10,12 +10,7 @@ module Sequel
     RESTRICT = 'RESTRICT'.freeze
     SET_DEFAULT = 'SET DEFAULT'.freeze
     SET_NULL = 'SET NULL'.freeze
-    TYPES = Hash.new {|h, k| k}
-    TYPES.merge!(:double=>'double precision', String=>'varchar(255)',
-      Integer=>'integer', Fixnum=>'integer', Bignum=>'bigint',
-      Float=>'double precision', BigDecimal=>'numeric', Numeric=>'numeric',
-      Date=>'date', DateTime=>'timestamp', Time=>'timestamp', File=>'blob',
-      TrueClass=>'boolean', FalseClass=>'boolean')
+    TEMPORARY = 'TEMPORARY '.freeze
     UNDERSCORE = '_'.freeze
     UNIQUE = ' UNIQUE'.freeze
     UNSIGNED = ' UNSIGNED'.freeze
@@ -72,7 +67,6 @@ module Sequel
     
     # SQL DDL fragment containing the column creation SQL for the given column.
     def column_definition_sql(column)
-      return constraint_definition_sql(column) if column[:type] == :check
       sql = "#{quote_identifier(column[:name])} #{type_literal(column)}"
       sql << UNIQUE if column[:unique]
       sql << NOT_NULL if column[:null] == false
@@ -86,8 +80,8 @@ module Sequel
     
     # SQL DDL fragment containing the column creation
     # SQL for all given columns, used inside a CREATE TABLE block.
-    def column_list_sql(columns)
-      columns.map{|c| column_definition_sql(c)}.join(COMMA_SEPARATOR)
+    def column_list_sql(generator)
+      (generator.columns.map{|c| column_definition_sql(c)} + generator.constraints.map{|c| constraint_definition_sql(c)}).join(COMMA_SEPARATOR)
     end
 
     # SQL DDL fragment for column foreign key references
@@ -102,7 +96,10 @@ module Sequel
     # SQL DDL fragment specifying a constraint on a table.
     def constraint_definition_sql(constraint)
       sql = constraint[:name] ? "CONSTRAINT #{quote_identifier(constraint[:name])} " : ""
-      case constraint[:constraint_type]
+      case constraint[:type]
+      when :check
+        check = constraint[:check]
+        sql << "CHECK #{filter_expr((check.is_a?(Array) && check.length == 1) ? check.first : check)}"
       when :primary_key
         sql << "PRIMARY KEY #{literal(constraint[:columns])}"
       when :foreign_key
@@ -111,21 +108,16 @@ module Sequel
       when :unique
         sql << "UNIQUE #{literal(constraint[:columns])}"
       else
-        check = constraint[:check]
-        sql << "CHECK #{filter_expr((check.is_a?(Array) && check.length == 1) ? check.first : check)}"
+        raise Error, "Invalid constriant type #{constraint[:type]}, should be :check, :primary_key, :foreign_key, or :unique"
       end
       sql
     end
 
-    # Array of SQL DDL statements, the first for creating a table with the given
-    # name and column specifications, and the others for specifying indexes on
-    # the table.
-    def create_table_sql_list(name, columns, indexes = nil, options = {})
-      sql = ["CREATE TABLE #{quote_schema_table(name)} (#{column_list_sql(columns)})"]
-      sql.concat(index_list_sql_list(name, indexes)) if indexes && !indexes.empty?
-      sql
+    # DDL statement for creating a table with the given name, columns, and options
+    def create_table_sql(name, generator, options)
+      "CREATE #{temporary_table_sql if options[:temp]}TABLE #{quote_schema_table(name)} (#{column_list_sql(generator)})"
     end
-    
+
     # Default index name for the table and columns, may be too long
     # for certain databases.
     def default_index_name(table_name, columns)
@@ -163,7 +155,7 @@ module Sequel
   
     # Array of SQL DDL statements, one for each index specification,
     # for the given table.
-    def index_list_sql_list(table_name, indexes)
+    def index_sql_list(table_name, indexes)
       indexes.map{|i| index_definition_sql(table_name, i)}
     end
 
@@ -207,18 +199,112 @@ module Sequel
       "ALTER TABLE #{quote_schema_table(name)} RENAME TO #{quote_schema_table(new_name)}"
     end
 
+    # SQL DDL fragment for temporary table
+    def temporary_table_sql
+      self.class.const_get(:TEMPORARY)
+    end
+
     # SQL fragment specifying the type of a given column.
     def type_literal(column)
-      type = type_literal_base(column)
+      column[:type].is_a?(Class) ? type_literal_generic(column) : type_literal_specific(column)
+    end
+    
+    # SQL fragment specifying the full type of a column,
+    # consider the type with possible modifiers.
+    def type_literal_generic(column)
+      meth = "type_literal_generic_#{column[:type].name.to_s.downcase}"
+      if respond_to?(meth, true)
+        send(meth, column)
+      else
+        raise Error, "Unsupported ruby class used as database type: #{column[:type]}"
+      end
+    end
+
+    # Alias for type_literal_generic_numeric, to make overriding in a subclass easier.
+    def type_literal_generic_bigdecimal(column)
+      type_literal_generic_numeric(column)
+    end
+
+    # Sequel uses the bigint type by default for Bignums.
+    def type_literal_generic_bignum(column)
+      :bigint
+    end
+
+    # Sequel uses the date type by default for Dates.
+    def type_literal_generic_date(column)
+      :date
+    end
+
+    # Sequel uses the timestamp type by default for DateTimes.
+    def type_literal_generic_datetime(column)
+      :timestamp
+    end
+
+    # Alias for type_literal_generic_trueclass, to make overriding in a subclass easier.
+    def type_literal_generic_falseclass(column)
+      type_literal_generic_trueclass(column)
+    end
+
+    # Sequel uses the blob type by default for Files.
+    def type_literal_generic_file(column)
+      :blob
+    end
+
+    # Alias for type_literal_generic_integer, to make overriding in a subclass easier.
+    def type_literal_generic_fixnum(column)
+      type_literal_generic_integer(column)
+    end
+
+    # Sequel uses the double precision type by default for Floats.
+    def type_literal_generic_float(column)
+      :"double precision"
+    end
+
+    # Sequel uses the integer type by default for integers
+    def type_literal_generic_integer(column)
+      :integer
+    end
+
+    # Sequel uses the numeric type by default for Numerics and BigDecimals.
+    # If a size is given, it is used, otherwise, it will default to whatever
+    # the database default is for an unsized value.
+    def type_literal_generic_numeric(column)
+      column[:size] ? "numeric(#{Array(column[:size]).join(', ')})" : :numeric
+    end
+
+    # Sequel uses the varchar type by default for Strings.  If a
+    # size isn't present, Sequel assumes a size of 255.  If the
+    # :fixed option is used, Sequel uses the char type.  If the
+    # :text option is used, Sequel uses the :text type.
+    def type_literal_generic_string(column)
+      if column[:text]
+        :text
+      elsif column[:fixed]
+        "char(#{column[:size]||255})"
+      else
+        "varchar(#{column[:size]||255})"
+      end
+    end
+    
+    # Sequel uses the timestamp type by default for Time values.
+    # If the :only_time option is used, the time type is used.
+    def type_literal_generic_time(column)
+      column[:only_time] ? :time : :timestamp
+    end
+
+    # Sequel uses the boolean type by default for TrueClass and FalseClass.
+    def type_literal_generic_trueclass(column)
+      :boolean
+    end
+
+    # SQL fragment for the given type of a column if the column is not one of the
+    # generic types specified with a ruby class.
+    def type_literal_specific(column)
+      type = column[:type]
+      type = "double precision" if type.to_s == 'double'
       column[:size] ||= 255 if type.to_s == 'varchar'
       elements = column[:size] || column[:elements]
       "#{type}#{literal(Array(elements)) if elements}#{UNSIGNED if column[:unsigned]}"
     end
-
-    # SQL fragment specifying the base type of a given column,
-    # without the size or elements.
-    def type_literal_base(column)
-      TYPES[column[:type]]
-    end
   end
 end

data/lib/sequel/dataset.rb

@@ -87,7 +87,6 @@ module Sequel
       @identifier_output_method = db.identifier_output_method if db.respond_to?(:identifier_output_method)
       @opts = opts || {}
       @row_proc = nil
-      @transform = nil
     end
     
     ### Class Methods ###
@@ -118,10 +117,9 @@ module Sequel
 
     # Returns an array with all records in the dataset. If a block is given,
     # the array is iterated over after all items have been loaded.
-    def all(opts = (defarg=true;nil), &block)
-      Deprecation.deprecate("Calling Dataset#all with an argument is deprecated and will raise an error in Sequel 3.0.  Use dataset.clone(opts).all.") unless defarg
+    def all(&block)
       a = []
-      defarg ? each{|r| a << r} : each(opts){|r| a << r}
+      each{|r| a << r}
       post_load(a)
       a.each(&block) if block
       a
@@ -170,24 +168,21 @@ module Sequel
 
     # Deletes the records in the dataset.  The returned value is generally the
     # number of records deleted, but that is adapter dependent.
-    def delete(opts=(defarg=true;nil))
-      Deprecation.deprecate("Calling Dataset#delete with an argument is deprecated and will raise an error in Sequel 3.0.  Use dataset.clone(opts).delete.") unless defarg
-      execute_dui(defarg ? delete_sql : delete_sql(opts))
+    def delete
+      execute_dui(delete_sql)
     end
     
     # Iterates over the records in the dataset as they are yielded from the
     # database adapter, and returns self.
-    def each(opts = (defarg=true;nil), &block)
-      Deprecation.deprecate("Calling Dataset#each with an argument is deprecated and will raise an error in Sequel 3.0.  Use dataset.clone(opts).each.") unless defarg
-      if opts && opts.keys.any?{|o| COLUMN_CHANGE_OPTS.include?(o)}
-        prev_columns = @columns
-        begin
-          defarg ? _each(&block) : _each(opts, &block)
-        ensure
-          @columns = prev_columns
-        end
+    def each(&block)
+      if @opts[:graph]
+        graph_each(&block)
       else
-        defarg ? _each(&block) : _each(opts, &block)
+        if row_proc = @row_proc
+          fetch_rows(select_sql){|r| yield row_proc.call(r)}
+        else
+          fetch_rows(select_sql, &block)
+        end
       end
       self
     end
@@ -250,9 +245,8 @@ module Sequel
 
     # Updates values for the dataset.  The returned value is generally the
     # number of rows updated, but that is adapter dependent.
-    def update(values={}, opts=(defarg=true;nil))
-      Deprecation.deprecate("Calling Dataset#update with an argument is deprecated and will raise an error in Sequel 3.0.  Use dataset.clone(opts).update.") unless defarg
-      execute_dui(defarg ? update_sql(values) : update_sql(value, opts))
+    def update(values={})
+      execute_dui(update_sql(values))
     end
   
     # Add the mutation methods via metaprogramming
@@ -267,23 +261,6 @@ module Sequel
 
     private
     
-    # Runs #graph_each if graphing.  Otherwise, iterates through the records
-    # yielded by #fetch_rows, applying any row_proc or transform if necessary,
-    # and yielding the result.
-    def _each(opts=(defarg=true;nil), &block)
-      if @opts[:graph] and !(opts && opts[:graph] == false)
-        defarg ? graph_each(&block) : graph_each(opts, &block)
-      else
-        row_proc = @row_proc unless opts && opts[:naked]
-        transform = @transform
-        fetch_rows(defarg ? select_sql : select_sql(opts)) do |r|
-          r = transform_load(r) if transform
-          r = row_proc[r] if row_proc
-          yield r
-        end
-      end
-    end
-
     # Set the server to use to :default unless it is already set in the passed opts
     def default_server_opts(opts)
       {:server=>@opts[:server] || :default}.merge(opts)
@@ -338,10 +315,6 @@ module Sequel
     # VirtualRow instance.
     def virtual_row_block_call(block)
       return unless block
-      unless Sequel.virtual_row_instance_eval
-        Deprecation.deprecate('Using a VirtualRow block without an argument is deprecated, and its meaning will change in Sequel 3.0.  Add a block argument to keep the old semantics, or set Sequel.virtual_row_instance_eval = true to use instance_eval for VirtualRow blocks without arguments.') unless block.arity == 1
-        return block.call(SQL::VirtualRow.new)
-      end
       case block.arity
       when -1, 0
         SQL::VirtualRow.new.instance_eval(&block)

data/lib/sequel/dataset/convenience.rb

@@ -2,13 +2,16 @@ module Sequel
   class Dataset
     COMMA_SEPARATOR = ', '.freeze
     COUNT_OF_ALL_AS_COUNT = SQL::Function.new(:count, LiteralString.new('*'.freeze)).as(:count)
+    ARRAY_ACCESS_ERROR_MSG = 'You cannot call Dataset#[] with an integer or with no arguments.'.freeze
+    MAP_ERROR_MSG = 'Using Dataset#map with an argument and a block is not allowed'.freeze
+    GET_ERROR_MSG = 'must provide argument or block to Dataset#get, not both'.freeze
+    IMPORT_ERROR_MSG = 'Using Sequel::Dataset#import an empty column array is not allowed'.freeze
 
     # Returns the first record matching the conditions. Examples:
     #
     #   ds[:id=>1] => {:id=1}
     def [](*conditions)
-      Deprecation.deprecate('Using an Integer argument to Dataset#[] is deprecated and will raise an error in Sequel 3.0. Use Dataset#first.') if conditions.length == 1 and conditions.is_a?(Integer)
-      Deprecation.deprecate('Using Dataset#[] without an argument is deprecated and will raise an error in Sequel 3.0. Use Dataset#first.') if conditions.length == 0
+      raise(Error, ARRAY_ACCESS_ERROR_MSG) if (conditions.length == 1 and conditions.is_a?(Integer)) or conditions.length == 0
       first(*conditions)
     end
 
@@ -70,8 +73,12 @@ module Sequel
     #   ds.get(:id)
     #   ds.get{|o| o.sum(:id)}
     def get(column=nil, &block)
-      raise(Error, 'must provide argument or block to Dataset#get, not both') if column && block
-      (column ? select(column) : select(&block)).single_value
+      if column
+        raise(Error, GET_ERROR_MSG) if block
+        select(column).single_value
+      else
+        select(&block).single_value
+      end
     end
 
     # Returns a dataset grouped by the given column with count by group,
@@ -101,31 +108,18 @@ module Sequel
     #
     #   # this will commit every 50 records
     #   dataset.import([:x, :y], [[1, 2], [3, 4], ...], :slice => 50)
-    def import(*args)
-      if args.empty?
-        Sequel::Deprecation.deprecate('Calling Sequel::Dataset#import with no arguments', 'Use dataset.multi_insert([])')
-        return
-      elsif args[0].is_a?(Array) && args[1].is_a?(Array)
-        columns, values, opts = *args
-      elsif args[0].is_a?(Array) && args[1].is_a?(Dataset)
-        table = @opts[:from].first
-        columns, dataset = *args
-        sql = "INSERT INTO #{quote_identifier(table)} (#{identifier_list(columns)}) VALUES #{literal(dataset)}"
-        return @db.transaction{execute_dui(sql)}
-      else
-        Sequel::Deprecation.deprecate('Calling Sequel::Dataset#import with hashes', 'Use Sequel::Dataset#multi_insert')
-        return multi_insert(*args)
-      end
-      # make sure there's work to do
-      Sequel::Deprecation.deprecate('Calling Sequel::Dataset#import an empty column array is deprecated and will raise an error in Sequel 3.0.') if columns.empty?
-      return if columns.empty? || values.empty?
-      
-      slice_size = opts && (opts[:commit_every] || opts[:slice])
+    def import(columns, values, opts={})
+      return @db.transaction{execute_dui("INSERT INTO #{quote_schema_table(@opts[:from].first)} (#{identifier_list(columns)}) VALUES #{literal(values)}")} if values.is_a?(Dataset)
+
+      return if values.empty?
+      raise(Error, IMPORT_ERROR_MSG) if columns.empty?
       
-      if slice_size
-        values.each_slice(slice_size) do |slice|
-          statements = multi_insert_sql(columns, slice)
-          @db.transaction(opts){statements.each{|st| execute_dui(st)}}
+      if slice_size = opts[:commit_every] || opts[:slice]
+        offset = 0
+        loop do
+          @db.transaction(opts){multi_insert_sql(columns, values[offset, slice_size]).each{|st| execute_dui(st)}}
+          offset += slice_size
+          break if offset >= values.length
         end
       else
         statements = multi_insert_sql(columns, values)
@@ -155,8 +149,8 @@ module Sequel
     #   ds.map(:id) => [1, 2, 3, ...]
     #   ds.map{|r| r[:id] * 2} => [2, 4, 6, ...]
     def map(column=nil, &block)
-      Deprecation.deprecate('Using Dataset#map with an argument and a block is deprecated and will raise an error in Sequel 3.0. Use an argument or a block, not both.') if column && block
       if column
+        raise(Error, MAP_ERROR_MSG) if block
         super(){|r| r[column]}
       else
         super(&block)
@@ -183,22 +177,10 @@ module Sequel
     # values.
     #
     # You can also use the :slice or :commit_every option that import accepts.
-    def multi_insert(*args)
-      if args.empty?
-        Sequel::Deprecation.deprecate('Calling Sequel::Dataset#multi_insert with no arguments', 'Use dataset.multi_insert([])')
-        return
-      elsif args[0].is_a?(Array) && (args[1].is_a?(Array) || args[1].is_a?(Dataset))
-        Sequel::Deprecation.deprecate('Calling Sequel::Dataset#multi_insert with an array of columns and an array of arrays of values', 'Use Sequel::Dataset#import')
-       return import(*args)
-      else
-        # we assume that an array of hashes is given
-        hashes, opts = *args
-        return if hashes.empty?
-        columns = hashes.first.keys
-        # convert the hashes into arrays
-        values = hashes.map {|h| columns.map {|c| h[c]}}
-      end
-      import(columns, values, opts)
+    def multi_insert(hashes, opts={})
+      return if hashes.empty?
+      columns = hashes.first.keys
+      import(columns, hashes.map{|h| columns.map{|c| h[c]}}, opts)
     end
 
     # Returns a Range object made from the minimum and maximum values for the
@@ -210,20 +192,15 @@ module Sequel
     end
     
     # Returns the first record in the dataset.
-    def single_record(opts = (defarg=true;nil))
-      Deprecation.deprecate("Calling Dataset#single_record with an argument is deprecated and will raise an error in Sequel 3.0.  Use dataset.clone(opts).single_record.") unless defarg
-      ds = clone(:limit=>1)
-      opts = opts.merge(:limit=>1) if opts and opts[:limit]
-      defarg ? ds.each{|r| return r} : ds.each(opts){|r| return r}
+    def single_record
+      clone(:limit=>1).each{|r| return r}
       nil
     end
 
     # Returns the first value of the first record in the dataset.
     # Returns nil if dataset is empty.
-    def single_value(opts = (defarg=true;nil))
-      Deprecation.deprecate("Calling Dataset#single_value with an argument is deprecated and will raise an error in Sequel 3.0.  Use dataset.clone(opts).single_value.") unless defarg
-      ds = naked.clone(:graph=>false)
-      if r = (defarg ? ds.single_record : ds.single_record(opts))
+    def single_value
+      if r = naked.clone(:graph=>false).single_record
         r.values.first
       end
     end