aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Moves column dump specific code to a module included in AbstractAdapterDan McClain2012-09-148-44/+289
* 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
* | | Use native mysqldump command for 'rake db:structure:dump'.kennyj2012-09-121-9/+19
|/ /
* | 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
* | | 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-081-1/+1
* | | | 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-082-14/+14
|/ / /
* | | Merge pull request #7545 from senny/7518_postgres_type_detectionAaron Patterson2012-09-071-1/+1
|\ \ \
| * | | postgres, map scaled intervals to string datatype (#7518)Yves Senn2012-09-061-1/+1
* | | | 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
* | | | Merge pull request #4976 from kreynolds/fix_eager_without_pkeyJon Leighton2012-09-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix eagerly loading associations without primary keysKelley Reynolds2012-02-091-1/+1
* | | | ActiveRecord support to PostgreSQL 9.2 JSON typeDickson S. Guedes2012-09-055-3/+44
* | | | Merge pull request #7532 from al2o3cr/fix_store_bugsRafael Mendonça França2012-09-051-2/+3
|\ \ \ \
| * | | | correctly flag changed attributes in AR::Store, combine multiple calls to sto...Matt Jones2012-09-051-2/+3
* | | | | Merge pull request #7536 from pivotal/fix_pluck_with_reserved_wordsRafael Mendonça França2012-09-051-1/+1
|\ \ \ \ \
| * | | | | Fix pluck when columns/tables are reserved words.Ian Lesperance2012-09-051-1/+1
* | | | | | Merge pull request #7525 from seamusabshere/use-mysql-binary-for-rake-db-stru...Rafael Mendonça França2012-09-051-4/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use the 'mysql' binary for 'rake db:structure:load'.Seamus Abshere2012-09-051-4/+8
| |/ / / /
* | | | | Merge pull request #7337 from adzap/string_to_dummy_timeRafael Mendonça França2012-09-051-1/+7
|\ \ \ \ \
| * | | | | Fix for time type columns with invalid timeAdam Meehan2012-09-051-1/+7
| |/ / / /
* | | | | Merge pull request #7447 from etehtsea/postgresql-adapterRafael Mendonça França2012-09-056-985/+1038
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Modularize postgresql adapterKonstantin Shabanov2012-09-056-985/+1038
| | |/ / | |/| |
* / | | set the configured #inheritance_column on #become (#7503)Yves Senn2012-09-031-1/+1
|/ / /
* | | Avoid #fetch for non-nil values.Jon Leighton2012-08-311-1/+2