From 95b7b02d127d66fb7861de69a1786095e64b971f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 6 Dec 2012 17:43:36 -0200
Subject: Add test case for scaffold_controller generator without attributes.

This is a test for 978c568a7bffe354180aaefa471092182fed1015
---
 railties/test/generators/scaffold_controller_generator_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 2a88dac635..0498c4c3fd 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -52,6 +52,15 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_dont_use_require_or_permit_if_there_are_no_attributes
+    run_generator ["User"]
+
+    assert_file "app/controllers/users_controller.rb" do |content|
+      assert_match(/def user_params/, content)
+      assert_match(/params\[:user\]/, content)
+    end
+  end
+
   def test_helper_are_invoked_with_a_pluralized_name
     run_generator
     assert_file "app/helpers/users_helper.rb", /module UsersHelper/
-- 
cgit v1.2.3


From b4b8c26b6e3568525b974889e60bfd2a025f0114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 6 Dec 2012 17:48:11 -0200
Subject: Use the references and belongs_id ids in the scaffold_controller
 generator

---
 .../generators/rails/scaffold_controller/templates/controller.rb | 2 +-
 railties/test/generators/scaffold_controller_generator_test.rb   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 08fe8a08e3..5fc93efc6d 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -94,7 +94,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       <%- if attributes.empty? -%>
       params[<%= ":#{singular_table_name}" %>]
       <%- else -%>
-      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes.map {|a| ":#{a.name}" }.join(', ') %>)
+      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes.map { |a| ":#{a.index_name}" }.join(', ') %>)
       <%- end -%>
     end
 end
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 0498c4c3fd..f467043cd0 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -61,6 +61,15 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_controller_permit_references_attributes
+    run_generator ["LineItem", "product:references", "cart:belongs_to"]
+
+    assert_file "app/controllers/line_items_controller.rb" do |content|
+      assert_match(/def line_item_params/, content)
+      assert_match(/params\.require\(:line_item\)\.permit\(:product_id, :cart_id\)/, content)
+    end
+  end
+
   def test_helper_are_invoked_with_a_pluralized_name
     run_generator
     assert_file "app/helpers/users_helper.rb", /module UsersHelper/
-- 
cgit v1.2.3


From 3d8fcdd3bf21482e3e297a78bfdf3d02ec71eda4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 6 Dec 2012 18:00:41 -0200
Subject: Put the reference and belongs_to attributes in the scaffold tests.

---
 .../rails/generators/test_unit/scaffold/scaffold_generator.rb    | 9 +++------
 railties/test/generators/scaffold_controller_generator_test.rb   | 6 +++---
 railties/test/generators/scaffold_generator_test.rb              | 6 +++---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
index 3b4fec2e83..8939813304 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -18,17 +18,14 @@ module TestUnit # :nodoc:
       private
 
         def attributes_hash
-          return if accessible_attributes.empty?
+          return if attributes.empty?
 
-          accessible_attributes.map do |a|
+          attributes.map do |a|
             name = a.name
+            name = "#{name}_id" if a.reference?
             "#{name}: @#{singular_table_name}.#{name}"
           end.sort.join(', ')
         end
-
-        def accessible_attributes
-          attributes.reject(&:reference?)
-        end
     end
   end
 end
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index f467043cd0..0b80e54969 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -86,13 +86,13 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_functional_tests
-    run_generator
+    run_generator ["User", "name:string", "age:integer", "organization:references"]
 
     assert_file "test/controllers/users_controller_test.rb" do |content|
       assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
       assert_match(/test "should get index"/, content)
-      assert_match(/post :create, user: \{ age: @user.age, name: @user.name \}/, content)
-      assert_match(/put :update, id: @user, user: \{ age: @user.age, name: @user.name \}/, content)
+      assert_match(/post :create, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id \}/, content)
+      assert_match(/put :update, id: @user, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id \}/, content)
     end
   end
 
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 7fcc0a7409..de62fdb1ea 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -60,8 +60,8 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     assert_file "test/controllers/product_lines_controller_test.rb" do |test|
       assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, test)
