aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorYasuo Honda <yasuo.honda@gmail.com>2013-12-06 04:56:42 +0900
committerYasuo Honda <yasuo.honda@gmail.com>2013-12-10 11:12:33 +0900
commitb6655885ef13cf8d1705dc9b5232846f0207febd (patch)
treea71533bb6b904832821284f3208db577f6baca69 /activerecord/lib
parent4aae538d9ffff3a00a81f3da52fa70f7fd79ac74 (diff)
downloadrails-b6655885ef13cf8d1705dc9b5232846f0207febd.tar.gz
rails-b6655885ef13cf8d1705dc9b5232846f0207febd.tar.bz2
rails-b6655885ef13cf8d1705dc9b5232846f0207febd.zip
Remove `DEFAULT NULL` for primary key column to support MySQL 5.7.3
Since MySQL 5.7.3 m13 does now allow primary key column is null.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index e3270e734f..1b9f865666 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -148,7 +148,7 @@ module ActiveRecord
QUOTED_TRUE, QUOTED_FALSE = '1', '0'
NATIVE_DATABASE_TYPES = {
- :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY",
+ :primary_key => "int(11) auto_increment PRIMARY KEY",
:string => { :name => "varchar", :limit => 255 },
:text => { :name => "text" },
:integer => { :name => "int", :limit => 4 },