diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-08 22:08:59 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-08 22:08:59 -0700 |
commit | def594b92d1e68db68a27d53dec7ae4e6246f5a5 (patch) | |
tree | 226815117b7d19cff3b920f69cdc196daeb3c166 /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
parent | 057768cd2c8541f9c466131cb6c77f13ce12204d (diff) | |
download | rails-def594b92d1e68db68a27d53dec7ae4e6246f5a5.tar.gz rails-def594b92d1e68db68a27d53dec7ae4e6246f5a5.tar.bz2 rails-def594b92d1e68db68a27d53dec7ae4e6246f5a5.zip |
Don't append limit to primary key column definition. Freeze some constants.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
-rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index b052c0328e..cfd2402d9d 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -147,6 +147,8 @@ module ActiveRecord @@emulate_booleans = true cattr_accessor :emulate_booleans + ADAPTER_NAME = 'MySQL'.freeze + LOST_CONNECTION_ERROR_MESSAGES = [ "Server shutdown in progress", "Broken pipe", @@ -155,6 +157,21 @@ module ActiveRecord QUOTED_TRUE, QUOTED_FALSE = '1', '0' + NATIVE_DATABASE_TYPES = { + :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY".freeze, + :string => { :name => "varchar", :limit => 255 }, + :text => { :name => "text" }, + :integer => { :name => "int"}, + :float => { :name => "float" }, + :decimal => { :name => "decimal" }, + :datetime => { :name => "datetime" }, + :timestamp => { :name => "datetime" }, + :time => { :name => "time" }, + :date => { :name => "date" }, + :binary => { :name => "blob" }, + :boolean => { :name => "tinyint", :limit => 1 } + } + def initialize(connection, logger, connection_options, config) super(connection, logger) @connection_options, @config = connection_options, config @@ -163,7 +180,7 @@ module ActiveRecord end def adapter_name #:nodoc: - 'MySQL' + ADAPTER_NAME end def supports_migrations? #:nodoc: @@ -171,20 +188,7 @@ module ActiveRecord end def native_database_types #:nodoc: - { - :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY", - :string => { :name => "varchar", :limit => 255 }, - :text => { :name => "text" }, - :integer => { :name => "int"}, - :float => { :name => "float" }, - :decimal => { :name => "decimal" }, - :datetime => { :name => "datetime" }, - :timestamp => { :name => "datetime" }, - :time => { :name => "time" }, - :date => { :name => "date" }, - :binary => { :name => "blob" }, - :boolean => { :name => "tinyint", :limit => 1 } - } + NATIVE_DATABASE_TYPES end |