aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* 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-132-0/+39
| |
* | Don't use mass-assignment protection when setting foreign keys or ↵Jon Leighton2011-05-123-9/+45
| | | | | | | | association conditions on singular associations. Fixes #481 (again).
* | updated AR#create! to accept an options hash so the mass-assignment security ↵Josh Kalderimis2011-05-124-18/+44
| | | | | | | | role can be passed in, also updated the Changelog to mention the change to some of the AR method signatures.
* | Merge pull request #491 from arunagw/readme_changesSantiago Pastorino2011-05-111-1/+1
|\ \ | | | | | | Some readme fixes as required.
| * | Some readme fixes as required. Arun Agrawal2011-05-101-1/+1
| | |
* | | Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculationsJon Leighton2011-05-113-6/+18
|\ \ \ | | | | | | | | Bug fixes for calculations with includes
| * | | Bug fixes:Fadzril Muhamad & Joseph Palermo2011-05-123-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | Add missing requiresSantiago Pastorino2011-05-111-0/+1
| | | |
* | | | Fix assigning protected attributes by attributes=knapo2011-05-112-6/+10
| | | |
* | | | Don't remove the target if it has already been destroyedAndrew White2011-05-112-1/+10
| | | |
* | | | Modified NamedScopeTest to use CollectionAssociation.Michael Ebens2011-05-111-1/+1
| | | |
* | | | Modified CollectionAssociation to refer to the new class name.Michael Ebens2011-05-111-1/+1
|/ / /
* | | Don't use select() values from the join model of a through association. ↵Jon Leighton2011-05-115-3/+23
| | | | | | | | | | | | Fixes #508.
* | | Bring back obj.association_loaded? as a deprecated method. Fixes #472.Jon Leighton2011-05-112-0/+22
| | |
* | | fix bug in usage example of #unscopedCorin Langosch2011-05-111-1/+1
| | |
* | | Add test to specify that attributes from an association's conditions should ↵Jon Leighton2011-05-104-4/+28
| | | | | | | | | | | | be assigned without mass-assignment protection when a record is built on the association.
* | | Remove unnecessary '|| {}'Jon Leighton2011-05-101-1/+1
| | |
* | | Don't use mass-assignment protection when applying the ↵Jon Leighton2011-05-103-3/+16
| | | | | | | | | | | | scoped.scope_for_create. Fixes #481.
* | | minor cleaning with new api methodVishnu Atrai2011-05-111-11/+11
| | |
* | | deprecating CSV fixture supportAaron Patterson2011-05-104-55/+7
| | |
* | | deprecating read_csv_fixture_files methodAaron Patterson2011-05-101-0/+2
| | |
* | | Merge pull request #495 from vatrai/minor_fixesPiotr Sarnacki2011-05-102-2/+2
|\ \ \ | | | | | | | | minor cleaning
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 21:30:37 +0000