aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* 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-123-41/+36
* Merge pull request #7273 from beerlington/foreign_key_model_queriesJon Leighton2012-09-126-5/+151
|\
| * Accept belongs_to assoc. keys in ActiveRecord queriesbeerlington2012-09-116-5/+151
* | 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-124-32/+60
|\ \ \
| * | | fixed support for DATABASE_URL for rake db tasksGrace Liu2012-09-114-32/+60
* | | | warning removed.Arun Agrawal2012-09-121-1/+0
|/ / /
* | | Merge pull request #7601 from jrochkind/connection_pool_unify_exceptionsAaron Patterson2012-09-112-18/+12
|\ \ \ | |_|/ |/| |
| * | ConnectionPool, unify exceptions, ConnectionTimeoutErrorJonathan Rochkind2012-09-112-18/+12
* | | Use configuration['encoding'], because database configuration use not charset...kennyj2012-09-122-5/+5
* | | Use native mysqldump command for 'rake db:structure:dump'.kennyj2012-09-123-24/+26
|/ /
* | Merge pull request #7569 from skorfmann/improve-has-many-through-exception-me...Carlos Antonio da Silva2012-09-111-1/+1
|\ \
| * | Improve exception message for HasManyThroughAssociationPolymorphicSourceErrorSebastian Korfmann2012-09-101-1/+1
* | | Remove expired comment. This method is used from other place.kennyj2012-09-111-2/+0
* | | Fix annoy warning, when executing testcase.kennyj2012-09-112-0/+13
* | | indent fix [ci skip]Vijay Dev2012-09-091-1/+1
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-092-2/+2
|\ \ \
| * | | add :nodoc: to AR::Store::IndifferentCoder [ci skip]Francesco Rodriguez2012-09-081-1/+1
| * | | Fix a typoAndreas Loupasakis2012-09-061-1/+1
| * | | Fix indenentation in comment to stop the end of comment from appearing in a <...Anuj Dutta2012-09-031-1/+1
* | | | Merge pull request #7571 from arunagw/warning_removed_shadowingRafael Mendonça França2012-09-091-1/+1
|\ \ \ \
| * | | | removed warning: shadowing outer local variableArun Agrawal2012-09-091-1/+1
| | |/ / | |/| |
* | | | Raise MissingAttributeError on query methodsErnie Miller2012-09-083-1/+8
* | | | improve AR CHANGELOG [ci skip]Francesco Rodriguez2012-09-081-8/+9
* | | | Improve latest AR and AP changelog entriesCarlos Antonio da Silva2012-09-081-1/+4
* | | | Refactor nested attributes limit logic to lookup :limit option only onceCarlos Antonio da Silva2012-09-081-11/+12
* | | | Dump schema using new style hashKonstantin Shabanov2012-09-084-58/+60
|/ / /
* | | Add changelog entry for #7545: map interval with precision to stringCarlos Antonio da Silva2012-09-071-0/+2
* | | Merge pull request #7545 from senny/7518_postgres_type_detectionAaron Patterson2012-09-073-3/+6
|\ \ \
| * | | postgres, map scaled intervals to string datatype (#7518)Yves Senn2012-09-063-3/+6
* | | | Minor refactor in ActiveRecord#initialize_dupCarlos Antonio da Silva2012-09-073-12/+4
* | | | create a transaction object and point AR objects at that object during aAaron Patterson2012-09-074-12/+55
* | | | Fix AR tests due to builder change with nil values / empty stringsCarlos Antonio da Silva2012-09-071-6/+6
* | | | Remove 3.2.x entries from Active Record changelog [ci skip]Carlos Antonio da Silva2012-09-071-100/+0
* | | | Add Changelog entry for #4976: fix eager load associations without pks [ci skip]Carlos Antonio da Silva2012-09-071-0/+2
* | | | Merge pull request #4976 from kreynolds/fix_eager_without_pkeyJon Leighton2012-09-072-1/+9
|\ \ \ \
| * | | | Change JoinPart test from an integration to a unit testKelley Reynolds2012-07-052-13/+8
| * | | | Fix eagerly loading associations without primary keysKelley Reynolds2012-02-092-1/+14
* | | | | Update Active Record CHANGELOG for #7419Prem Sichanugrist2012-09-061-0/+6
* | | | | add mini-validator on creating migrationJan Bernacki2012-09-061-0/+9
| |/ / / |/| | |
* | | | Put the create_table block in a transaction.Rafael Mendonça França2012-09-051-2/+4
* | | | ActiveRecord support to PostgreSQL 9.2 JSON typeDickson S. Guedes2012-09-059-4/+135
* | | | Add CHANGELOG entry for #7532 [ci skip]Rafael Mendonça França2012-09-051-0/+10
* | | | Merge pull request #7532 from al2o3cr/fix_store_bugsRafael Mendonça França2012-09-053-4/+12
|\ \ \ \
| * | | | correctly flag changed attributes in AR::Store, combine multiple calls to sto...Matt Jones2012-09-053-4/+12