aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
...
* Revert "Deprecating composed_of in ActiveRecord"Rafael Mendonça França2012-08-015-24/+7
* Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-018-97/+38
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-011-0/+6
* Add CHANGELOG entry [ci skip]Rafael Mendonça França2012-07-311-0/+8
* Revert "Add update_columns and the suggestion of using update_columnsRafael Mendonça França2012-07-303-76/+2
* removes the AR session store from eager loaded code [fixes #7160]Xavier Noria2012-07-291-1/+10
* missing require: the AR session store depends on the AP abstract storeXavier Noria2012-07-281-0/+2
* Only require the `:rails_env` task where is needed.Rafael Mendonça França2012-07-271-13/+13
* Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-07-262-2/+2
|\
| * updating release dateAaron Patterson2012-07-261-1/+1
| * bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
| * updating the versionAaron Patterson2012-07-231-2/+2
* | Switched update_column recommendation in changelog to update_columnsPhilip Arndt2012-07-261-1/+1
* | Fix AR#update_columns tests on Ruby 1.8.7Carlos Antonio da Silva2012-07-251-7/+7
* | Suggest using update_columns instead of update_column.Philip Arndt2012-07-261-1/+1
* | New #update_columns method.Sebastian Martinez2012-07-262-0/+74
|/
* Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-07-208-35/+108
* Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-07-191-0/+3
* AR::Integration must be included after AM::ConversionJohn Firebaugh2012-07-172-1/+7
* Merge pull request #4396 from kennyj/fix_4259Rafael Mendonça França2012-07-172-4/+40
* fixing tests to deal with data differences between prepared statements and no...Aaron Patterson2012-07-133-3/+8
* Fixing texts; down to three failing tests.Jeremy Cole2012-07-132-15/+24
* Only use prepared statements when bind variables are presentJeremy Cole2012-07-131-34/+40
* Update psql adapter to rename a default pkey sequence during rename_table.Robb Kidd2012-07-102-0/+27
* Merge pull request #6985 from sidonath/disable-query-cache-for-locksRafael Mendonça França2012-07-062-1/+17
* Backport #3329 to 3-2-stableFrancesco Rodriguez2012-07-022-15/+31
* Merge pull request #6878 from masarakki/masterRafael Mendonça França2012-06-285-0/+41
* Merge pull request #6900 from cbandy/issue-6898Carlos Antonio da Silva2012-06-281-0/+2
* Ensure Arel columns are typecasted properly when grouping with calculationCarlos Antonio da Silva2012-06-252-5/+9
* Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculationsRafael Mendonça França2012-06-242-6/+22
* Remove waning of unused variableRafael Mendonça França2012-06-211-1/+0
* Merge branch 'acapilleri-update_nested_attributes'Rafael Mendonça França2012-06-212-5/+25
* Merge pull request #6758 from caironoleto/masterJosé Valim2012-06-181-13/+13
* Deprecating composed_of in ActiveRecordSteve Klabnik2012-06-185-7/+24
* Remove unneded tests.Rafael Mendonça França2012-06-141-11/+1
* registers the deprecation of update_attribute in the CHANGELOGXavier Noria2012-06-141-0/+8
* Deprecate update_attribute.Steve Klabnik2012-06-147-17/+41
* Merge branch '3-2-stable-rel' into 3-2-stableAaron Patterson2012-06-124-5/+17
|\
| * updating changelogsAaron Patterson2012-06-121-1/+3
| * bumping version numbersAaron Patterson2012-06-111-1/+1
| * updating changelogs with security fixesAaron Patterson2012-06-111-0/+4
| * Additional fix for CVE-2012-2661Ernie Miller2012-06-112-3/+9
* | Merge pull request #6715 from arunagw/add_assertsRafael Mendonça França2012-06-121-2/+2
* | Merge pull request #6676 from aurelian/masterRafael Mendonça França2012-06-122-1/+5
|/
* Change the string to use in test case.kennyj2012-06-112-2/+2
* Fix GH #3163. Should quote database on mysql/mysql2.kennyj2012-06-113-1/+22
* Merge pull request #6698 from yahonda/address_ora_911_masterRafael Mendonça França2012-06-112-2/+2
* Merge pull request #6521 from Empact/throw-resultRafael Mendonça França2012-06-102-1/+8
* Remove warningRafael Mendonça França2012-06-101-1/+1
* Add test to column alias in `exists?` SQL.Rafael Mendonça França2012-06-101-0/+6