Skip to content
Browse files

Fix nodoc breaking adapters (closes #7161)

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5983 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent cfb3a80 commit f255db871b204e85c388a9e85da67508f3bc7a48 @dhh dhh committed Jan 18, 2007
View
6 activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb
@@ -271,7 +271,8 @@ def supports_migrations? #:nodoc:
true
end
- def native_database_types #:nodoc: {
+ def native_database_types #:nodoc:
+ {
:primary_key => "INTEGER DEFAULT UNIQUE PRIMARY KEY",
:string => { :name => "VARCHAR", :limit => 255 },
:text => { :name => "CLOB" },
@@ -563,7 +564,8 @@ def rollback_db_transaction #:nodoc:
execute "SET COMMIT TRUE"
end
- def add_limit_offset!(sql, options) #:nodoc: if limit = options[:limit]
+ def add_limit_offset!(sql, options) #:nodoc:
+ if limit = options[:limit]
offset = options[:offset] || 0
# Here is the full syntax FrontBase supports:
View
6 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -160,7 +160,8 @@ def supports_migrations? #:nodoc:
true
end
- def native_database_types #:nodoc: {
+ def native_database_types #:nodoc:
+ {
:primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY",
:string => { :name => "varchar", :limit => 255 },
:text => { :name => "text" },
@@ -277,7 +278,8 @@ def rollback_db_transaction #:nodoc:
end
- def add_limit_offset!(sql, options) #:nodoc: if limit = options[:limit]
+ def add_limit_offset!(sql, options) #:nodoc:
+ if limit = options[:limit]
unless offset = options[:offset]
sql << " LIMIT #{limit}"
else
View
3 activerecord/lib/active_record/connection_adapters/openbase_adapter.rb
@@ -122,7 +122,8 @@ def quoted_false
# DATABASE STATEMENTS ======================================
- def add_limit_offset!(sql, options) #:nodoc: if limit = options[:limit]
+ def add_limit_offset!(sql, options) #:nodoc:
+ if limit = options[:limit]
unless offset = options[:offset]
sql << " RETURN RESULTS #{limit}"
else
View
3 activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
@@ -134,7 +134,8 @@ def supports_migrations? #:nodoc:
true
end
- def native_database_types #:nodoc: {
+ def native_database_types #:nodoc:
+ {
:primary_key => "NUMBER(38) NOT NULL PRIMARY KEY",
:string => { :name => "VARCHAR2", :limit => 255 },
:text => { :name => "CLOB" },

0 comments on commit f255db8

Please sign in to comment.
Something went wrong with that request. Please try again.