activerecord 1.14.4 → 1.15.0

data/lib/active_record/connection_adapters/abstract/schema_definitions.rb

@@ -1,10 +1,12 @@
-require 'parsedate'
+require 'date'
+require 'bigdecimal'
+require 'bigdecimal/util'
 
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
     # An abstract definition of a column in a table.
     class Column
-      attr_reader :name, :default, :type, :limit, :null, :sql_type
+      attr_reader :name, :default, :type, :limit, :null, :sql_type, :precision, :scale
       attr_accessor :primary
 
       # Instantiates a new column in the table.
@@ -14,22 +16,20 @@ module ActiveRecord
       # +sql_type+ is only used to extract the column's length, if necessary.  For example, <tt>company_name varchar(<b>60</b>)</tt>.
       # +null+ determines if this column allows +NULL+ values.
       def initialize(name, default, sql_type = nil, null = true)
-        @name, @type, @null = name, simplified_type(sql_type), null
-        @sql_type = sql_type
-        # have to do this one separately because type_cast depends on #type
+        @name, @sql_type, @null = name, sql_type, null
+        @limit, @precision, @scale  = extract_limit(sql_type), extract_precision(sql_type), extract_scale(sql_type) 
+        @type = simplified_type(sql_type)
         @default = type_cast(default)
-        @limit   = extract_limit(sql_type) unless sql_type.nil?
+
         @primary = nil
-        @text    = [:string, :text].include? @type
-        @number  = [:float, :integer].include? @type
       end
 
       def text?
-        @text
+        [:string, :text].include? type
       end
 
       def number?
-        @number
+        [:float, :integer, :decimal].include? type
       end
 
       # Returns the Ruby class that corresponds to the abstract data type.
@@ -37,6 +37,7 @@ module ActiveRecord
         case type
           when :integer       then Fixnum
           when :float         then Float
+          when :decimal       then BigDecimal
           when :datetime      then Time
           when :date          then Date
           when :timestamp     then Time
@@ -55,6 +56,7 @@ module ActiveRecord
           when :text      then value
           when :integer   then value.to_i rescue value ? 1 : 0
           when :float     then value.to_f
+          when :decimal   then self.class.value_to_decimal(value)
           when :datetime  then self.class.string_to_time(value)
           when :timestamp then self.class.string_to_time(value)
           when :time      then self.class.string_to_dummy_time(value)
@@ -71,6 +73,7 @@ module ActiveRecord
           when :text      then nil
           when :integer   then "(#{var_name}.to_i rescue #{var_name} ? 1 : 0)"
           when :float     then "#{var_name}.to_f"
+          when :decimal   then "#{self.class.name}.value_to_decimal(#{var_name})"
           when :datetime  then "#{self.class.name}.string_to_time(#{var_name})"
           when :timestamp then "#{self.class.name}.string_to_time(#{var_name})"
           when :time      then "#{self.class.name}.string_to_dummy_time(#{var_name})"
@@ -108,39 +111,74 @@ module ActiveRecord
 
       def self.string_to_time(string)
         return string unless string.is_a?(String)
-        time_array = ParseDate.parsedate(string)[0..5]
+        time_hash = Date._parse(string)
+        time_hash[:sec_fraction] = microseconds(time_hash)
+        time_array = time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction)
         # treat 0000-00-00 00:00:00 as nil
-        Time.send(Base.default_timezone, *time_array) rescue nil
+        Time.send(Base.default_timezone, *time_array) rescue DateTime.new(*time_array[0..5]) rescue nil
       end
 
       def self.string_to_dummy_time(string)
         return string unless string.is_a?(String)
-        time_array = ParseDate.parsedate(string)
+        return nil if string.empty?
+        time_hash = Date._parse(string)
+        time_hash[:sec_fraction] = microseconds(time_hash)
         # pad the resulting array with dummy date information
-        time_array[0] = 2000; time_array[1] = 1; time_array[2] = 1;
+        time_array = [2000, 1, 1]
+        time_array += time_hash.values_at(:hour, :min, :sec, :sec_fraction)
         Time.send(Base.default_timezone, *time_array) rescue nil
       end
 
       # convert something to a boolean
       def self.value_to_boolean(value)
