github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'mainstream/master'

Browse Source 
Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
This commit is contained in:
Pratik Naik
2008-12-19 14:29:14 +00:00
parent 2d78ee0de6 c3f53f412c
commit 19939fd4c0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
View File

@@ -122,7 +122,7 @@ module ActiveRecord
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 File

@@ -31,12 +31,12 @@ module ActiveRecord
@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 @@ module ActiveRecord
# puts t.class # => "ActiveRecord::ConnectionAdapters::TableDefinition"
# end
# end
#
#
# def self.down
# ...
# end