aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* add ActiveRecord::RecordInvalid to exceptionsHrvoje Šimić2012-04-301-9/+10
* More using <tt>x</tt> instead of +x+ when the latter renders improperly.Mark Rushakoff2012-04-271-1/+1
* Merge pull request #5698 from dougcole/support_postgresql_partitioningAaron Patterson2012-04-275-11/+102
|\
| * refactor configuration of insert_returningDoug Cole2012-04-072-33/+19
| * pick better names and add a little documentationDoug Cole2012-04-012-16/+24
| * improve test coverageDoug Cole2012-03-311-0/+26
| * refactorDoug Cole2012-03-311-13/+8
| * update mysql for new exec_insert signatureDoug Cole2012-03-311-1/+1
| * add use_returning as a postgresql connection configDoug Cole2012-03-314-8/+84
* | remove deprecated callsJon Leighton2012-04-2712-94/+93
* | Revert "Merge pull request #5995 from kennyj/fix_5847-3"José Valim2012-04-271-5/+0
* | more deprecations manually fixedJon Leighton2012-04-273-58/+53
* | find and replace deprecated keysJon Leighton2012-04-2721-220/+220
* | allow AssociationProxy#scoped to take options so that API is the same as Base...Jon Leighton2012-04-272-2/+10
* | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other th...Jon Leighton2012-04-2730-415/+333
* | remove unnecessary test codeJon Leighton2012-04-272-9/+1
* | Merge branch 'master' of github.com:rails/railsJon Leighton2012-04-277-552/+543
|\ \
| * | fix tests for SQLite3AdapterAndrey Deryabin2012-04-274-4/+3
| * | renamed class SQLiteColumn to SQLite3ColumnAndrey Deryabin2012-04-271-3/+3
| * | removed tail of old sqlite versionsAndrey Deryabin2012-04-271-9/+9
| * | fix SQLite3Adapter docAndrey Deryabin2012-04-271-2/+2
| * | Upgrade sqlite3 version to 1.3.6Andrey Deryabin2012-04-271-1/+1
| * | fix tests for sqlite3Andrey Deryabin2012-04-271-1/+1
| * | merged sqlite and sqlite3 adaptersAndrey Deryabin2012-04-272-546/+538
* | | don't need this testJon Leighton2012-04-261-5/+0
|/ /
* | remove calls to find(:first), find(:last) and find(:all)Jon Leighton2012-04-2627-119/+114
* | remove deprecate #all usageJon Leighton2012-04-264-7/+3
* | remove deprecated #first callsJon Leighton2012-04-263-28/+3
* | remove deprecate #calculate callsJon Leighton2012-04-2611-146/+72
* | remove deprecated #find_in_batches callsJon Leighton2012-04-262-15/+3
* | EXPLAIN only for sqlite3Andrey Deryabin2012-04-262-24/+25
* | Merge pull request #5995 from kennyj/fix_5847-3Jon Leighton2012-04-261-0/+5
|\ \
| * | Fix #5847 and #4045. Load AR::Base before loading an application model.kennyj2012-04-261-0/+5
* | | remove deprecate #update_all usageJon Leighton2012-04-264-12/+6
* | | fix #scoped deprecationsJon Leighton2012-04-264-15/+16
* | | remove deprecated scope stuffJon Leighton2012-04-265-54/+2
* | | default_scope with a hash is deprecatedJon Leighton2012-04-261-10/+0
|/ /
* | remove unused methodJon Leighton2012-04-251-6/+0
* | remove tests for #with_scope (it's now deprecated)Jon Leighton2012-04-2513-767/+6
* | Merge pull request #5973 from academia-edu/masterAaron Patterson2012-04-252-3/+10
|\ \
| * | Restore .to_s to escape_hstoreRyan Fitzgerald2012-04-241-1/+1
| * | Always quote hstore keys and valuesRyan Fitzgerald2012-04-242-3/+10
* | | Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy'Jon Leighton2012-04-251-0/+13
|\ \ \
| * | | Define array methods in ActiveRecord::Associations::CollectionProxyJorge Bejar2012-04-181-0/+13
* | | | Merge remote-tracking branch 'kennyj/fix_5563'Jon Leighton2012-04-255-4/+17
|\ \ \ \
| * | | | Fix #5563. Should reflect the most recent change to either of association / id.kennyj2012-04-132-1/+13
| * | | | @stale_state should be nil when a model isn't saved.kennyj2012-04-133-3/+4
* | | | | add missing testJon Leighton2012-04-251-0/+12
* | | | | extract #with_scope and #with_exclusive_scope to active_record_deprecated_fin...Jon Leighton2012-04-252-122/+4
* | | | | extract deprecated codeJon Leighton2012-04-253-11/+4