-        return value if value==true || value==false
-        case value.to_s.downcase
-        when "true", "t", "1" then true
-        else false
+        if value == true || value == false
+          value
+        else
+          %w(true t 1).include?(value.to_s.downcase)
+        end
+      end
+
+      # convert something to a BigDecimal
+      def self.value_to_decimal(value)
+        if value.is_a?(BigDecimal)
+          value
+        elsif value.respond_to?(:to_d)
+          value.to_d
+        else
+          value.to_s.to_d
         end
       end
 
-    private
+      private
+        # '0.123456' -> 123456
+        # '1.123456' -> 123456
+        def self.microseconds(time)
+          ((time[:sec_fraction].to_f % 1) * 1_000_000).to_i
+        end
+
         def extract_limit(sql_type)
           $1.to_i if sql_type =~ /\((.*)\)/
         end
 
+        def extract_precision(sql_type)
+          $2.to_i if sql_type =~ /^(numeric|decimal|number)\((\d+)(,\d+)?\)/i
+        end
+
+        def extract_scale(sql_type)
+          case sql_type
+            when /^(numeric|decimal|number)\((\d+)\)/i then 0
+            when /^(numeric|decimal|number)\((\d+)(,(\d+))\)/i then $4.to_i
+          end
+        end
+
         def simplified_type(field_type)
           case field_type
             when /int/i
               :integer
-            when /float|double|decimal|numeric/i
+            when /float|double/i
               :float
+            when /decimal|numeric|number/i
+              extract_scale(field_type) == 0 ? :integer : :decimal
             when /datetime/i
               :datetime
             when /timestamp/i
@@ -164,18 +202,20 @@ module ActiveRecord
     class IndexDefinition < Struct.new(:table, :name, :unique, :columns) #:nodoc:
     end
 
-    class ColumnDefinition < Struct.new(:base, :name, :type, :limit, :default, :null) #:nodoc:
+    class ColumnDefinition < Struct.new(:base, :name, :type, :limit, :precision, :scale, :default, :null) #:nodoc:
+      
+      def sql_type
+        base.type_to_sql(type.to_sym, limit, precision, scale) rescue type
+      end
+      
       def to_sql
-        column_sql = "#{base.quote_column_name(name)} #{type_to_sql(type.to_sym, limit)}"
-        add_column_options!(column_sql, :null => null, :default => default)
+        column_sql = "#{base.quote_column_name(name)} #{sql_type}"
+        add_column_options!(column_sql, :null => null, :default => default) unless type.to_sym == :primary_key
         column_sql
       end
       alias to_s :to_sql
 
       private
-        def type_to_sql(name, limit)
-          base.type_to_sql(name, limit) rescue name
-        end   
 
         def add_column_options!(sql, options)
           base.add_column_options!(sql, options.merge(:column => self))
@@ -195,7 +235,7 @@ module ActiveRecord
       # Appends a primary key definition to the table definition.
       # Can be called multiple times, but this is probably not a good idea.
       def primary_key(name)
-        column(name, native[:primary_key])
+        column(name, :primary_key)
       end
 
       # Returns a ColumnDefinition for the column with name +name+.
@@ -206,37 +246,81 @@ module ActiveRecord
       # Instantiates a new column for the table.
       # The +type+ parameter must be one of the following values:
       # <tt>:primary_key</tt>, <tt>:string</tt>, <tt>:text</tt>,
-      # <tt>:integer</tt>, <tt>:float</tt>, <tt>:datetime</tt>,
-      # <tt>:timestamp</tt>, <tt>:time</tt>, <tt>:date</tt>,
-      # <tt>:binary</tt>, <tt>:boolean</tt>.
+      # <tt>:integer</tt>, <tt>:float</tt>, <tt>:decimal</tt>,
+      # <tt>:datetime</tt>, <tt>:timestamp</tt>, <tt>:time</tt>,
+      # <tt>:date</tt>, <tt>:binary</tt>, <tt>:boolean</tt>.
       #
       # Available options are (none of these exists by default):
       # * <tt>:limit</tt>:
       #   Requests a maximum column length (<tt>:string</tt>, <tt>:text</tt>,
       #   <tt>:binary</tt> or <tt>:integer</tt> columns only)
       # * <tt>:default</tt>:
