fk: review corrections: indent, visibility, syntax, wording.

1 files changed, 11 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 868181e677..4924f345fc 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -510,7 +510,7 @@ module ActiveRecord
       end
 
       def foreign_keys(table_name)
-        fk_info = select_all %{
+        fk_info = select_all <<-SQL.strip_heredoc
           SELECT fk.referenced_table_name as 'to_table'
                 ,fk.referenced_column_name as 'primary_key'
                 ,fk.column_name as 'column'
@@ -519,7 +519,7 @@ module ActiveRecord
           WHERE fk.referenced_column_name is not null
             AND fk.table_schema = '#{@config[:database]}'
             AND fk.table_name = '#{table_name}'
-        }
+        SQL
 
         create_table_info = select_one("SHOW CREATE TABLE #{quote_table_name(table_name)}")["Create Table"]
 
@@ -537,15 +537,6 @@ module ActiveRecord
         end
       end
 
-      def extract_foreign_key_action(structure, name, action) # :nodoc:
-        if structure =~ /CONSTRAINT #{quote_column_name(name)} FOREIGN KEY .* REFERENCES .* ON #{action} (CASCADE|SET NULL|RESTRICT)/
-          case $1
-          when 'CASCADE'; :cascade
-          when 'SET NULL'; :nullify
-          end
-        end
-      end
-
       # Maps logical Rails types to MySQL-specific data types.
       def type_to_sql(type, limit = nil, precision = nil, scale = nil)
         case type.to_s
@@ -824,6 +815,15 @@ module ActiveRecord
         # ...and send them all in one query
         @connection.query  "SET #{encoding} #{variable_assignments}"
       end
+
+      def extract_foreign_key_action(structure, name, action) # :nodoc:
+        if structure =~ /CONSTRAINT #{quote_column_name(name)} FOREIGN KEY .* REFERENCES .* ON #{action} (CASCADE|SET NULL|RESTRICT)/
+          case $1
+          when 'CASCADE'; :cascade
+          when 'SET NULL'; :nullify
+          end
+        end
+      end
     end
   end
 end