Skip to content

Commit 7500ea6

Browse files
authored
Merge pull request #3916 from zendesk/grosser/multi
remove multibyte patches, we do not need those larger indices
2 parents b1a5a88 + 50eb703 commit 7500ea6

File tree

3 files changed

+2
-32
lines changed

3 files changed

+2
-32
lines changed

.github/workflows/actions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
include:
5252
- name: test mysql w/o plugins
5353
run: |
54-
export PLUGINS='' DATABASE_URL=mysql2://[email protected]/samson_test?reconnect=true BUNDLE_WITHOUT=postgres:sqlite USE_UTF8MB4=1 SILENCE_MIGRATIONS=1
54+
export PLUGINS='' DATABASE_URL=mysql2://[email protected]/samson_test?reconnect=true BUNDLE_WITHOUT=postgres:sqlite SILENCE_MIGRATIONS=1
5555
bundle exec rake db:create test:migrate_without_plugins
5656
- name: test mysql
5757
run: |
58-
export DATABASE_URL=mysql2://[email protected]/samson_test?reconnect=true BUNDLE_WITHOUT=postgres:sqlite USE_UTF8MB4=1 SILENCE_MIGRATIONS=1
58+
export DATABASE_URL=mysql2://[email protected]/samson_test?reconnect=true BUNDLE_WITHOUT=postgres:sqlite SILENCE_MIGRATIONS=1
5959
bundle exec rake db:create db:migrate default
6060
- name: test postgres
6161
run: |

config/initializers/mysql_utf8_mb4.rb

Lines changed: 0 additions & 20 deletions
This file was deleted.

test/integration/cleanliness_test.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,6 @@ def assert_content(files)
4141
File.read('Gemfile.lock').wont_include 'rails-assets-bootstrap '
4242
end
4343

44-
if ENV['USE_UTF8MB4'] && ActiveRecord::Base.connection.adapter_name =~ /mysql/i
45-
it "uses the right row format in mysql" do
46-
status = ActiveRecord::Base.connection.execute('show table status').to_a
47-
refute_empty status
48-
status.each do |table|
49-
table[3].must_equal "Dynamic", "#{table[0]} is not Dynamic"
50-
end
51-
end
52-
end
53-
5444
it "does not have public actions on base controller" do
5545
found = ApplicationController.action_methods.to_a
5646
found.reject! { |a| a =~ /^(_conditional_callback_around_|_callback_before_)/ }

0 commit comments

Comments
 (0)