aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-10 14:24:28 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-10 14:24:28 +0000
commit65786805ca89bbcaf7aa89e74f99964e0f5fd89e (patch)
tree98a49d4d0c88dac11b1f062af5c6ef306727d951 /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
parent4f2f408ba1a7dd976a1ec5061d05ef0439e5f942 (diff)
downloadrails-65786805ca89bbcaf7aa89e74f99964e0f5fd89e.tar.gz
rails-65786805ca89bbcaf7aa89e74f99964e0f5fd89e.tar.bz2
rails-65786805ca89bbcaf7aa89e74f99964e0f5fd89e.zip
More incremental work on active schema for MySQL
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@884 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/mysql_adapter.rb22
1 files changed, 11 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 0c78b921b6..9537269260 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -66,17 +66,17 @@ module ActiveRecord
def native_database_types
{
- :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY",
- :string => "varchar(255)",
- :text => "text",
- :integer => "int(11)",
- :float => "float",
- :datetime => "datetime",
- :timestamp => "datetime",
- :time => "datetime",
- :date => "date",
- :binary => "blob",
- :boolean => "tinyint(1)"
+ :primary_key => { :name => "int(11) DEFAULT NULL auto_increment PRIMARY KEY" },
+ :string => { :name => "varchar", :limit => 255 },
+ :text => { :name => "text" },
+ :integer => { :name => "int", :limit => 11 },
+ :float => { :name => "float" },
+ :datetime => { :name => "datetime" },
+ :timestamp => { :name => "datetime" },
+ :time => { :name => "datetime" },
+ :date => { :name => "date" },
+ :binary => { :name => "blob" },
+ :boolean => { :name => "tinyint", :limit => 1 }
}
end