aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Everyone receives app as argument for consistency.José Valim2011-05-251-2/+2
|
* Fix infinite recursion where a lazy default scope references a scope. Fixes ↵Jon Leighton2011-05-252-4/+13
| | | | #1264.
* Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scopeJon Leighton2011-05-241-1/+1
|\ | | | | Ignore :includes on through associations
| * Ignore :includes on through associationsAndrew White2011-05-241-1/+1
| |
* | Ensure that the surrounding code in Relation#to_a respects the default_scope ↵Jon Leighton2011-05-241-17/+24
| | | | | | | | (as well as having Relation#arel respect the default scope). Fixes #1233.
* | rescue record invalid exceptions and return false from the save method. ↵Aaron Patterson2011-05-241-1/+5
| | | | | | | | fixes #796
* | properly reference yml alias nodesdmathieu2011-05-242-3/+3
|/ | | | as per the last version of the yml specifications : http://www.yaml.org/spec/1.2/spec.html#* alias//
* Remove extra white-space on some exception messages.Sebastian Martinez2011-05-236-7/+7
|
* fixing 1.8 support for new fixture testsAaron Patterson2011-05-231-1/+4
|
* removing CSV fixture supportAaron Patterson2011-05-231-52/+10
|
* fixture file will validate fixture formatAaron Patterson2011-05-231-1/+8
|
* return an empty array for empty yaml filesAaron Patterson2011-05-231-1/+3
|
* use top level file constant for join, etcAaron Patterson2011-05-231-4/+4
|
* adding AR::Fixtures::File class to wrap a fixture fileAaron Patterson2011-05-232-0/+44
|
* Removed AS core_ext/kernel/requires as it's not used and is bad practice.Josh Kalderimis2011-05-233-3/+0
|
* Merge pull request #1228 from fcheung/db_time_fix2José Valim2011-05-231-1/+3
|\ | | | | Take into account time spent in AR even if a redirect occurs or if it is after the render
| * Take into account time spent in AR even if a redirect occurs or if it is ↵Frederick Cheung2011-05-231-1/+3
| | | | | | | | after the render
* | Merge pull request #1184 from gnufied/masterAaron Patterson2011-05-231-0/+1
|\ \ | | | | | | Fixes connection_not established error while running db:schema:dump
| * | fix connection not established error while running rake taskBhavin Kamani2011-05-211-0/+1
| | | | | | | | | | | | db:schema:dump
* | | Revert "Take into account time spent in AR even if a redirect occurs or if ↵David Heinemeier Hansson2011-05-221-5/+3
| | | | | | | | | | | | | | | | | | it is after the render" because it's causing test failures about missing db_during_render. This reverts commit 60b55baca9e381deb3a0a85580f089f4caf551d4.
* | | Fix problem with loading polymorphic associations which have been defined in ↵Jon Leighton2011-05-223-13/+26
| | | | | | | | | | | | an abstract superclass. Fixes #552.
* | | Take into account time spent in AR even if a redirect occurs or if it is ↵Frederick Cheung2011-05-221-3/+5
| |/ |/| | | | | after the render
* | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1
| |
* | Merge pull request #1180 from Karunakar/documentation_changeXavier Noria2011-05-212-4/+14
|\ \ | | | | | | Documentation Error Fixed for ticket #839
| * | ActionMailer deliver method Documentation corrected Ticket #761Ganesh Kumar2011-05-211-1/+1
| | |
| * | Documentation Error Fixed for ticket #839Karunakar (Ruby)2011-05-211-3/+13
| |/
* | Merge pull request #1187 from thedarkone/polymorphic-class-fixSantiago Pastorino2011-05-211-1/+1
|\ \ | | | | | | Handle polymorphic_type NOT NULL columns
| * | Handle polymorphic_type NOT NULL-able columns as well.thedarkone2011-05-211-1/+1
| | |
* | | Add support for passing mass assignment roles to dynamic finders. Closes #1170.Andrew White2011-05-211-2/+2
|/ /
* | Merge pull request #1162 from guilleiguaran/singularize_individual_table_nameJon Leighton2011-05-213-5/+5
|\ \ | |/ |/| Singularize individual table name
| * AliasTracker.pluralize use pluralize_table_names of modelGuillermo Iguaran2011-05-202-3/+3
| |
| * Allow pluralize_table_names for individual modelGuillermo Iguaran2011-05-201-2/+2
| |
* | Merge pull request #1157 from smartinez87/extra_whitespacesXavier Noria2011-05-201-3/+3
|\ \ | | | | | | Remove extra white spaces.
| * | Remove extra white spaces.Sebastian Martinez2011-05-191-3/+3
| |/
* / Syntax cleanup: for in => eachGuillermo Iguaran2011-05-193-3/+3
|/
* Implement proxy_owner, proxy_target and proxy_reflection methods on ↵Jon Leighton2011-05-192-5/+30
| | | | CollectionProxy with deprecations. Fixes #1148.
* Merge pull request #1097 from kirillrdy/masterMichael Koziarski2011-05-191-1/+1
|\ | | | | Improved "treat 0000-00-00 00:00:00 as nil Date"
| * Year 0 should fall to nil only if month and day are also 0Kirill Radzikhovskyy2011-05-171-1/+1
| |
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-182-17/+17
|\ \
| * | Better doc styling in ActiveRecord::LockingSebastian Martinez2011-05-172-17/+17
| | |
* | | on.upcase!Akira Matsuda2011-05-191-1/+1
| | |
* | | why not use JOIN statement for joining tables? (vol. 2)Akira Matsuda2011-05-181-21/+12
| | |
* | | remove unused table from FROM clauseAkira Matsuda2011-05-181-2/+0
| | | | | | | | | | | | pg_namespace has not been used since this commit 29b0707f07f148d98515125dab44b73cfdc0a3d4
* | | why not use JOIN statement for joining tables?Akira Matsuda2011-05-181-3/+3
| | |
* | | Add missing requireSantiago Pastorino2011-05-171-0/+1
| | |
* | | Don't pass a block as we are yieldingAndrew White2011-05-171-1/+1
| | |
* | | Add block setting of attributes to singular associationsAndrew White2011-05-172-11/+12
| | |
* | | Pass the attribute and option hashes to build_associationAndrew White2011-05-172-8/+12
| |/ |/| | | | | | | | | | | The build_association method was added as an API for plugins to hook into in 1398db0. This commit restores this API and the ability to override class.new to return a subclass based on a virtual attribute in the attributes hash.
* | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_falseJon Leighton2011-05-161-1/+1
|\ \ | | | | | | Fixing has_many when ActiveRecord::Base.pluralize_table_names is false
| * | Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ↵Guillermo Iguaran2011-05-151-1/+1
| | | | | | | | | | | | false. fixes #557