aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-10-23 17:22:03 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-10-23 17:22:03 +0000
commit76879f25416fe60e4c73c8b9373703d0c13669c5 (patch)
treeae7bb2358fb8d6e3feddf5cd1d1f9ea5505cb602
parent76487f25e748b04f85b317df0d090c1bdf954986 (diff)
downloadrails-76879f25416fe60e4c73c8b9373703d0c13669c5.tar.gz
rails-76879f25416fe60e4c73c8b9373703d0c13669c5.tar.bz2
rails-76879f25416fe60e4c73c8b9373703d0c13669c5.zip
Map Active Record time to SQL TIME. Closes #2576.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2713 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--activerecord/CHANGELOG2
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/mysql_adapter.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 309ff09f87..3ece9f7b39 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,6 +1,6 @@
*1.12.1* (October 19th, 2005)
-* Map Active Record time to PostgreSQL time. #2575 [Robby Russell <robby@planetargon.com>]
+* Map Active Record time to SQL TIME. #2575, #2576 [Robby Russell <robby@planetargon.com>]
* Clarify semantics of ActiveRecord::Base#respond_to? #2560 [skaes@web.de]
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 4d034adec5..0834bf51e0 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -110,7 +110,7 @@ module ActiveRecord
:float => { :name => "float" },
:datetime => { :name => "datetime" },
:timestamp => { :name => "datetime" },
- :time => { :name => "datetime" },
+ :time => { :name => "time" },
:date => { :name => "date" },
:binary => { :name => "blob" },
:boolean => { :name => "tinyint", :limit => 1 }