Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 19939fd4c0d0e4eae4ec71df13228547dba03287 2 parents 2d78ee0 + c3f53f4
Pratik lifo authored
2  activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
View
@@ -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)
6 activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.