Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-06-25 | 18 | -1723/+232 |
|\ | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/javascript_helper.rb activesupport/lib/active_support/dependencies.rb activesupport/lib/active_support/inflector.rb activesupport/lib/active_support/values/time_zone.rb | ||||
| * | Include cache key in ModelName | Jeremy Kemper | 2008-06-24 | 1 | -4/+4 |
| | | |||||
| * | Treat any limit > 4 as bigint | Jeremy Kemper | 2008-06-23 | 1 | -6/+8 |
| | | |||||
| * | Always treat integer :limit as byte length. [#420 state:resolved] | Tarmo Tänav | 2008-06-22 | 2 | -16/+21 |
| | | |||||
| * | Partial updates don't update lock_version if nothing changed. [#426 ↵ | Daniel Morrison | 2008-06-22 | 1 | -0/+1 |
| | | | | | | | | state:resolved] | ||||
| * | Fix column collision with named_scope and :joins. [#46 state:resolved] | Mark Catley | 2008-06-22 | 1 | -1/+1 |
| | | |||||
| * | Oops, already had a postgresql_version method! | Jeremy Kemper | 2008-06-22 | 1 | -6/+1 |
| | | |||||
| * | Only use DROP ... IF EXISTS for PostgreSQL 8.2 or later. [#400 state:resolved] | ian | 2008-06-22 | 1 | -1/+9 |
| | | |||||
| * | ActiveRecord::Migrator#run records version-state after migrating. [#369 ↵ | Michael Raidel | 2008-06-22 | 1 | -1/+4 |
| | | | | | | | | state:resolved] | ||||
| * | Fixed that scopes defined with a string name could not be composed | Tarmo Tänav | 2008-06-22 | 1 | -0/+1 |
| | | |||||
| * | Named bind variables can now be used with postgresql-style typecasts | Tarmo Tänav | 2008-06-22 | 1 | -3/+4 |
| | | | | | | | | | | For example :conditions => ['stringcol::integer = :var', { :var => 10 }] will no longer raise an exception about ':integer' having a missing value. | ||||
| * | MySQL: rename_column preserves default values. [#466 state:resolved] | Diego Algorta | 2008-06-22 | 1 | -1/+9 |
| | | |||||
| * | fix merge | rick | 2008-06-19 | 11 | -1670/+146 |
| |\ | |||||
| | * | Make Base.merge_conditions public | Jeremy Kemper | 2008-06-17 | 1 | -14/+14 |
| | | | |||||
| | * | Fix observers that use after_find. [#375 state:resolved] | George Ogata | 2008-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Add :from option to calculations. [#397 state:resolved] | Ben Munat | 2008-06-11 | 1 | -3/+9 |
| | | | |||||
| | * | Fixed non-standard SQL generated by preloading has_and_belongs_to_many ↵ | Antonio Cangiano | 2008-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | association | ||||
| | * | Silence scope resolution warnings | Jeremy Kemper | 2008-06-11 | 1 | -4/+6 |
| | | | |||||
| | * | supports_insert_with_returning? caches false result also | Jeremy Kemper | 2008-06-11 | 1 | -3/+6 |
| | | | |||||
| | * | Update docs to reflect 71bf75 | Pratik Naik | 2008-06-11 | 1 | -1/+1 |
| | | | |||||
| | * | Disable validations for associated belongs_to record by default | Pratik Naik | 2008-06-11 | 1 | -1/+1 |
| | | | |||||
| | * | Add :validate option to associations. [#301 state:resolved] | Jan De Poorter | 2008-06-11 | 1 | -8/+16 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | PostgreSQL: use 'INSERT ... RETURNING id' for 8.2 and later. | Jeremy Kemper | 2008-06-10 | 1 | -3/+20 |
| | | | |||||
| | * | PostgreSQL: insert looks up pk and sequence name if not given. [#384 ↵ | Jeremy Kemper | 2008-06-10 | 1 | -2/+17 |
| | | | | | | | | | | | | state:resolved] | ||||
| | * | Enable autoreconnect if available. Freeze constants. | Jeremy Kemper | 2008-06-08 | 1 | -2/+7 |
| | | | |||||
| | * | Give a more informative error message instead of just raising a load error ↵ | Jeremy Kemper | 2008-06-08 | 1 | -1/+8 |
| | | | | | | | | | | | | when mysql gem isn't installed | ||||
| | * | Don't append limit to primary key column definition. Freeze some constants. | Jeremy Kemper | 2008-06-08 | 4 | -33/+41 |
| | | | |||||
| | * | Remove dead, unused vendor/db2.rb | Jeremy Kemper | 2008-06-08 | 1 | -362/+0 |
| | | | |||||
| | * | Remove vendor/mysql.rb. Deprecated in 2.1 stable, gone in 2.2. | Jeremy Kemper | 2008-06-08 | 2 | -1239/+4 |
| | | | |||||
| | * | Fix conditions and order on join tables with limited eager loading. [#372 ↵ | Tiago Macedo | 2008-06-08 | 1 | -1/+3 |
| | | | | | | | | | | | | state:resolved] | ||||
| * | | fix eager loading with dynamic finders | Brandon Keepers | 2008-06-09 | 3 | -2/+3 |
| |/ | |||||
| * | PostgreSQL: quote bare table names | Jeremy Kemper | 2008-06-07 | 1 | -3/+3 |
| | | |||||
| * | Simplify ActiveRecord::Base#update_attribute | Pratik Naik | 2008-06-07 | 2 | -13/+4 |
| | | |||||
| * | Generate less garbage when expanding range bind variables in conditions | Jeremy Kemper | 2008-06-06 | 1 | -3/+8 |
| | | |||||
| * | Give a nice message if there are duplicate migrations instead of raising a ↵ | Jeremy Kemper | 2008-06-04 | 1 | -3/+14 |
| | | | | | | | | strange insert error | ||||
| * | Callbacks fire before notifying observers [#230 state:resolved] | Craig Demyanovich | 2008-06-03 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ↵ | Joshua Peek | 2008-06-03 | 1 | -1/+1 |
| | | | | | | | | ActiveSupport [#238 state:resolved] | ||||
| * | Ensure AR#sum result is typecasted properly | Pratik Naik | 2008-06-02 | 1 | -2/+3 |
| | | |||||
| * | Ensure Associations#sum returns 0 when no rows are returned. [#295 ↵ | Jonathan Viney | 2008-06-02 | 1 | -3/+3 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | ActiveRecord associations example on module scopes was illogic | Sunny Ripert | 2008-06-20 | 1 | -3/+4 |
| | | | | | | | | Was using Company when it meant Client. | ||||
* | | Merge branch 'master' of git@github.com:lifo/docrails | TomK32 | 2008-06-11 | 34 | -343/+461 |
|\ \ | |||||
| * | | Mass typo and misspelling fix. | Evan Farrar | 2008-06-04 | 6 | -8/+8 |
| | | | |||||
| * | | Merge commit 'mainstream/master' | Pratik Naik | 2008-06-02 | 11 | -28/+40 |
| |\| | |||||
| | * | Added SQL escaping for :limit and :offset in MySQL [Jonathan Wiess] | David Heinemeier Hansson | 2008-06-01 | 1 | -1/+2 |
| | | | |||||
| | * | fix changelog conflict | rick | 2008-05-31 | 3 | -5/+10 |
| | |\ | |||||
| | | * | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-31 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Substitute value into validates_format_of message | John D. Hume | 2008-05-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| | | * | | Making ready for release of 2.1 | David Heinemeier Hansson | 2008-05-31 | 1 | -2/+2 |
| | | |/ | |||||
| | | * | Added SQL escaping for :limit and :offset [#288 state:closed] (Aaron Bedra, ↵ | David Heinemeier Hansson | 2008-05-31 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | Steven Bristol, Jonathan Wiess) | ||||
| | * | | Add ActiveRecord::Base.sti_name that checks ↵ | rick | 2008-05-31 | 2 | -5/+13 |
| | |/ | | | | | | | | | | ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [rick] [#114 state:resolved] |