-      assert_match(/post :create, product_line: \{ title: @product_line.title \}/, test)
-      assert_match(/put :update, id: @product_line, product_line: \{ title: @product_line.title \}/, test)
+      assert_match(/post :create, product_line: \{ product_id: @product_line\.product_id, title: @product_line\.title, user_id: @product_line\.user_id \}/, test)
+      assert_match(/put :update, id: @product_line, product_line: \{ product_id: @product_line\.product_id, title: @product_line\.title, user_id: @product_line\.user_id \}/, test)
     end
 
     # Views
@@ -199,7 +199,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     run_generator [ "admin/role" ], :behavior => :revoke
 
     # Model
-    assert_file "app/models/admin.rb"	# ( should not be remove )
+    assert_file "app/models/admin.rb" # ( should not be remove )
     assert_no_file "app/models/admin/role.rb"
     assert_no_file "test/models/admin/role_test.rb"
     assert_no_file "test/fixtures/admin/roles.yml"
-- 
cgit v1.2.3


From 4a487f94b9812964e644716f301ab287dea8cddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 9 Dec 2012 14:34:26 -0300
Subject: Make references and belongs_to attributes to generate the _id column
 in fixtures

---
 railties/lib/rails/generators/test_unit/model/templates/fixtures.yml | 4 ++--
 railties/test/generators/model_generator_test.rb                     | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
index 5c8780aa64..71f4f99d02 100644
--- a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
+++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
@@ -3,12 +3,12 @@
 <% unless attributes.empty? -%>
 one:
 <% attributes.each do |attribute| -%>
-  <%= attribute.name %>: <%= attribute.default %>
+  <%= attribute.reference? ? "#{attribute.name}_id" : attribute.name %>: <%= attribute.default %>
 <% end -%>
 
 two:
 <% attributes.each do |attribute| -%>
-  <%= attribute.name %>: <%= attribute.default %>
+  <%= attribute.reference? ? "#{attribute.name}_id" : attribute.name %>: <%= attribute.default %>
 <% end -%>
 <% else -%>
 # This model initially had no columns defined.  If you add columns to the
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index 0c7ff0ebe7..d1f669c8c4 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -273,6 +273,11 @@ class ModelGeneratorTest < Rails::Generators::TestCase
     assert_file "test/fixtures/accounts.yml", /name: MyString/, /age: 1/
   end
 
+  def test_fixtures_use_the_references_ids
+    run_generator ["LineItem", "product:references", "cart:belongs_to"]
+    assert_file "test/fixtures/line_items.yml", /product_id: /, /cart_id: /
+  end
+
   def test_fixture_is_skipped
     run_generator ["account", "--skip-fixture"]
     assert_no_file "test/fixtures/accounts.yml"
-- 
cgit v1.2.3


From b05b77be9caf2617f35d93786d9b40c17e07bf64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 9 Dec 2012 15:20:32 -0300
Subject: Deal with polymorphic attributes correctly in the generators

---
 .../scaffold_controller/scaffold_controller_generator.rb |  9 +++++++++
 .../rails/scaffold_controller/templates/controller.rb    |  4 ++--
 .../generators/test_unit/model/templates/fixtures.yml    |  2 ++
 .../generators/test_unit/scaffold/scaffold_generator.rb  | 16 +++++++++++-----
 railties/test/generators/model_generator_test.rb         |  5 +++++
 .../generators/scaffold_controller_generator_test.rb     | 15 ++++++++++++---
 6 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index 4f36b612ae..3cfd2233e2 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -22,6 +22,15 @@ module Rails
       hook_for :helper, as: :scaffold do |invoked|
         invoke invoked, [ controller_name ]
       end
