aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Allow global override of default STI inheritance columnchapmajs2013-06-261-1/+1
* Merge pull request #10373 from janko-m/fix-store-accessorCarlos Antonio da Silva2013-06-251-1/+1
|\
| * Fix ActiveRecord::Store not tracking changesJanko Marohnić2013-04-291-1/+1
* | Revert "Revert "Merge pull request #10901 from armstrjare/fix_query_null_fore...Yves Senn2013-06-251-1/+1
* | Revert "Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_...Yves Senn2013-06-221-1/+1
* | Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_r...Yves Senn2013-06-221-1/+1
|\ \
| * | Fixes CollectionAssociation#ids_reader returning incorrect ids for new recordsJared Armstrong2013-06-211-1/+1
* | | Merge pull request #10925 from senny/10917_test_to_prevent_regressionYves Senn2013-06-151-3/+5
|/ /
* | Restore rescue block for when IM is enabledAndrew White2013-05-241-19/+22
* | It's scoped in 3-2-stable!Arun Agrawal2013-05-241-1/+1
* | Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-231-2/+1
* | destroys association records before saving/inserting new association recordsJohnny Holton2013-05-181-28/+20
* | Backport a super-simplified version of #6792, fixingBen Woosley2013-05-141-0/+1
* | Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-121-0/+6
|\ \
| * | backport runner fixes to 3-2-stablekennyj2012-12-161-0/+6
* | | Preserve context for joins while merging relationsAndrew Horner2013-05-113-3/+34
* | | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-121-1/+1
* | | Revert "Don't try to EXPLAIN select_db calls"Xavier Noria2013-05-111-1/+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-101-1/+1
|\ \ \
| * | | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-101-1/+1
| | |/ | |/|
* | | Fixed pluck to be working with selects.Arun Agrawal2013-05-101-1/+4
* | | Remove useless elseArun Agrawal2013-05-101-3/+0
* | | Revert "Merge pull request #8209 from senny/backport_8176"Rafael Mendonça França2013-05-081-3/+2
* | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-061-1/+4
|/ /
* | Document nested attributes as hash of hashesAlexey Muranov2013-04-131-17/+41
* | Correctly parse bigint defaults in PostgreSQL, Backpost #10098.Erik Peterson2013-04-111-1/+1
* | Merge pull request #7792 from seejee/chained_scopes_preload_properlyCarlos Antonio da Silva2013-04-031-2/+7
|\ \
| * | Chained scopes will be preloaded properly. Fixes #7490Chris Geihsler2013-04-031-2/+7
* | | Removing explain support warning from the RailtieRafael Mendonça França2013-03-281-7/+0
* | | Don't reset inheritance_column when setting explicitly.Fred Wu2013-03-271-1/+3
* | | do not reset associations when preloading twice.Yves Senn2013-03-221-2/+1
* | | Wrong exception is occured when raising no translatable exceptionkennyj2013-03-201-0/+2
* | | 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-191-0/+1
* | | Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-183-3/+3
|\ \ \
| * | | bumping to 3.2.13Aaron Patterson2013-03-181-1/+1
| * | | stop calling to_sym when building arel nodes [CVE-2013-1854]Aaron Patterson2013-03-152-2/+2
| |/ /
| * | bumping to rc2Aaron Patterson2013-03-061-1/+1
| * | Freeze columns only once per ResultSantiago Pastorino2013-03-051-3/+9
| * | Preparing for 3.2.13.rc1 releaseSteve Klabnik2013-02-271-2/+2
* | | @target might be nil when Identity Map is enabled.Larry Lv2013-03-081-3/+8
* | | Fix issue #7526. Reload the target if it's stale.larrylv2013-03-054-6/+8
* | | Freeze columns only once per ResultSantiago Pastorino2013-03-031-3/+9
* | | Update docs, change_table does not use TableDefinition.Yves Senn2013-02-281-2/+2
* | | Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtu...Narihiro Nakamura2013-02-281-1/+1
|/ /
* | Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric"Steve Klabnik2013-02-263-12/+4
* | Do not override attributes on `dup` by default scopesHiroshige Umino2013-02-261-1/+0
* | Backported #7072 to 3-2-stable. Use database value for uniqueness validation ...Narihiro Nakamura2013-02-261-1/+1
* | Sqlite preserves primary keys when copying/altering tables.Yves Senn2013-02-231-2/+6