aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-02-182-2/+6
|\
| * Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-182-2/+6
| |\
| | * Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-181-1/+1
| | * Correctly escape PostgreSQL arrays.Aaron Patterson2014-02-181-1/+5
* | | cache queries in the Model.find(id) pathAaron Patterson2014-02-182-0/+28
* | | add AST cache to the find_by methodAaron Patterson2014-02-171-0/+35
* | | Merge branch 'master' into adequaterecordAaron Patterson2014-02-173-12/+10
|\| |
| * | Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"Rafael Mendonça França2014-02-171-2/+0
| * | No need to use symbolsRafael Mendonça França2014-02-161-3/+3
| * | Resolve encoding issues with arrays of hstore (bug 11135).Josh Goodall2014-02-172-7/+7
* | | Merge branch 'master' into adequaterecordAaron Patterson2014-02-1749-244/+626
|\| |
| * | add factory methods for empty alias trackersAaron Patterson2014-02-143-23/+38
| * | guarantee a list in the alias tracker so we can remove a conditionalAaron Patterson2014-02-143-6/+12
| * | stop exposing table_joinsAaron Patterson2014-02-141-4/+3
| * | make most parameters to the AliasTracker requiredAaron Patterson2014-02-142-6/+4
| * | make a singleton for AssociationScopeAaron Patterson2014-02-142-1/+7
| * | pass the association and connection to the scope methodAaron Patterson2014-02-142-9/+3
| * | pass the tracker down the stack and construct it in the scope methodAaron Patterson2014-02-141-18/+18
| * | clean up add_constraints signatureAaron Patterson2014-02-141-8/+9
| * | remove the reflection delegateAaron Patterson2014-02-141-15/+14
| * | remove klass delegatorAaron Patterson2014-02-141-10/+11
| * | remove chain delegateAaron Patterson2014-02-141-5/+6
| * | remove scope_chain delegateAaron Patterson2014-02-141-3/+3
| * | Merge pull request #14048 from pcreux/better-error-message-db-migrate-downCarlos Antonio da Silva2014-02-141-1/+1
| |\ \
| | * | Add hint to error message of task db:migrate:downPhilippe Creux2014-02-131-1/+1
| * | | remove more delegate methodsAaron Patterson2014-02-131-7/+9
| * | | :scissors: whitespaceAaron Patterson2014-02-131-1/+0
| * | | rm delegate methods that are not actually usedAaron Patterson2014-02-131-2/+2
| * | | JoinHelper is never reused, so there is no need to separateAaron Patterson2014-02-133-42/+25
| * | | speed up the collection proxy reader method, but slow down the constructorAaron Patterson2014-02-131-1/+5
| * | | Merge pull request #14034 from hdabrows/drop-correct-index-when-reverting-mig...Yves Senn2014-02-131-1/+6
| |\ \ \
| | * | | Drop the correct index after reverting a migrationHubert Dąbrowski2014-02-131-1/+6
| * | | | Dont use Enumarator on join_associationArthur Neves2014-02-131-2/+4
| * | | | `execute` is a hotspot, so let's reduce branchesAaron Patterson2014-02-121-6/+2
| |/ / /
| * | | adding missed changekayvan2014-02-111-1/+1
| * | | adding connection parameter to check_pending for migrationskayvan2014-02-111-5/+5
| * | | Avoid using deprecated arel constantsRafael Mendonça França2014-02-102-3/+3
| * | | move alias method `sanitize_conditions` to a correct placeDmitry Polushkin2014-02-091-2/+1
| * | | Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafeAaron Patterson2014-02-083-2/+13
| |\ \ \
| | * | | Reaper has access to threadsafe active? callKevin Casey2014-02-083-2/+13
| * | | | context in validation goes through has many relationshipKevin Casey2014-02-081-1/+1
| |/ / /
| * | | Merge branch 'dump-schema-after-migration-flag' of git://github.com/emilsoman...Xavier Noria2014-02-062-1/+10
| |\ \ \
| | * | | Add config to disable schema dump after migrationEmil Soman2014-02-062-1/+10
| * | | | Return sized enumerator from Batches#find_eachMarc-Andre Lafortune2014-02-052-2/+4
| * | | | Return sized enumerator from Batches#find_in_batchesMarc-Andre Lafortune2014-02-051-4/+9
| * | | | docs, AR already auto-detects primary keys. Closes #13946. [ci skip]Yves Senn2014-02-051-3/+3
| * | | | Document that enum conditions must use the ordinal valueRafael Mendonça França2014-02-041-0/+2
| |/ / /
| * | | Merge pull request #13935 from arthurnn/fix_12566Rafael Mendonça França2014-02-041-1/+1
| |\ \ \
| | * | | Make sure transaction state resets after commitArthur Neves2014-02-031-1/+1
| * | | | Merge pull request #13899 from Fortisque/kevin/active_record_HABTM_with_belon...Rafael Mendonça França2014-02-041-1/+1
| |\ \ \ \ | | |/ / / | |/| | |