Merge commit 'mainstream/master'

Conflicts: activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
rails · Dec 19, 2008 · 19939fd · 19939fd
2 parents 2d78ee0 + c3f53f4
commit 19939fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -122,7 +122,7 @@ def connection_pool
       def retrieve_connection
         connection_handler.retrieve_connection(self)
       end
-      
+
       # Returns true if +ActiveRecord+ is connected.
       def connected?
         connection_handler.connected?(self)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -31,12 +31,12 @@ def initialize(name, default, sql_type = nil, null = true)
 
         @primary = nil
       end
-      
+
       # Returns +true+ if the column is either of type string or text.
       def text?
         type == :string || type == :text
       end
-      
+
       # Returns +true+ if the column is either of type integer, float or decimal.
       def number?
         type == :integer || type == :float || type == :decimal
@@ -297,7 +297,7 @@ def add_column_options!(sql, options)
     #         puts t.class  # => "ActiveRecord::ConnectionAdapters::TableDefinition"
     #       end
     #     end
-    #     
+    #
     #     def self.down
     #       ...
     #     end