aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* 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-225-15/+35
| | | | | | | | | | | | 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
* | Adding pluralize_table_names change to CHANGELOGGuillermo Iguaran2011-05-211-0/+8
| |
* | 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-212-1/+12
|\ \ | | | | | | Handle polymorphic_type NOT NULL columns
| * | Handle polymorphic_type NOT NULL-able columns as well.thedarkone2011-05-212-1/+12
| | |
* | | Add support for passing mass assignment roles to dynamic finders. Closes #1170.Andrew White2011-05-212-2/+50
|/ /
* | Merge pull request #1165 from arunagw/rubyforge_removeJosé Valim2011-05-211-1/+0
|\ \ | | | | | | Not updating rubyforge for new versions.
| * | Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵Arun Agrawal2011-05-201-1/+0
| | | | | | | | | | | | not useful.
* | | Merge pull request #1162 from guilleiguaran/singularize_individual_table_nameJon Leighton2011-05-216-9/+16
|\ \ \ | |_|/ |/| | Singularize individual table name
| * | AliasTracker.pluralize use pluralize_table_names of modelGuillermo Iguaran2011-05-202-3/+3
| | |
| * | Refactoring test_has_many_with_pluralize_table_names_false testGuillermo Iguaran2011-05-202-4/+2
| | |
| * | Allow pluralize_table_names for individual modelGuillermo Iguaran2011-05-202-2/+11
| | |
* | | 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
| |/
* | for => each in model migration templateGuillermo Iguaran2011-05-201-1/+1
| |
* | Syntax cleanup: for in => eachGuillermo Iguaran2011-05-193-3/+3
|/
* Implement proxy_owner, proxy_target and proxy_reflection methods on ↵Jon Leighton2011-05-193-5/+42
| | | | 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-183-18/+18
|\ \
| * | Better doc styling in ActiveRecord::LockingSebastian Martinez2011-05-172-17/+17
| | |
| * | Mailer example has more sense calling to deliver methodGuillermo Iguaran2011-05-151-1/+1
| | |
* | | 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
| | |
* | | bumping arel requirementAaron Patterson2011-05-171-1/+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-175-11/+64
| | |
* | | Pass the attribute and option hashes to build_associationAndrew White2011-05-175-8/+54
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Fixed InnerJoinAssociationTest. Need to load essays fixture.Arun Agrawal2011-05-171-1/+1
| | |
* | | Adding missing requireGuillermo Iguaran2011-05-161-0/+1
| |/ |/|
* | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_falseJon Leighton2011-05-164-1/+19
|\ \ | | | | | | 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-154-1/+19
| | | | | | | | | | | | false. fixes #557
* | | Add doc to #attribute_namesSebastian Martinez2011-05-151-0/+3
| | |
* | | Add ActiveRecord::attribute_names to retrieve a list of attribute names. ↵Prem Sichanugrist2011-05-153-0/+23
| |/ |/| | | | | This method will also return an empty array on an abstract class or a model that the table doesn't exists.
* | These extra array operations appear to be unnecessary. Reasoning:Jon Leighton2011-05-141-8/+2
| | | | | | | | | | * It is not necessary to subtract 'id' from the list of copied attributes because record and mem_record are equal, so therefore their id attributes are also equal (so there is no harm in copying it, and this reduces the complexity of the code) * It is not necessary to intersect the attribute names, since record and mem_record are equal, so they have the same id and class, so they have the same columns in the database. If record has non-column attributes then it seems reasonable to also copy them onto mem_record (though I am not sure what situation this would ever happen in)
* | CollectionAssociation#merge_target_lists should write to the underlying ↵Jon Leighton2011-05-144-5/+17
| | | | | | | | attributes when copying, rather than using the assignment method
* | An attempt to make CollectionAssociation#merge_target_lists make more sense.Jon Leighton2011-05-141-16/+35
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 03:28:48 +0000