-      #   The column's default value.  You cannot explicitely set the default
-      #   value to +NULL+.  Simply leave off this option if you want a +NULL+
-      #   default value.
+      #   The column's default value. Use nil for NULL.
       # * <tt>:null</tt>:
       #   Allows or disallows +NULL+ values in the column.  This option could
       #   have been named <tt>:null_allowed</tt>.
+      # * <tt>:precision</tt>:
+      #   Specifies the precision for a <tt>:decimal</tt> column. 
+      # * <tt>:scale</tt>:
+      #   Specifies the scale for a <tt>:decimal</tt> column. 
+      #
+      # Please be aware of different RDBMS implementations behavior with
+      # <tt>:decimal</tt> columns:
+      # * The SQL standard says the default scale should be 0, <tt>:scale</tt> <=
+      #   <tt>:precision</tt>, and makes no comments about the requirements of
+      #   <tt>:precision</tt>.
+      # * MySQL: <tt>:precision</tt> [1..63], <tt>:scale</tt> [0..30]. 
+      #   Default is (10,0).
+      # * PostgreSQL: <tt>:precision</tt> [1..infinity], 
+      #   <tt>:scale</tt> [0..infinity]. No default.
+      # * SQLite2: Any <tt>:precision</tt> and <tt>:scale</tt> may be used. 
+      #   Internal storage as strings. No default.
+      # * SQLite3: No restrictions on <tt>:precision</tt> and <tt>:scale</tt>,
+      #   but the maximum supported <tt>:precision</tt> is 16. No default.
+      # * Oracle: <tt>:precision</tt> [1..38], <tt>:scale</tt> [-84..127]. 
+      #   Default is (38,0).
+      # * DB2: <tt>:precision</tt> [1..63], <tt>:scale</tt> [0..62]. 
+      #   Default unknown.
+      # * Firebird: <tt>:precision</tt> [1..18], <tt>:scale</tt> [0..18]. 
+      #   Default (9,0). Internal types NUMERIC and DECIMAL have different
+      #   storage rules, decimal being better.
+      # * FrontBase?: <tt>:precision</tt> [1..38], <tt>:scale</tt> [0..38]. 
+      #   Default (38,0). WARNING Max <tt>:precision</tt>/<tt>:scale</tt> for
+      #   NUMERIC is 19, and DECIMAL is 38.
+      # * SqlServer?: <tt>:precision</tt> [1..38], <tt>:scale</tt> [0..38]. 
+      #   Default (38,0).
+      # * Sybase: <tt>:precision</tt> [1..38], <tt>:scale</tt> [0..38]. 
+      #   Default (38,0).
+      # * OpenBase?: Documentation unclear. Claims storage in <tt>double</tt>.
       #
       # This method returns <tt>self</tt>.
       #
       # ===== Examples
-      #  # Assuming def is an instance of TableDefinition
-      #  def.column(:granted, :boolean)
+      #  # Assuming td is an instance of TableDefinition
+      #  td.column(:granted, :boolean)
       #    #=> granted BOOLEAN
       #
-      #  def.column(:picture, :binary, :limit => 2.megabytes)
+      #  td.column(:picture, :binary, :limit => 2.megabytes)
       #    #=> picture BLOB(2097152)
       #
-      #  def.column(:sales_stage, :string, :limit => 20, :default => 'new', :null => false)
+      #  td.column(:sales_stage, :string, :limit => 20, :default => 'new', :null => false)
       #    #=> sales_stage VARCHAR(20) DEFAULT 'new' NOT NULL
