aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* fix querying with an empty hashDamien Mathieu2012-09-191-2/+6
* Remove unused private method AR::NestedAttributes#unassignable_keys and refer...Guillermo Iguaran2012-09-191-5/+1
* Update AR::Base.create and AR:Base#update_attributes docs to remove reference...Guillermo Iguaran2012-09-181-11/+0
* Update docs for AR::Base#new to remove references to mass_assignment_optionsGuillermo Iguaran2012-09-181-10/+1
* Merge pull request #7251 from rails/integrate-strong_parametersDavid Heinemeier Hansson2012-09-1814-171/+74
|\
| * Set primary key with id= only if primary key existsGuillermo Iguaran2012-09-161-1/+1
| * Remove mass_assignment_options from ActiveRecordGuillermo Iguaran2012-09-1612-79/+62
| * attr_accessible and attr_protected raise an exception pointing to use plugin ...Guillermo Iguaran2012-09-161-0/+2
| * Rename ForbiddenAttributes exception to ForbiddenAttributesErrorGuillermo Iguaran2012-09-161-1/+1
| * Remove mass assignment security from ActiveRecordGuillermo Iguaran2012-09-166-94/+12
* | Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmtRafael Mendonça França2012-09-171-0/+14
|\ \ | |/ |/|
| * Fix collection= on hm:t join models when unsavedErnie Miller2012-09-171-0/+14
* | Merge pull request #7547 from danmcclain/pg-arraysRafael Mendonça França2012-09-168-44/+289
|\ \
| * | Moves column dump specific code to a module included in AbstractAdapterDan McClain2012-09-148-44/+289
* | | Remove debug code :bomb:Rafael Mendonça França2012-09-161-1/+0
* | | Merge pull request #7651 from steveklabnik/issue_3956Rafael Mendonça França2012-09-161-1/+2
|\ \ \ | |_|/ |/| |
| * | Don't preserve SELECT columns on COUNTSteve Klabnik2012-09-161-1/+2
* | | Don't explain except normal CRUD sql.kennyj2012-09-171-1/+2
* | | Fix find_in_batches with customized primary_keyToshiyuki Kawanishi2012-09-161-6/+7
* | | Query for sequence info also should be markd as SCHEMA.kennyj2012-09-151-3/+3
* | | Query for loading index info should be marked as SCHEMA.kennyj2012-09-152-2/+2
* | | simplify rescueJon Leighton2012-09-151-3/+3
|/ /
* | Fix testJon Leighton2012-09-151-13/+19
* | Ensure disconnecting or reconnecting resets the transaction stateJon Leighton2012-09-155-9/+19
* | Remove our use of #outside_transaction?Jon Leighton2012-09-152-32/+14
* | Remove the transaction_open variableJon Leighton2012-09-151-21/+28
* | Move transaction joinability into the transaction objectJon Leighton2012-09-154-20/+27
* | Alter the naming structure a bitJon Leighton2012-09-153-108/+111
* | Split Open into Real and SavepointJon Leighton2012-09-151-25/+38
* | DRYJon Leighton2012-09-151-4/+8
* | Don't do the rollback in #commitJon Leighton2012-09-152-18/+7
* | Store the transaction number in the transaction objectJon Leighton2012-09-155-13/+30
* | Start to tease out transaction handling into a state machineJon Leighton2012-09-154-85/+155
* | Revert "create a transaction object and point AR objects at that object durin...Jon Leighton2012-09-154-55/+12
|/
* refactor store_accessorMatt Jones2012-09-131-6/+38
* update ConnectionAdaptar::Column#type_cast_code to be compatible with 3.2 branchThiago Pradi2012-09-131-1/+1
* Pass in the model class rather than engineJon Leighton2012-09-133-8/+8
* Refactor to remove some duplicationJon Leighton2012-09-122-37/+24
* Fix nested association referencesJon Leighton2012-09-121-3/+4
* Merge pull request #7273 from beerlington/foreign_key_model_queriesJon Leighton2012-09-122-4/+66
|\
| * Accept belongs_to assoc. keys in ActiveRecord queriesbeerlington2012-09-112-4/+66
* | Update documentation for CollectionProxyMarc-Andre Lafortune2012-09-121-8/+2
* | Merge pull request #7605 from revans/masterCarlos Antonio da Silva2012-09-121-1/+11
|\ \
| * | Added additional comments on how to use the "type" column withoutRobert Evans2012-09-121-1/+11
* | | Merge pull request #7521 from graceliu/fix_database_url_supportRafael Mendonça França2012-09-123-30/+60
|\ \ \
| * | | fixed support for DATABASE_URL for rake db tasksGrace Liu2012-09-113-30/+60
* | | | warning removed.Arun Agrawal2012-09-121-1/+0
|/ / /
* | | Merge pull request #7601 from jrochkind/connection_pool_unify_exceptionsAaron Patterson2012-09-111-17/+11
|\ \ \ | |_|/ |/| |
| * | ConnectionPool, unify exceptions, ConnectionTimeoutErrorJonathan Rochkind2012-09-111-17/+11
* | | Use configuration['encoding'], because database configuration use not charset...kennyj2012-09-121-3/+3