Ruby 1.9 compat: check column type more carefully

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8439 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 11 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 8f981438df..8bbadd67e7 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -255,26 +255,27 @@ module ActiveRecord
       def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
         if native = native_database_types[type]
           column_type_sql = native.is_a?(Hash) ? native[:name] : native
+
           if type == :decimal # ignore limit, use precision and scale
-            precision ||= native[:precision]
             scale ||= native[:scale]
-            if precision
+
+            if precision ||= native[:precision]
               if scale
                 column_type_sql << "(#{precision},#{scale})"
               else
                 column_type_sql << "(#{precision})"
               end
-            else
-              raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale if specified" if scale
+            elsif scale
+              raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale if specified"
             end
-            column_type_sql
-          else
-            limit ||= native[:limit]
-            column_type_sql << "(#{limit})" if limit
-            column_type_sql
+
+          elsif limit ||= native.is_a?(Hash) && native[:limit]
+            column_type_sql << "(#{limit})"
           end
+
+          column_type_sql
         else
-          column_type_sql = type
+          type
         end
       end