aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2010-12-2051-1067/+1213
|\
| * Small changes on AD::Reloader.José Valim2010-12-201-1/+1
| * Use AD::Reloader.to_cleanup for reloading [#2873 state:resolved]John Firebaugh2010-12-201-5/+3
| * Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepareJohn Firebaugh2010-12-201-1/+1
| * Added ActiveRecord::Base#has_secure_password (via ActiveModel::SecurePassword...David Heinemeier Hansson2010-12-181-0/+1
| * ActiveRecord::Base.joins should allow single nil argument [#6181 state:resolved]Piotr Sarnacki2010-12-161-1/+1
| * Fix various issues with the :primary_key option in :through associations [#24...Jon Leighton2010-12-152-18/+14
| * Fix problem with duplicated records when a :uniq :through association is prel...Jon Leighton2010-12-151-0/+1
| * dry up compute type in attributeAaron Patterson2010-12-151-16/+10
| * Replace rudimentary named_scope with scope. [#6052 state:resolved]Pavel Gorbokon2010-12-152-10/+10
| * to_xml doesn't work in such case: Event.select('title as t').to_xml [#4840 st...Víctor Martínez2010-12-151-2/+8
| * make sure that join nodes are uniqAaron Patterson2010-12-161-1/+1
| * Respect the default_scope on a join model when reading a through associationJon Leighton2010-12-163-2/+9
| * Fix hm:t to self table aliasing in construct_scopeErnie Miller2010-12-161-2/+10
| * class names are already strings, so we do not need to call to_s on the string...Aaron Patterson2010-12-161-2/+2
| * build SQL AST nodes rather than generate stringsAaron Patterson2010-12-161-10/+8
| * construct_joins no longer needs an argumentAaron Patterson2010-12-161-1/+1
| * supporting arel AST nodes when building join statementsAaron Patterson2010-12-162-18/+32
| * just copy the joins to the listAaron Patterson2010-12-161-1/+1
| * bucketing based on join typeAaron Patterson2010-12-161-8/+17
| * taking advantage of the JoinSource node in the SQL ASTAaron Patterson2010-12-164-32/+14
| * stop delegating inserts to ARel, use the INSERT SQL ourselvesAaron Patterson2010-12-161-1/+13
| * Only call save on belongs_to associations if the record has changed or any ne...Chiel Wester2010-12-161-1/+1
| * just use the regexp directlyAaron Patterson2010-12-161-6/+4
| * combine regexpAaron Patterson2010-12-161-4/+2
| * reduce method callsAaron Patterson2010-12-161-1/+1
| * move ivar to initialize, use triple dot rather than minusAaron Patterson2010-12-162-2/+2
| * explicitly set prefixAaron Patterson2010-12-161-1/+1
| * remove lasgn since AST is mutatedAaron Patterson2010-12-162-3/+9
| * just mutate the ast, fewer lasgnsAaron Patterson2010-12-161-3/+2
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-111-9/+11
| |\
| | * reviews commit 53bbbccXavier Noria2010-12-111-9/+11
| | * Fix doc about nested transaction rollbackIvan Evtukhovich2010-12-091-1/+2
| * | use table alias nodes rather than Table nodesAaron Patterson2010-12-101-3/+2
| * | use alias nodes to represent table aliasesAaron Patterson2010-12-101-3/+2
| * | avoid *args on join_target_tableAaron Patterson2010-12-101-3/+5
| * | only quote the table name once per callAaron Patterson2010-12-101-6/+7
| * | no more manager manipulation if there is no custom join astAaron Patterson2010-12-101-6/+5
| * | froms should never equal 0Aaron Patterson2010-12-101-2/+0
| * | manager will always be a managerAaron Patterson2010-12-101-10/+6
| * | eliminate lasgnsAaron Patterson2010-12-101-10/+10
| * | dealing with an AST manager, not a relation, so fix the variable namesAaron Patterson2010-12-101-12/+12
| * | require core_ext/array/wrap in active_record/migrationPiotr Sarnacki2010-12-101-0/+2
| * | move join creation a little closer to where it is usedAaron Patterson2010-12-091-3/+3
| * | use inject rather than lasgnAaron Patterson2010-12-091-6/+5
| * | reuse the superclass methods for shorter codesAaron Patterson2010-12-091-7/+3
| * | just use core methodsAaron Patterson2010-12-091-1/+1
| * | Merge remote branch 'rude/disable-keys-for-postgres-9.0.1' into pgAaron Patterson2010-12-091-6/+7
| |\ \
| | * | Cleaner way to extract the Postgres versionMatthew Rudy Jacobs2010-11-211-2/+6
| | * | Fix Bug: disable_referential_integrity doesn't work for postgres 9.0.1Matthew Rudy Jacobs2010-11-211-4/+1