diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2019-04-14 01:23:39 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-14 01:23:39 +0900 |
commit | 877376eba155969d66fc243306ea4a9bd9abb54a (patch) | |
tree | a795972666fab54db761167954056bc8e9285954 /activerecord/test/cases | |
parent | 8a5bd78ebf3a6beedd16b53580cf6048397dc2a1 (diff) | |
parent | 53f1b3e579e6d1969a244cd8e05590a46be6a96f (diff) | |
download | rails-877376eba155969d66fc243306ea4a9bd9abb54a.tar.gz rails-877376eba155969d66fc243306ea4a9bd9abb54a.tar.bz2 rails-877376eba155969d66fc243306ea4a9bd9abb54a.zip |
Merge pull request #35958 from yskkin/bulk_change_table
use PostgreSQL's bulk_alter_table implementation
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/adapters/mysql2/active_schema_test.rb | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb index 88c2ac5d0a..c2c357d0c1 100644 --- a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb +++ b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb @@ -10,7 +10,15 @@ class Mysql2ActiveSchemaTest < ActiveRecord::Mysql2TestCase ActiveRecord::Base.connection.send(:default_row_format) ActiveRecord::Base.connection.singleton_class.class_eval do alias_method :execute_without_stub, :execute - def execute(sql, name = nil) sql end + def execute(sql, name = nil) + ActiveSupport::Notifications.instrumenter.instrument( + "sql.active_record", + sql: sql, + name: name, + connection: self) do + sql + end + end end end @@ -89,17 +97,19 @@ class Mysql2ActiveSchemaTest < ActiveRecord::Mysql2TestCase %w(SPATIAL FULLTEXT UNIQUE).each do |type| expected = "ALTER TABLE `people` ADD #{type} INDEX `index_people_on_last_name` (`last_name`)" - actual = ActiveRecord::Base.connection.change_table(:people, bulk: true) do |t| - t.index :last_name, type: type + assert_sql(expected) do + ActiveRecord::Base.connection.change_table(:people, bulk: true) do |t| + t.index :last_name, type: type + end end - assert_equal expected, actual end expected = "ALTER TABLE `people` ADD INDEX `index_people_on_last_name` USING btree (`last_name`(10)), ALGORITHM = COPY" - actual = ActiveRecord::Base.connection.change_table(:people, bulk: true) do |t| - t.index :last_name, length: 10, using: :btree, algorithm: :copy + assert_sql(expected) do + ActiveRecord::Base.connection.change_table(:people, bulk: true) do |t| + t.index :last_name, length: 10, using: :btree, algorithm: :copy + end end - assert_equal expected, actual end def test_drop_table |