+      #
+      #  def.column(:bill_gates_money, :decimal, :precision => 15, :scale => 2)
+      #    #=> bill_gates_money DECIMAL(15,2)
+      #
+      #  def.column(:sensor_reading, :decimal, :precision => 30, :scale => 20)
+      #    #=> sensor_reading DECIMAL(30,20)
+      #
+      #  # While <tt>:scale</tt> defaults to zero on most databases, it
+      #  # probably wouldn't hurt to include it.
+      #  def.column(:huge_integer, :decimal, :precision => 30)
+      #    #=> huge_integer DECIMAL(30)
       def column(name, type, options = {})
         column = self[name] || ColumnDefinition.new(@base, name, type)
         column.limit = options[:limit] || native[type.to_sym][:limit] if options[:limit] or native[type.to_sym]
+        column.precision = options[:precision]
+        column.scale = options[:scale]
         column.default = options[:default]
         column.null = options[:null]
         @columns << column unless @columns.include? column

data/lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -44,8 +44,8 @@ module ActiveRecord
       #
       # The +options+ hash can include the following keys:
       # [<tt>:id</tt>]
-      #   Set to true or false to add/not add a primary key column
-      #   automatically.  Defaults to true.
+      #   Whether to automatically add a primary key column. Defaults to true.
+      #   Join tables for has_and_belongs_to_many should set :id => false.
       # [<tt>:primary_key</tt>]
       #   The name of the primary key, if one is to be added automatically.
       #   Defaults to +id+.
@@ -94,7 +94,7 @@ module ActiveRecord
         yield table_definition
 
         if options[:force]
-          drop_table(name) rescue nil
+          drop_table(name, options) rescue nil
         end
 
         create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE "
@@ -112,14 +112,14 @@ module ActiveRecord
       end
 
       # Drops a table from the database.
-      def drop_table(name)
+      def drop_table(name, options = {})
         execute "DROP TABLE #{name}"
       end
 
       # Adds a new column to the named table.
       # See TableDefinition#column for details of the options you can use.
       def add_column(table_name, column_name, type, options = {})
-        add_column_sql = "ALTER TABLE #{table_name} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit])}"
+        add_column_sql = "ALTER TABLE #{table_name} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
         add_column_options!(add_column_sql, options)
         execute(add_column_sql)
       end
@@ -178,14 +178,14 @@ module ActiveRecord
       # ====== Creating a unique index
       #  add_index(:accounts, [:branch_id, :party_id], :unique => true)
       # generates
-      #  CREATE UNIQUE INDEX accounts_branch_id_index ON accounts(branch_id, party_id)
+      #  CREATE UNIQUE INDEX accounts_branch_id_party_id_index ON accounts(branch_id, party_id)
       # ====== Creating a named index
       #  add_index(:accounts, [:branch_id, :party_id], :unique => true, :name => 'by_branch_party')
       # generates
       #  CREATE UNIQUE INDEX by_branch_party ON accounts(branch_id, party_id)
       def add_index(table_name, column_name, options = {})
         column_names = Array(column_name)
-        index_name   = index_name(table_name, :column => column_names.first)
+        index_name   = index_name(table_name, :column => column_names)
 
         if Hash === options # legacy support, since this param was a string
           index_type = options[:unique] ? "UNIQUE" : ""
@@ -199,16 +199,14 @@ module ActiveRecord
 
       # Remove the given index from the table.
       #
-      # Remove the suppliers_name_index in the suppliers table (legacy support, use the second or third forms).
+      # Remove the suppliers_name_index in the suppliers table.
       #   remove_index :suppliers, :name
-      # Remove the index named accounts_branch_id in the accounts table.
+      # Remove the index named accounts_branch_id_index in the accounts table.
       #   remove_index :accounts, :column => :branch_id
+      # Remove the index named accounts_branch_id_party_id_index in the accounts table.
+      #   remove_index :accounts, :column => [:branch_id, :party_id]
       # Remove the index named by_branch_party in the accounts table.
       #   remove_index :accounts, :name => :by_branch_party
-      #
-      # You can remove an index on multiple columns by specifying the first column.
-      #   add_index :accounts, [:username, :password]
-      #   remove_index :accounts, :username
       def remove_index(table_name, options = {})
         execute "DROP INDEX #{quote_column_name(index_name(table_name, options))} ON #{table_name}"
       end
@@ -216,14 +214,14 @@ module ActiveRecord
       def index_name(table_name, options) #:nodoc:
         if Hash === options # legacy support
           if options[:column]
