aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-06-2518-1723/+232
|\
| * Include cache key in ModelNameJeremy Kemper2008-06-241-4/+4
| * Treat any limit > 4 as bigintJeremy Kemper2008-06-231-6/+8
| * Always treat integer :limit as byte length. [#420 state:resolved]Tarmo Tänav2008-06-222-16/+21
| * Partial updates don't update lock_version if nothing changed. [#426 state:re...Daniel Morrison2008-06-221-0/+1
| * Fix column collision with named_scope and :joins. [#46 state:resolved]Mark Catley2008-06-221-1/+1
| * Oops, already had a postgresql_version method!Jeremy Kemper2008-06-221-6/+1
| * Only use DROP ... IF EXISTS for PostgreSQL 8.2 or later. [#400 state:resolved]ian2008-06-221-1/+9
| * ActiveRecord::Migrator#run records version-state after migrating. [#369 stat...Michael Raidel2008-06-221-1/+4
| * Fixed that scopes defined with a string name could not be composedTarmo Tänav2008-06-221-0/+1
| * Named bind variables can now be used with postgresql-style typecastsTarmo Tänav2008-06-221-3/+4
| * MySQL: rename_column preserves default values. [#466 state:resolved]Diego Algorta2008-06-221-1/+9
| * fix mergerick2008-06-1911-1670/+146
| |\
| | * Make Base.merge_conditions publicJeremy Kemper2008-06-171-14/+14
| | * Fix observers that use after_find. [#375 state:resolved]George Ogata2008-06-171-1/+1
| | * Add :from option to calculations. [#397 state:resolved]Ben Munat2008-06-111-3/+9
| | * Fixed non-standard SQL generated by preloading has_and_belongs_to_many associ...Antonio Cangiano2008-06-111-2/+2
| | * Silence scope resolution warningsJeremy Kemper2008-06-111-4/+6
| | * supports_insert_with_returning? caches false result alsoJeremy Kemper2008-06-111-3/+6
| | * Update docs to reflect 71bf75Pratik Naik2008-06-111-1/+1
| | * Disable validations for associated belongs_to record by defaultPratik Naik2008-06-111-1/+1
| | * Add :validate option to associations. [#301 state:resolved]Jan De Poorter2008-06-111-8/+16
| | * PostgreSQL: use 'INSERT ... RETURNING id' for 8.2 and later.Jeremy Kemper2008-06-101-3/+20
| | * PostgreSQL: insert looks up pk and sequence name if not given. [#384 state:r...Jeremy Kemper2008-06-101-2/+17
| | * Enable autoreconnect if available. Freeze constants.Jeremy Kemper2008-06-081-2/+7
| | * Give a more informative error message instead of just raising a load error wh...Jeremy Kemper2008-06-081-1/+8
| | * Don't append limit to primary key column definition. Freeze some constants.Jeremy Kemper2008-06-084-33/+41
| | * Remove dead, unused vendor/db2.rbJeremy Kemper2008-06-081-362/+0
| | * Remove vendor/mysql.rb. Deprecated in 2.1 stable, gone in 2.2.Jeremy Kemper2008-06-082-1239/+4
| | * Fix conditions and order on join tables with limited eager loading. [#372 st...Tiago Macedo2008-06-081-1/+3
| * | fix eager loading with dynamic findersBrandon Keepers2008-06-093-2/+3
| |/
| * PostgreSQL: quote bare table namesJeremy Kemper2008-06-071-3/+3
| * Simplify ActiveRecord::Base#update_attributePratik Naik2008-06-072-13/+4
| * Generate less garbage when expanding range bind variables in conditionsJeremy Kemper2008-06-061-3/+8
| * Give a nice message if there are duplicate migrations instead of raising a st...Jeremy Kemper2008-06-041-3/+14
| * Callbacks fire before notifying observers [#230 state:resolved]Craig Demyanovich2008-06-031-2/+2
| * Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ActiveS...Joshua Peek2008-06-031-1/+1
| * Ensure AR#sum result is typecasted properlyPratik Naik2008-06-021-2/+3
| * Ensure Associations#sum returns 0 when no rows are returned. [#295 state:reso...Jonathan Viney2008-06-021-3/+3
* | ActiveRecord associations example on module scopes was illogicSunny Ripert2008-06-201-3/+4
* | Merge branch 'master' of git@github.com:lifo/docrailsTomK322008-06-1134-343/+461
|\ \
| * | Mass typo and misspelling fix.Evan Farrar2008-06-046-8/+8
| * | Merge commit 'mainstream/master'Pratik Naik2008-06-0211-28/+40
| |\|
| | * Added SQL escaping for :limit and :offset in MySQL [Jonathan Wiess]David Heinemeier Hansson2008-06-011-1/+2
| | * fix changelog conflictrick2008-05-313-5/+10
| | |\
| | | * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-05-311-1/+1
| | | |\
| | | | * Substitute value into validates_format_of messageJohn D. Hume2008-05-311-1/+1
| | | * | Making ready for release of 2.1David Heinemeier Hansson2008-05-311-2/+2
| | | |/
| | | * Added SQL escaping for :limit and :offset [#288 state:closed] (Aaron Bedra, S...David Heinemeier Hansson2008-05-311-2/+7
| | * | Add ActiveRecord::Base.sti_name that checks ActiveRecord::Base#store_full_sti...rick2008-05-312-5/+13
| | |/