+
+      private
+
+        def attributes_names
+          attributes.each_with_object([]) do |attribute, names|
+            names << (attribute.reference? ? ":#{attribute.name}_id" : ":#{attribute.name}")
+            names << ":#{attribute.name}_type" if attribute.polymorphic?
+          end
+        end
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 5fc93efc6d..078ca3a996 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -91,10 +91,10 @@ class <%= controller_class_name %>Controller < ApplicationController
     # Use this method to whitelist the permissible parameters. Example: params.require(:person).permit(:name, :age)
     # Also, you can specialize this method with per-user checking of permissible attributes.
     def <%= "#{singular_table_name}_params" %>
-      <%- if attributes.empty? -%>
+      <%- if attributes_names.empty? -%>
       params[<%= ":#{singular_table_name}" %>]
       <%- else -%>
-      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes.map { |a| ":#{a.index_name}" }.join(', ') %>)
+      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.join(', ') %>)
       <%- end -%>
     end
 end
diff --git a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
index 71f4f99d02..7f29932ceb 100644
--- a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
+++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
@@ -4,11 +4,13 @@
 one:
 <% attributes.each do |attribute| -%>
   <%= attribute.reference? ? "#{attribute.name}_id" : attribute.name %>: <%= attribute.default %>
+  <%= "#{attribute.name}_type: #{attribute.human_name}" if attribute.polymorphic? %>
 <% end -%>
 
 two:
 <% attributes.each do |attribute| -%>
   <%= attribute.reference? ? "#{attribute.name}_id" : attribute.name %>: <%= attribute.default %>
+  <%= "#{attribute.name}_type: #{attribute.human_name}" if attribute.polymorphic? %>
 <% end -%>
 <% else -%>
 # This model initially had no columns defined.  If you add columns to the
diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
index 8939813304..08bf50dfe2 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -20,11 +20,17 @@ module TestUnit # :nodoc:
         def attributes_hash
           return if attributes.empty?
 
-          attributes.map do |a|
-            name = a.name
-            name = "#{name}_id" if a.reference?
-            "#{name}: @#{singular_table_name}.#{name}"
-          end.sort.join(', ')
+          hash_values = []
+          attributes.each do |a|
+            hash_values << hash_value(a.reference? ? "#{a.name}_id" : a.name)
+            hash_values << hash_value("#{a.name}_type") if a.polymorphic?
+          end
+
+          hash_values.sort.join(', ')
+        end
+
+        def hash_value(name)
+          "#{name}: @#{singular_table_name}.#{name}"
         end
     end
   end
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index d1f669c8c4..0fbaf0c9bb 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -278,6 +278,11 @@ class ModelGeneratorTest < Rails::Generators::TestCase
     assert_file "test/fixtures/line_items.yml", /product_id: /, /cart_id: /
   end
 
+  def test_fixtures_use_the_references_ids_and_type
+    run_generator ["LineItem", "product:references{polymorphic}", "cart:belongs_to"]
+    assert_file "test/fixtures/line_items.yml", /product_id: /, /product_type: Product/, /cart_id: /
+  end
+
   def test_fixture_is_skipped
     run_generator ["account", "--skip-fixture"]
     assert_no_file "test/fixtures/accounts.yml"
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 0b80e54969..57a12d0457 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -70,6 +70,15 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_controller_permit_polymorphic_references_attributes
+    run_generator ["LineItem", "product:references{polymorphic}"]
+
+    assert_file "app/controllers/line_items_controller.rb" do |content|
+      assert_match(/def line_item_params/, content)
+      assert_match(/params\.require\(:line_item\)\.permit\(:product_id, :product_type\)/, content)
+    end
+  end
+
   def test_helper_are_invoked_with_a_pluralized_name
     run_generator
     assert_file "app/helpers/users_helper.rb", /module UsersHelper/
@@ -86,13 +95,13 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_functional_tests
-    run_generator ["User", "name:string", "age:integer", "organization:references"]
+    run_generator ["User", "name:string", "age:integer", "organization:references{polymorphic}"]
 
     assert_file "test/controllers/users_controller_test.rb" do |content|
       assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
       assert_match(/test "should get index"/, content)
