aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-234-2/+15
* destroys association records before saving/inserting new association recordsJohnny Holton2013-05-183-31/+48
* Backport a super-simplified version of #6792, fixingBen Woosley2013-05-143-0/+20
* Improve CHANGELOG entriesRafael Mendonça França2013-05-121-2/+8
* Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-122-1/+10
|\
| * backport runner fixes to 3-2-stablekennyj2012-12-162-0/+9
* | Preserve context for joins while merging relationsAndrew Horner2013-05-115-4/+47
* | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-123-1/+12
* | Revert "Don't try to EXPLAIN select_db calls"Xavier Noria2013-05-112-8/+1
* | Using map. No need to run query againArun Agrawal2013-05-101-1/+1
* | Merge pull request #10555 from dasch/dasch/3-2-stableXavier Noria2013-05-102-1/+8
|\ \
| * | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-102-1/+8
* | | Fixed pluck to be working with selects.Arun Agrawal2013-05-102-3/+7
* | | Remove useless elseArun Agrawal2013-05-101-3/+0
* | | Revert "Merge pull request #8209 from senny/backport_8176"Rafael Mendonça França2013-05-083-6/+11
* | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-063-1/+28
|/ /
* | adding test for the symbol refsAaron Patterson2013-04-261-0/+7
* | Document nested attributes as hash of hashesAlexey Muranov2013-04-131-17/+41
* | Correctly parse bigint defaults in PostgreSQL, Backpost #10098.Erik Peterson2013-04-114-1/+13
* | Merge branch '3-2-later' into 3-2-stableAaron Patterson2013-04-091-0/+10
|\ \
| * | adding test for CVEAaron Patterson2013-02-091-0/+10
* | | Merge pull request #7792 from seejee/chained_scopes_preload_properlyCarlos Antonio da Silva2013-04-034-2/+22
|\ \ \
| * | | Chained scopes will be preloaded properly. Fixes #7490Chris Geihsler2013-04-034-2/+22
* | | | Removing explain support warning from the RailtieRafael Mendonça França2013-03-282-7/+7
* | | | Added changelog for 55e2954Fred Wu2013-03-271-0/+5
* | | | Don't reset inheritance_column when setting explicitly.Fred Wu2013-03-272-1/+13
* | | | use ruby 1.8 Hash syntax [ci skip]Yves Senn2013-03-221-1/+1
* | | | do not reset associations when preloading twice.Yves Senn2013-03-222-2/+8
* | | | Remove bad changelog entry from AR [ci skip]Carlos Antonio da Silva2013-03-201-3/+0
* | | | Wrong exception is occured when raising no translatable exceptionkennyj2013-03-203-0/+16
* | | | Don't crash exception translation w/ nil result attribute.Steve Jorgensen2013-03-201-1/+1
* | | | Reset postgreSQL search path in db:test:clone_structure.Alexander2013-03-192-0/+8
* | | | Add release dates to documentation [ci skip]claudiob2013-03-181-2/+2
* | | | Bring back test and changelog entry from #pluck method and select clauseCarlos Antonio da Silva2013-03-182-0/+16
* | | | Fix changelog conflicts and remove release dates [ci skip]Carlos Antonio da Silva2013-03-181-2/+2
* | | | Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-187-28/+12
|\ \ \ \
| * | | | bumping to 3.2.13Aaron Patterson2013-03-181-1/+1
| * | | | stop calling to_sym when building arel nodes [CVE-2013-1854]Aaron Patterson2013-03-154-10/+10
| |/ / /
| * | | bumping to rc2Aaron Patterson2013-03-061-1/+1
| * | | Revert "Merge pull request #8209 from senny/backport_8176"Aaron Patterson2013-03-052-21/+0
| * | | Freeze columns only once per ResultSantiago Pastorino2013-03-051-3/+9
| * | | Preparing for 3.2.13.rc1 releaseSteve Klabnik2013-02-271-2/+2
| * | | Update CHANGELOGs for 3.2.13 release.Steve Klabnik2013-02-271-0/+5
* | | | Fix ar:mysql2 build on Ruby 1.8.7Andrew White2013-03-131-4/+12
* | | | Merge pull request #9613 from arunagw/remove_fixmeCarlos Antonio da Silva2013-03-081-9/+8
|\ \ \ \
| * | | | Removing FIXMEArun Agrawal2013-03-081-9/+8
* | | | | @target might be nil when Identity Map is enabled.Larry Lv2013-03-081-3/+8
* | | | | Merge pull request #9549 from larrylv/reload-stable-target-before-savingRafael Mendonça França2013-03-076-6/+28
|\ \ \ \ \
| * | | | | Fix issue #7526. Reload the target if it's stale.larrylv2013-03-056-6/+28
* | | | | | Use shorter prefix and suffix as in Oracle database identifierYasuo Honda2013-03-071-4/+5