Changeset 7780

Timestamp:

10/07/07 22:01:59 (2 years ago)

Author:

bitsweat

Message:

Use fast date/time parsing by default. Closes #9811.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb (modified) (4 diffs)
• trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ -3 +3 @@
-* Raise ProtectedAttributeAssignmentError in development and test environments when mass-assigning to an attr_protected attribute.  #9802 [Henrik N]
-
-MySQL: speedup date/time parsing.  [Jeremy Kemper
+Speedup database date/time parsing.  [Jeremy Kemper, Tarmo TÀnav
-
-* Fix calling .clear on a has_many :dependent=>:delete_all association. [tarmo]

trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

@@ -7 +7 @@
-    # An abstract definition of a column in a table.
-    class Column
+      module Format
+        ISO_DATE = /\A(\d{4})-(\d\d)-(\d\d)\z/
+        ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?\z/
+      end
+
-      attr_reader :name, :default, :type, :limit, :null, :sql_type, :precision, :scale
-      attr_accessor :primary
@@ -110 +115 @@
-        def string_to_date(string)
-          return string unless string.is_a?(String)
-
-
+
+
+
-        end
-
@@ -118 +124 @@
-          return nil if string.empty?
-
-
-
-
-
+
-        end
-
@@ -174 +177 @@
-            # Append zero calendar reform start to account for dates skipped by calendar reform
-            DateTime.new(year, mon, mday, hour, min, sec, zone_offset, 0) rescue nil
+          end
+
+          def fast_string_to_date(string)
+            if string =~ Format::ISO_DATE
+              new_date $1.to_i, $2.to_i, $3.to_i
+            end
+          end
+
+          # Doesn't handle time zones.
+          def fast_string_to_time(string)
+            if string =~ Format::ISO_DATETIME
+              microsec = ($7.to_f * 10e6).to_i
+              new_time $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, microsec
+            end
+          end
+
+          def fallback_string_to_date(string)
+            new_date *ParseDate.parsedate(string)[0..2]
+          end
+
+          def fallback_string_to_time(string)
+            time_hash = Date._parse(string)
+            time_hash[:sec_fraction] = microseconds(time_hash)
+
+            new_time *time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction)
-          end
-      end

trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -92 +92 @@
-  module ConnectionAdapters
-    class MysqlColumn < Column #:nodoc:
-      module Format
-        DATE = /\A(\d{4})-(\d\d)-(\d\d)\z/
-        DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(?:\.(\d{6}))?\z/
-      end
-
-      def extract_default(default)
-        if type == :binary || type == :text
@@ -108 +103 @@
-        else
-          super
-        end
-      end
-
-      class << self
-        def string_to_date(string)
-          return string unless string.is_a?(String)
-          return nil if string.empty?
-
-          if string =~ Format::DATE
-            new_date $1.to_i, $2.to_i, $3.to_i
-          else
-            super
-          end
-        end
-
-        def string_to_time(string)
-          return string unless string.is_a?(String)
-          return nil if string.empty?
-
-          if string =~ Format::DATETIME
-            new_time $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, $7.to_i
-          else
-            super
-          end
-        end
-      end