-      assert_match(/post :create, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id \}/, content)
-      assert_match(/put :update, id: @user, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id \}/, content)
+      assert_match(/post :create, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \}/, content)
+      assert_match(/put :update, id: @user, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \}/, content)
     end
   end
 
-- 
cgit v1.2.3


From 80735ff4c059d634e5eb3a83ce6a0bb8bda5cd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 9 Dec 2012 15:53:23 -0300
Subject: Extract a attributes_names method to avoid duplication

---
 railties/lib/rails/generators/named_base.rb              |  7 +++++++
 .../scaffold_controller/scaffold_controller_generator.rb |  9 ---------
 .../rails/scaffold_controller/templates/controller.rb    |  2 +-
 .../generators/test_unit/scaffold/scaffold_generator.rb  | 16 ++++------------
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index cc10fd9177..25d3f5518f 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -160,6 +160,13 @@ module Rails
           end
         end
 
+        def attributes_names
+          @attributes_names ||= attributes.each_with_object([]) do |a, names|
+            names << (a.reference? ? "#{a.name}_id" : a.name)
+            names << "#{a.name}_type" if a.polymorphic?
+          end
+        end
+
         def pluralize_table_names?
           !defined?(ActiveRecord::Base) || ActiveRecord::Base.pluralize_table_names
         end
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index 3cfd2233e2..4f36b612ae 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -22,15 +22,6 @@ module Rails
       hook_for :helper, as: :scaffold do |invoked|
         invoke invoked, [ controller_name ]
       end
-
-      private
-
-        def attributes_names
-          attributes.each_with_object([]) do |attribute, names|
-            names << (attribute.reference? ? ":#{attribute.name}_id" : ":#{attribute.name}")
-            names << ":#{attribute.name}_type" if attribute.polymorphic?
-          end
-        end
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 078ca3a996..4d08b01e60 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -94,7 +94,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       <%- if attributes_names.empty? -%>
       params[<%= ":#{singular_table_name}" %>]
       <%- else -%>
-      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.join(', ') %>)
+      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
       <%- end -%>
     end
 end
diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
index 08bf50dfe2..8f3ecaadea 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -18,19 +18,11 @@ module TestUnit # :nodoc:
       private
 
         def attributes_hash
-          return if attributes.empty?
+          return if attributes_names.empty?
 
-          hash_values = []
-          attributes.each do |a|
-            hash_values << hash_value(a.reference? ? "#{a.name}_id" : a.name)
-            hash_values << hash_value("#{a.name}_type") if a.polymorphic?
-          end
-
-          hash_values.sort.join(', ')
-        end
-
-        def hash_value(name)
-          "#{name}: @#{singular_table_name}.#{name}"
+          attributes_names.map do |name|
+            "#{name}: @#{singular_table_name}.#{name}"
+          end.sort.join(', ')
         end
     end
   end
-- 
cgit v1.2.3


From 95ccbd847da149b194cbf423e04e3d19a812dce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 9 Dec 2012 17:01:03 -0300
Subject: Add GeneratedAttribute#column_name to get the name of the column in
 the database

---
 railties/lib/rails/generators/generated_attribute.rb          | 10 +++++++---
 railties/lib/rails/generators/named_base.rb                   |  2 +-
 .../rails/generators/test_unit/model/templates/fixtures.yml   |  4 ++--
 railties/test/generators/generated_attribute_test.rb          | 11 +++++++++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index d8a4f15b4b..4ae8756ed0 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -99,13 +99,17 @@ module Rails
       end
 
       def index_name
-        @index_name ||= if reference?
-          polymorphic? ? %w(id type).map { |t| "#{name}_#{t}" } : "#{name}_id"
+        @index_name ||= if polymorphic?
+          %w(id type).map { |t| "#{name}_#{t}" }
         else
-          name
+          column_name
         end
       end
 
