Skip to content

Commit

Permalink
Merge e5273f4 into 4ec9f08
Browse files Browse the repository at this point in the history
  • Loading branch information
hashedhyphen committed Apr 18, 2020
2 parents 4ec9f08 + e5273f4 commit 70ccd50
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -309,7 +309,6 @@ end
```

## Collation/Charset
You can use the column collation by passing `--enable-mysql-awesome` ([activerecord-mysql-awesome](https://github.com/kamipo/activerecord-mysql-awesome) is required)

```ruby
create_table "articles", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
Expand Down
2 changes: 1 addition & 1 deletion lib/ridgepole/external_sql_executer.rb
Expand Up @@ -41,7 +41,7 @@ def execute(sql)
end
end
end
rescue EOFError # rubocop:disable Lint/SuppressedException
rescue EOFError
# nothing to do
end

Expand Down
4 changes: 0 additions & 4 deletions spec/spec_condition.rb
Expand Up @@ -12,10 +12,6 @@ def mysql57?
ENV['MYSQL57'] == '1'
end

def mysql_awesome_enabled?
ENV['ENABLE_MYSQL_AWESOME'] == '1'
end

def activerecord_5?
(ActiveRecord::VERSION::MAJOR >= 5) && (ActiveRecord::VERSION::MAJOR < 6)
end
Expand Down

0 comments on commit 70ccd50

Please sign in to comment.