Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1187 from thedarkone/polymorphic-class-fix | Santiago Pastorino | 2011-05-21 | 1 | -0/+11 |
|\ | | | | | Handle polymorphic_type NOT NULL columns | ||||
| * | Handle polymorphic_type NOT NULL-able columns as well. | thedarkone | 2011-05-21 | 1 | -0/+11 |
| | | |||||
* | | Add support for passing mass assignment roles to dynamic finders. Closes #1170. | Andrew White | 2011-05-21 | 1 | -0/+48 |
|/ | |||||
* | Refactoring test_has_many_with_pluralize_table_names_false test | Guillermo Iguaran | 2011-05-20 | 2 | -4/+2 |
| | |||||
* | Allow pluralize_table_names for individual model | Guillermo Iguaran | 2011-05-20 | 1 | -0/+9 |
| | |||||
* | Implement proxy_owner, proxy_target and proxy_reflection methods on ↵ | Jon Leighton | 2011-05-19 | 1 | -0/+12 |
| | | | | CollectionProxy with deprecations. Fixes #1148. | ||||
* | Add block setting of attributes to singular associations | Andrew White | 2011-05-17 | 2 | -0/+42 |
| | |||||
* | Pass the attribute and option hashes to build_association | Andrew White | 2011-05-17 | 3 | -0/+42 |
| | | | | | | | 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 Agrawal | 2011-05-17 | 1 | -1/+1 |
| | |||||
* | Adding missing require | Guillermo Iguaran | 2011-05-16 | 1 | -0/+1 |
| | |||||
* | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false | Jon Leighton | 2011-05-16 | 3 | -0/+18 |
|\ | | | | | Fixing has_many when ActiveRecord::Base.pluralize_table_names is false | ||||
| * | Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ↵ | Guillermo Iguaran | 2011-05-15 | 3 | -0/+18 |
| | | | | | | | | false. fixes #557 | ||||
* | | Add ActiveRecord::attribute_names to retrieve a list of attribute names. ↵ | Prem Sichanugrist | 2011-05-15 | 1 | -0/+13 |
| | | | | | | | | This method will also return an empty array on an abstract class or a model that the table doesn't exists. | ||||
* | | CollectionAssociation#merge_target_lists should write to the underlying ↵ | Jon Leighton | 2011-05-14 | 3 | -0/+15 |
|/ | | | | attributes when copying, rather than using the assignment method | ||||
* | supporting infinity and -infinity for timestamps in PG. fixes #544 | Aaron Patterson | 2011-05-13 | 1 | -0/+26 |
| | |||||
* | Don't use mass-assignment protection when setting foreign keys or ↵ | Jon Leighton | 2011-05-12 | 2 | -0/+36 |
| | | | | association conditions on singular associations. Fixes #481 (again). | ||||
* | updated AR#create! to accept an options hash so the mass-assignment security ↵ | Josh Kalderimis | 2011-05-12 | 1 | -0/+24 |
| | | | | 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_calculations | Jon Leighton | 2011-05-11 | 2 | -1/+14 |
|\ | | | | | Bug fixes for calculations with includes | ||||
| * | Bug fixes: | Fadzril Muhamad & Joseph Palermo | 2011-05-12 | 2 | -1/+14 |
| | | | | | | | | | | | | - 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 requires | Santiago Pastorino | 2011-05-11 | 1 | -0/+1 |
| | | |||||
* | | Fix assigning protected attributes by attributes= | knapo | 2011-05-11 | 1 | -2/+7 |
| | | |||||
* | | Don't remove the target if it has already been destroyed | Andrew White | 2011-05-11 | 1 | -0/+9 |
| | | |||||
* | | Modified NamedScopeTest to use CollectionAssociation. | Michael Ebens | 2011-05-11 | 1 | -1/+1 |
|/ | |||||
* | Don't use select() values from the join model of a through association. ↵ | Jon Leighton | 2011-05-11 | 4 | -0/+19 |
| | | | | Fixes #508. | ||||
* | Bring back obj.association_loaded? as a deprecated method. Fixes #472. | Jon Leighton | 2011-05-11 | 1 | -0/+9 |
| | |||||
* | Add test to specify that attributes from an association's conditions should ↵ | Jon Leighton | 2011-05-10 | 4 | -4/+28 |
| | | | | be assigned without mass-assignment protection when a record is built on the association. | ||||
* | Don't use mass-assignment protection when applying the ↵ | Jon Leighton | 2011-05-10 | 1 | -0/+9 |
| | | | | scoped.scope_for_create. Fixes #481. | ||||
* | minor cleaning with new api method | Vishnu Atrai | 2011-05-11 | 1 | -11/+11 |
| | |||||
* | deprecating CSV fixture support | Aaron Patterson | 2011-05-10 | 2 | -1/+3 |
| | |||||
* | Merge pull request #495 from vatrai/minor_fixes | Piotr Sarnacki | 2011-05-10 | 2 | -2/+2 |
|\ | | | | | minor cleaning | ||||
| * | minor cleaning | Vishnu Atrai | 2011-05-10 | 2 | -2/+2 |
| | | |||||
* | | Methods that return nil should not be considered YAML | Joshua Wehner | 2011-05-10 | 1 | -4/+1 |
|/ | |||||
* | Puts ActiveRecord::SessionStore attributes in white list, fixes #483 | slainer68 | 2011-05-10 | 1 | -0/+6 |
| | |||||
* | Add failing tests according to #479. | José Valim | 2011-05-10 | 1 | -0/+15 |
| | |||||
* | Add failing tests, according to #480. | José Valim | 2011-05-10 | 1 | -0/+14 |
| | |||||
* | Ensure assign_attributes and update_attributes do not fail on nil, closes #478. | José Valim | 2011-05-10 | 2 | -0/+8 |
| | |||||
* | use a null byte as a bind parameter substitute as it is not allowed in ↵ | Aaron Patterson | 2011-05-09 | 1 | -0/+50 |
| | | | | normal SQL. fixes #411, #417 | ||||
* | Merge pull request #451 from baroquebobcat/fixing_last_for_issue_371 | Jon Leighton | 2011-05-08 | 1 | -0/+21 |
|\ | |||||
| * | Fix for #371 | Nick Howard | 2011-05-08 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | if a query contains a limit or an offset, ActiveRecord::FinderMethods#find_last had inconsistent behavior. If the records were loaded, it returned the last record in the cached list. If they were not, it reversed the order of the query and changed the limit to one. If the earlier limit was less than the total matching the query in the db, it would return a different record than if the records had been cached. This commit changes find_last so that it loads the records when getting the last record on a query containing a limit or an offset, which makes the behavior consistent. | ||||
* | | Ensure that ORDER BY clauses from default scopes are not included in ↵ | Jon Leighton | 2011-05-08 | 1 | -0/+4 |
| | | | | | | | | calculation queries. Fixes #406. | ||||
* | | Don't quote ID's as Arel will quote them -- follow same conventions as the ↵ | Christopher Meiklejohn | 2011-05-08 | 4 | -1/+51 |
| | | | | | | | | delete method. | ||||
* | | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵ | Josh Kalderimis | 2011-05-08 | 1 | -27/+27 |
|/ | | | | security guide | ||||
* | Namespace Fixtures in ActiveRecord | Jason Noble | 2011-05-07 | 6 | -30/+30 |
| | | | [Fixes #439] | ||||
* | Revert "Revert the merge because tests did not pass." | José Valim | 2011-05-07 | 1 | -0/+35 |
| | | | | This reverts commit 886818d2bab40585c0cea763002ffc16917dd0b3. | ||||
* | fix yield not working from around filter of observers, fixes Github#329 | Hemant Kumar | 2011-05-07 | 1 | -0/+25 |
| | |||||
* | Merge pull request #396 from asanghi/lh_4346 | Xavier Noria | 2011-05-06 | 1 | -0/+135 |
|\ | | | | | Multiparameter POLA (principle of least authority) with respect to time_select fixes. See LH4346 | ||||
| * | Multiparameter POLA, time_select fixes. See LH4346 | Aditya Sanghi | 2011-05-05 | 1 | -0/+135 |
| | | |||||
* | | Merge pull request #399 from ernie/join_conditions_on_join | Jon Leighton | 2011-05-05 | 1 | -0/+11 |
|\ \ | | | | | | | Add association join conditions to JOIN clause, not WHERE | ||||
| * | | Add a test for outer joins with conditions where value IS NULL | Ernie Miller | 2011-05-05 | 1 | -0/+5 |
| | | | |||||
| * | | Add join conditions to JOIN clause, not WHERE | Ernie Miller | 2011-05-05 | 1 | -0/+6 |
| |/ |