+      def column_name
+        @column_name ||= reference? ? "#{name}_id" : name
+      end
+
       def foreign_key?
         !!(name =~ /_id$/)
       end
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index 25d3f5518f..9965db98de 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -162,7 +162,7 @@ module Rails
 
         def attributes_names
           @attributes_names ||= attributes.each_with_object([]) do |a, names|
-            names << (a.reference? ? "#{a.name}_id" : a.name)
+            names << a.column_name
             names << "#{a.name}_type" if a.polymorphic?
           end
         end
diff --git a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
index 7f29932ceb..b2bcaf63be 100644
--- a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
+++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
@@ -3,13 +3,13 @@
 <% unless attributes.empty? -%>
 one:
 <% attributes.each do |attribute| -%>
-  <%= attribute.reference? ? "#{attribute.name}_id" : attribute.name %>: <%= attribute.default %>
+  <%= attribute.column_name %>: <%= attribute.default %>
   <%= "#{attribute.name}_type: #{attribute.human_name}" if attribute.polymorphic? %>
 <% end -%>
 
 two:
 <% attributes.each do |attribute| -%>
-  <%= attribute.reference? ? "#{attribute.name}_id" : attribute.name %>: <%= attribute.default %>
+  <%= attribute.column_name %>: <%= attribute.default %>
   <%= "#{attribute.name}_type: #{attribute.human_name}" if attribute.polymorphic? %>
 <% end -%>
 <% else -%>
diff --git a/railties/test/generators/generated_attribute_test.rb b/railties/test/generators/generated_attribute_test.rb
index 6ab1cd58c7..d08e650b62 100644
--- a/railties/test/generators/generated_attribute_test.rb
+++ b/railties/test/generators/generated_attribute_test.rb
@@ -117,13 +117,13 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
       assert create_generated_attribute("#{attribute_type}{polymorphic}").polymorphic?
     end
   end
-  
+
   def test_polymorphic_reference_is_false
     %w(foo bar baz).each do |attribute_type|
       assert !create_generated_attribute("#{attribute_type}{polymorphic}").polymorphic?
     end
   end
-  
+
   def test_blank_type_defaults_to_string_raises_exception
     assert_equal :string, create_generated_attribute(nil, 'title').type
     assert_equal :string, create_generated_attribute("", 'title').type
@@ -132,6 +132,13 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
   def test_handles_index_names_for_references
     assert_equal "post", create_generated_attribute('string', 'post').index_name
     assert_equal "post_id", create_generated_attribute('references', 'post').index_name
+    assert_equal "post_id", create_generated_attribute('belongs_to', 'post').index_name
     assert_equal ["post_id", "post_type"], create_generated_attribute('references{polymorphic}', 'post').index_name
   end
+
+  def test_handles_index_names_for_references
+    assert_equal "post", create_generated_attribute('string', 'post').column_name
+    assert_equal "post_id", create_generated_attribute('references', 'post').column_name
+    assert_equal "post_id", create_generated_attribute('belongs_to', 'post').column_name
+  end
 end
-- 
cgit v1.2.3


From 190f638d398edf70fef0c32a389ed84a449bccb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 10 Dec 2012 00:35:03 -0300
Subject: Ensure the scaffold tests will pass when using references attributes

---
 railties/test/application/rake_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index f2234ab111..a8275a2e76 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -195,6 +195,16 @@ module ApplicationTests
       assert_no_match(/Errors running/, output)
     end
 
+    def test_scaffold_with_references_columns_tests_pass_by_default
+      output = Dir.chdir(app_path) do
+        `rails generate scaffold LineItems product:references cart:belongs_to;
+         bundle exec rake db:migrate db:test:clone test`
+      end
+
+      assert_match(/7 tests, 13 assertions, 0 failures, 0 errors/, output)
+      assert_no_match(/Errors running/, output)
+    end
+
     def test_db_test_clone_when_using_sql_format
       add_to_config "config.active_record.schema_format = :sql"
       output = Dir.chdir(app_path) do
-- 
cgit v1.2.3