aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-05-15 22:14:54 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-05-15 22:14:54 -0700
commit57d534ee9e441d078fcc161c0c78ebaa5aacd736 (patch)
treed07828ebd4dcb0656af55c0f887ad809b74abbbc /activerecord/lib/active_record/connection_adapters
parent20f049fb50daee0c5e5a69b55b529af5737e8e3f (diff)
parentd9fc180fb4a0fb50502d772f572adba5574ce4e2 (diff)
downloadrails-57d534ee9e441d078fcc161c0c78ebaa5aacd736.tar.gz
rails-57d534ee9e441d078fcc161c0c78ebaa5aacd736.tar.bz2
rails-57d534ee9e441d078fcc161c0c78ebaa5aacd736.zip
Merge pull request #6344 from erichmenge/patch_sqlite_time_type
SQLite3 doesn't actually support the 'time' type.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index a29fbbbc49..d4ffa82b17 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -191,7 +191,7 @@ module ActiveRecord
:decimal => { :name => "decimal" },
:datetime => { :name => "datetime" },
:timestamp => { :name => "datetime" },
- :time => { :name => "time" },
+ :time => { :name => "datetime" },
:date => { :name => "date" },
:binary => { :name => "blob" },
:boolean => { :name => "boolean" }