aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-06-21 06:00:17 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-06-21 06:00:17 +0000
commit0bdd44accae978a04f51b1adace09db3a6f77f33 (patch)
tree4bad8ef12b3fc1beeb53c9b9b6e7289ced137909 /activerecord/lib/active_record
parentaa49feb5886bd2821e425c39dc1e3562e484817e (diff)
downloadrails-0bdd44accae978a04f51b1adace09db3a6f77f33.tar.gz
rails-0bdd44accae978a04f51b1adace09db3a6f77f33.tar.bz2
rails-0bdd44accae978a04f51b1adace09db3a6f77f33.zip
Make migrations work with the latest SQLite
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1458 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index ba786667cf..e2e55ef01f 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -90,16 +90,16 @@ module ActiveRecord
def native_database_types
{
:primary_key => "INTEGER PRIMARY KEY NOT NULL",
- :string => "VARCHAR(255)",
- :text => "TEXT",
- :integer => "INTEGER",
- :float => "float",
- :datetime => "DATETIME",
- :timestamp => "DATETIME",
- :time => "DATETIME",
- :date => "DATE",
- :binary => "BLOB",
- :boolean => "INTEGER"
+ :string => { :name => "varchar", :limit => 255 },
+ :text => { :name => "text" },
+ :integer => { :name => "integer" },
+ :float => { :name => "float" },
+ :datetime => { :name => "datetime" },
+ :timestamp => { :name => "datetime" },
+ :time => { :name => "datetime" },
+ :date => { :name => "date" },
+ :binary => { :name => "blob" },
+ :boolean => { :name => "integer" }
}
end