aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/
* | 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-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
* | | Add doc to #attribute_namesSebastian Martinez2011-05-151-0/+3
| | |
* | | Add ActiveRecord::attribute_names to retrieve a list of attribute names. ↵Prem Sichanugrist2011-05-151-0/+8
| |/ |/| | | | | 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-141-5/+2
| | | | | | | | 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
|/
* Added some docs to controller runtime.José Valim2011-05-141-1/+4
|
* Reset ActiveRecord::LogSubscriber runtime at the start of each requestTom Ward2011-05-141-0/+5
| | | | Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called. Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect. Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously.
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-141-1/+1
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
| * :touch => :symbol also updates the updated_at attributeBruno Michel2011-05-101-1/+1
| |
* | Instead of doing find(:all) which does scoped.find(:all) which does ↵Jon Leighton2011-05-131-1/+1
| | | | | | | | scoped.all, just do scoped.all.
* | Remove pointless rescue (it doesn't happen anywhere in the tests, and I ↵Jon Leighton2011-05-131-9/+1
| | | | | | | | can't see a way that it would happen ever)
* | backport skip to the AR base classAaron Patterson2011-05-131-0/+7
| |
* | supporting infinity and -infinity for timestamps in PG. fixes #544Aaron Patterson2011-05-131-0/+13
| |
* | Don't use mass-assignment protection when setting foreign keys or ↵Jon Leighton2011-05-121-9/+9
| | | | | | | | association conditions on singular associations. Fixes #481 (again).
* | updated AR#create! to accept an options hash so the mass-assignment security ↵Josh Kalderimis2011-05-122-5/+5
| | | | | | | | role can be passed in, also updated the Changelog to mention the change to some of the AR method signatures.
* | Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculationsJon Leighton2011-05-111-5/+4
|\ \ | | | | | | Bug fixes for calculations with includes
| * | Bug fixes:Fadzril Muhamad & Joseph Palermo2011-05-121-5/+4
| | | | | | | | | | | | | | | | | | - If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not. - When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count. Looks like it was broken here: https://github.com/rails/rails/commit/b9599502c9e738a5a1513e75d08f8d40ed408265
* | | Fix assigning protected attributes by attributes=knapo2011-05-111-4/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 00:13:48 +0000