aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* AR::Integration must be included after AM::ConversionJohn Firebaugh2012-07-171-1/+1
* Merge pull request #4396 from kennyj/fix_4259Rafael Mendonça França2012-07-171-4/+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-101-0/+7
* Merge pull request #6985 from sidonath/disable-query-cache-for-locksRafael Mendonça França2012-07-061-1/+9
* Backport #3329 to 3-2-stableFrancesco Rodriguez2012-07-021-15/+21
* Merge pull request #6878 from masarakki/masterRafael Mendonça França2012-06-281-0/+2
* 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-251-3/+3
* Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculationsRafael Mendonça França2012-06-241-6/+17
* Merge branch 'acapilleri-update_nested_attributes'Rafael Mendonça França2012-06-211-5/+15
* Merge pull request #6758 from caironoleto/masterJosé Valim2012-06-181-13/+13
* Deprecating composed_of in ActiveRecordSteve Klabnik2012-06-181-0/+3
* Deprecate update_attribute.Steve Klabnik2012-06-143-6/+10
* Merge branch '3-2-stable-rel' into 3-2-stableAaron Patterson2012-06-122-4/+4
|\
| * bumping version numbersAaron Patterson2012-06-111-1/+1
| * Additional fix for CVE-2012-2661Ernie Miller2012-06-111-3/+3
* | Merge pull request #6676 from aurelian/masterRafael Mendonça França2012-06-121-1/+1
|/
* Fix GH #3163. Should quote database on mysql/mysql2.kennyj2012-06-111-1/+1
* Merge pull request #6698 from yahonda/address_ora_911_masterRafael Mendonça França2012-06-111-1/+1
* Merge pull request #6521 from Empact/throw-resultRafael Mendonça França2012-06-101-0/+2
* Minimal change to query generation of exists? that makes SQLServer and others...iaddict2012-06-101-1/+1
* Merge pull request #6695 from kennyj/fix_6635Rafael Mendonça França2012-06-101-5/+5
* ActiveRecord#attributes optimization: minimize objects createdTieg Zaharia2012-06-091-1/+3
* Revert "Perf: Don't load the association for #delete_all."Jon Leighton2012-06-074-33/+9
* Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
* bumping to 3.2.5Aaron Patterson2012-05-311-1/+1
* Restore behavior of Active Record 3.2.3 scopesAndrew White2012-06-012-5/+4
* Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-05-311-1/+1
|\
| * bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
| * Merge branch '3-2-stable-sec' into 3-2-relAaron Patterson2012-05-312-4/+19
| |\
| * | Merge pull request #6558 from parndt/fix_regressionAaron Patterson2012-05-301-3/+4
* | | Merge branch '3-2-stable-sec' into 3-2-stableAaron Patterson2012-05-313-6/+21
|\ \ \ | | |/ | |/|
| * | predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-302-4/+19
| |/
| * bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
* | Revert "Removes unneeded caching from ActiveRecord::Base.relation"Philip Arndt2012-05-311-3/+4
* | Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
* | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-303-5/+6
|/
* Merge pull request #5244 from fotos/myqsl2_wait_timeoutRafael Mendonça França2012-05-251-1/+1
* Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
|\
| * Use Shellwords to scape arguments in db:structure:dump for PostgreSQL.Juan M. Cuello2012-05-221-2/+2
* | Synchronize the ConnectionPool#release method to avoid thread safety issues [...Andrew Selder2012-05-231-10/+12
|/
* Restore the frozen state on rollback. Fixes #6417.Godfrey Chan2012-05-221-1/+3
* Postgresql doesn't accept limits on binary (bytea) columns.Victor Costan2012-05-211-8/+19
* Fix uniqueness validator with `allow_nil: false` also for mysqlPiotr Sarnacki2012-05-191-1/+1
* Fix `validates_uniqueness_off :field, :allow_nil => false`Piotr Sarnacki2012-05-191-2/+2
* Merge pull request #6398 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-191-4/+8
* Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-191-1/+1
* Fix HABTM syntax error in Ruby 1.8.xErnie Miller2012-05-181-2/+2