diff options
author | Matthew Draper <matthew@trebex.net> | 2017-12-20 10:47:36 +1030 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-20 10:47:36 +1030 |
commit | 08b9d8b3e05ef07a8f16245446cb62ca4f265dbb (patch) | |
tree | 7c574be59de9ccea054eafce5e05ddf7b57473e9 /activerecord/test/cases/adapters/mysql2/active_schema_test.rb | |
parent | c6cd9a59f200863ccfe8ad1d9c5a8876c39b9c5c (diff) | |
parent | 95b6a198ef4a94dc060faa70284ffdfae51006f6 (diff) | |
download | rails-08b9d8b3e05ef07a8f16245446cb62ca4f265dbb.tar.gz rails-08b9d8b3e05ef07a8f16245446cb62ca4f265dbb.tar.bz2 rails-08b9d8b3e05ef07a8f16245446cb62ca4f265dbb.zip |
Merge pull request #31177 from albertoalmagro/remove-default-mysql-engine-from-ar-5-2
Remove default ENGINE=InnoDB for Mysql2 adapter
Diffstat (limited to 'activerecord/test/cases/adapters/mysql2/active_schema_test.rb')
-rw-r--r-- | activerecord/test/cases/adapters/mysql2/active_schema_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb index 4e73c557ed..b5613daa72 100644 --- a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb +++ b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb @@ -68,14 +68,14 @@ class Mysql2ActiveSchemaTest < ActiveRecord::Mysql2TestCase def (ActiveRecord::Base.connection).data_source_exists?(*); false; end %w(SPATIAL FULLTEXT UNIQUE).each do |type| - expected = "CREATE TABLE `people` (#{type} INDEX `index_people_on_last_name` (`last_name`)) ENGINE=InnoDB" + expected = "CREATE TABLE `people` (#{type} INDEX `index_people_on_last_name` (`last_name`)) " actual = ActiveRecord::Base.connection.create_table(:people, id: false) do |t| t.index :last_name, type: type end assert_equal expected, actual end - expected = "CREATE TABLE `people` ( INDEX `index_people_on_last_name` USING btree (`last_name`(10))) ENGINE=InnoDB" + expected = "CREATE TABLE `people` ( INDEX `index_people_on_last_name` USING btree (`last_name`(10))) " actual = ActiveRecord::Base.connection.create_table(:people, id: false) do |t| t.index :last_name, length: 10, using: :btree end @@ -160,7 +160,7 @@ class Mysql2ActiveSchemaTest < ActiveRecord::Mysql2TestCase ActiveRecord::Base.connection.stubs(:data_source_exists?).with(:temp).returns(false) ActiveRecord::Base.connection.stubs(:index_name_exists?).with(:index_temp_on_zip).returns(false) - expected = "CREATE TEMPORARY TABLE `temp` ( INDEX `index_temp_on_zip` (`zip`)) ENGINE=InnoDB AS SELECT id, name, zip FROM a_really_complicated_query" + expected = "CREATE TEMPORARY TABLE `temp` ( INDEX `index_temp_on_zip` (`zip`)) AS SELECT id, name, zip FROM a_really_complicated_query" actual = ActiveRecord::Base.connection.create_table(:temp, temporary: true, as: "SELECT id, name, zip FROM a_really_complicated_query") do |t| t.index :zip end |