Changeset 5983
- Timestamp:
- 01/18/07 16:52:47 (2 years ago)
- Files:
-
- branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb (modified) (2 diffs)
- branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (2 diffs)
- branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/openbase_adapter.rb (modified) (1 diff)
- branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb (modified) (1 diff)
- tags/rel_1-2-0/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb (modified) (2 diffs)
- tags/rel_1-2-0/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (2 diffs)
- tags/rel_1-2-0/activerecord/lib/active_record/connection_adapters/openbase_adapter.rb (modified) (1 diff)
- tags/rel_1-2-0/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb
r5980 r5983 272 272 end 273 273 274 def native_database_types #:nodoc: { 274 def native_database_types #:nodoc: 275 { 275 276 :primary_key => "INTEGER DEFAULT UNIQUE PRIMARY KEY", 276 277 :string => { :name => "VARCHAR", :limit => 255 }, … … 564 565 end 565 566 566 def add_limit_offset!(sql, options) #:nodoc: if limit = options[:limit] 567 def add_limit_offset!(sql, options) #:nodoc: 568 if limit = options[:limit] 567 569 offset = options[:offset] || 0 568 570 branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
r5980 r5983 161 161 end 162 162 163 def native_database_types #:nodoc: { 163 def native_database_types #:nodoc: 164 { 164 165 :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY", 165 166 :string => { :name => "varchar", :limit => 255 }, … … 278 279 279 280 280 def add_limit_offset!(sql, options) #:nodoc: if limit = options[:limit] 281 def add_limit_offset!(sql, options) #:nodoc: 282 if limit = options[:limit] 281 283 unless offset = options[:offset] 282 284 sql << " LIMIT #{limit}" branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/openbase_adapter.rb
r5980 r5983 123 123 # DATABASE STATEMENTS ====================================== 124 124 125 def add_limit_offset!(sql, options) #:nodoc: if limit = options[:limit] 125 def add_limit_offset!(sql, options) #:nodoc: 126 if limit = options[:limit] 126 127 unless offset = options[:offset] 127 128 sql << " RETURN RESULTS #{limit}" branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
r5980 r5983 135 135 end 136 136 137 def native_database_types #:nodoc: { 137 def native_database_types #:nodoc: 138 { 138 139 :primary_key => "NUMBER(38) NOT NULL PRIMARY KEY", 139 140 :string => { :name => "VARCHAR2", :limit => 255 }, tags/rel_1-2-0/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb
r5982 r5983 272 272 end 273 273 274 def native_database_types #:nodoc: { 274 def native_database_types #:nodoc: 275 { 275 276 :primary_key => "INTEGER DEFAULT UNIQUE PRIMARY KEY", 276 277 :string => { :name => "VARCHAR", :limit => 255 }, … … 564 565 end 565 566 566 def add_limit_offset!(sql, options) #:nodoc: if limit = options[:limit] 567 def add_limit_offset!(sql, options) #:nodoc: 568 if limit = options[:limit] 567 569 offset = options[:offset] || 0 568 570 tags/rel_1-2-0/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
r5982 r5983 161 161 end 162 162 163 def native_database_types #:nodoc: { 163 def native_database_types #:nodoc: 164 { 164 165 :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY", 165 166 :string => { :name => "varchar", :limit => 255 }, … … 278 279 279 280 280 def add_limit_offset!(sql, options) #:nodoc: if limit = options[:limit] 281 def add_limit_offset!(sql, options) #:nodoc: 282 if limit = options[:limit] 281 283 unless offset = options[:offset] 282 284 sql << " LIMIT #{limit}" tags/rel_1-2-0/activerecord/lib/active_record/connection_adapters/openbase_adapter.rb
r5982 r5983 123 123 # DATABASE STATEMENTS ====================================== 124 124 125 def add_limit_offset!(sql, options) #:nodoc: if limit = options[:limit] 125 def add_limit_offset!(sql, options) #:nodoc: 126 if limit = options[:limit] 126 127 unless offset = options[:offset] 127 128 sql << " RETURN RESULTS #{limit}" tags/rel_1-2-0/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
r5982 r5983 135 135 end 136 136 137 def native_database_types #:nodoc: { 137 def native_database_types #:nodoc: 138 { 138 139 :primary_key => "NUMBER(38) NOT NULL PRIMARY KEY", 139 140 :string => { :name => "VARCHAR2", :limit => 255 },