-            "#{table_name}_#{options[:column]}_index"
+            "index_#{table_name}_on_#{Array(options[:column]) * '_and_'}"
           elsif options[:name]
             options[:name]
           else
             raise ArgumentError, "You must specify the index name"
           end
         else
-          "#{table_name}_#{options}_index"
+          index_name(table_name, :column => options)
         end
       end
 
@@ -254,18 +252,52 @@ module ActiveRecord
       end
 
 
-      def type_to_sql(type, limit = nil) #:nodoc:
+      def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
         native = native_database_types[type]
-        limit ||= native[:limit]
-        column_type_sql = native[:name]
-        column_type_sql << "(#{limit})" if limit
-        column_type_sql
-      end            
-    
+        column_type_sql = native.is_a?(Hash) ? native[:name] : native
+        if type == :decimal # ignore limit, use precison and scale
+          precision ||= native[:precision]
+          scale ||= native[:scale]
+          if precision
+            if scale
+              column_type_sql << "(#{precision},#{scale})"
+            else
+              column_type_sql << "(#{precision})"
+            end
+          else
+            raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale if specified" if scale
+          end
+          column_type_sql
+        else
+          limit ||= native[:limit]
+          column_type_sql << "(#{limit})" if limit
+          column_type_sql
+        end
+      end
+
       def add_column_options!(sql, options) #:nodoc:
-        sql << " DEFAULT #{quote(options[:default], options[:column])}" unless options[:default].nil?
+        sql << " DEFAULT #{quote(options[:default], options[:column])}" if options_include_default?(options)
         sql << " NOT NULL" if options[:null] == false
       end
+
+      # SELECT DISTINCT clause for a given set of columns and a given ORDER BY clause.
+      # Both PostgreSQL and Oracle overrides this for custom DISTINCT syntax.
+      #
+      #   distinct("posts.id", "posts.created_at desc")
+      def distinct(columns, order_by)
+        "DISTINCT #{columns}"
+      end
+      
+      # ORDER BY clause for the passed order option.
+      # PostgreSQL overrides this due to its stricter standards compliance.
+      def add_order_by_for_association_limiting!(sql, options)
+        sql << "ORDER BY #{options[:order]}"
+      end
+
+      protected
+        def options_include_default?(options)
+          options.include?(:default) && !(options[:null] == false && options[:default].nil?)
+        end
     end
   end
 end

data/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -1,5 +1,7 @@
 require 'benchmark'
 require 'date'
+require 'bigdecimal'
+require 'bigdecimal/util'
 
 require 'active_record/connection_adapters/abstract/schema_definitions'
 require 'active_record/connection_adapters/abstract/schema_statements'
@@ -77,6 +79,12 @@ module ActiveRecord
         @active = false
       end
 
+      # Returns true if its safe to reload the connection between requests for development mode.
+      # This is not the case for Ruby/MySQL and it's not necessary for any adapters except SQLite.
+      def requires_reloading?
+        false
+      end
+
       # Lazily verify this connection, calling +active?+ only if it hasn't
       # been called for +timeout+ seconds.       
       def verify!(timeout)

data/lib/active_record/connection_adapters/db2_adapter.rb

@@ -47,14 +47,6 @@ begin
             end
           end
         end
-        
-        def select_all(sql, name = nil)
-          select(sql, name)
-        end
-
-        def select_one(sql, name = nil)
-          select(sql, name).first
-        end
 
         def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
           execute(sql, name = nil)
@@ -72,9 +64,6 @@ begin
           rows_affected
         end
 
-        alias_method :update, :execute
-        alias_method :delete, :execute
-
         def begin_db_transaction
           @connection.set_auto_commit_off
         end
@@ -162,6 +151,7 @@ begin
             :text        => { :name => 'clob', :limit => 32768 },
             :integer     => { :name => 'int' },
             :float       => { :name => 'float' },
+            :decimal     => { :name => 'decimal' },
             :datetime    => { :name => 'timestamp' },
             :timestamp   => { :name => 'timestamp' },
             :time        => { :name => 'time' },