aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/generated_attribute.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-14 09:57:41 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-14 09:57:41 -0700
commit6338e1e68dfbe77c39eaaa17bb4950ef7db73704 (patch)
tree6bca387ebcc859a5f277a65f268cd885c7e1b00c /railties/lib/rails/generators/generated_attribute.rb
parent1974911b8d5780ec16e138027a0099bd8482f88f (diff)
parent5ad7f8ab418f0c760dbb584f7c78d94ce32e9ee3 (diff)
downloadrails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.tar.gz
rails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.tar.bz2
rails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.zip
Merge pull request #7941 from robin850/master
Use 1.9 Hash syntax in railties
Diffstat (limited to 'railties/lib/rails/generators/generated_attribute.rb')
-rw-r--r--railties/lib/rails/generators/generated_attribute.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 231813f774..d8a4f15b4b 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -23,7 +23,7 @@ module Rails
type = type.to_sym if type
if type && reference?(type)
- references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { :unique => true } : true
+ references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { unique: true } : true
attr_options[:index] = references_index
end
@@ -41,11 +41,11 @@ module Rails
def parse_type_and_options(type)
case type
when /(string|text|binary|integer)\{(\d+)\}/
- return $1, :limit => $2.to_i
+ return $1, limit: $2.to_i
when /decimal\{(\d+)[,.-](\d+)\}/
- return :decimal, :precision => $1.to_i, :scale => $2.to_i
+ return :decimal, precision: $1.to_i, scale: $2.to_i
when /(references|belongs_to)\{polymorphic\}/
- return $1, :polymorphic => true
+ return $1, polymorphic: true
else
return type, {}
end