Skip to content

Commit

Permalink
Merge pull request #175 from winebarrel/enable_SymbolArray
Browse files Browse the repository at this point in the history
Enable SymbolArray
  • Loading branch information
winebarrel committed Jun 3, 2018
2 parents 63e9712 + 0ca0327 commit ba4caae
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@ Style/StringLiterals:
Enabled: false
Style/StringLiteralsInInterpolation:
Enabled: false
Style/SymbolArray:
Enabled: false
Style/TernaryParentheses:
Enabled: false
Style/TrailingCommaInArguments:
Expand Down
2 changes: 1 addition & 1 deletion bin/ridgepole
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ ARGV.options do |opt|

opt.parse!

if not mode or ([:apply, :export].include?(mode) and not config) or (options[:with_apply] and not config)
if not mode or (%i(apply export).include?(mode) and not config) or (options[:with_apply] and not config)
puts opt.help
exit 1
end
Expand Down
2 changes: 1 addition & 1 deletion lib/ridgepole/diff.rb
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def convert_to_primary_key_attrs(column_options)
type = Ridgepole::DSLParser::TableDefinition::DEFAULT_PRIMARY_KEY_TYPE
end

if [:integer, :bigint].include?(type) && !options.key?(:default)
if %i(integer bigint).include?(type) && !options.key?(:default)
options[:auto_increment] = true
end

Expand Down

0 comments on commit ba4caae

Please sign in to comment.