Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #493 from guilleiguaran/changelog-fixes | Aaron Patterson | 2011-05-10 | 1 | -0/+80 |
|\ | | | | | Merging 3.0.x CHANGELOGs | ||||
| * | Merging 3.0.x CHANGELOGs | Guillermo Iguaran | 2011-05-10 | 1 | -0/+80 |
| | | |||||
* | | 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 | 2 | -0/+8 |
| | | |||||
* | | Fix typos in IM documentation | Vijay Dev | 2011-05-10 | 1 | -2/+2 |
| | | |||||
* | | Document identity map inconsistency with associations, closes #474. | José Valim | 2011-05-10 | 1 | -1/+28 |
| | | |||||
* | | Fix #480. Passing nil to create association works. | José Valim | 2011-05-10 | 1 | -1/+1 |
| | | |||||
* | | Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f". | José Valim | 2011-05-10 | 1 | -26/+27 |
| | | | | | | | | | | Wrapping each Record.associations.build in a transaction is going to make several unneeded queries. Reverting this commit also fixes #479. | ||||
* | | 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 | 3 | -0/+10 |
|/ | |||||
* | use a null byte as a bind parameter substitute as it is not allowed in ↵ | Aaron Patterson | 2011-05-09 | 3 | -12/+59 |
| | | | | normal SQL. fixes #411, #417 | ||||
* | removed an unneed AS::Concern from AR::IdentityMap | Josh Kalderimis | 2011-05-09 | 1 | -2/+1 |
| | |||||
* | Interleave db_list and file_list. | Christopher Wade | 2011-05-09 | 1 | -6/+6 |
| | |||||
* | Sort migrations by the migration ID. | Christopher Wade | 2011-05-09 | 1 | -2/+2 |
| | |||||
* | Merge pull request #451 from baroquebobcat/fixing_last_for_issue_371 | Jon Leighton | 2011-05-08 | 2 | -1/+27 |
|\ | |||||
| * | Fix for #371 | Nick Howard | 2011-05-08 | 2 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -1/+5 |
| | | | | | | | | calculation queries. Fixes #406. | ||||
* | | Don't quote ID's as Arel will quote them -- follow same conventions as the ↵ | Christopher Meiklejohn | 2011-05-08 | 5 | -2/+52 |
| | | | | | | | | delete method. | ||||
* | | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵ | Josh Kalderimis | 2011-05-08 | 3 | -34/+34 |
|/ | | | | security guide | ||||
* | Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s)) | Jason Noble | 2011-05-07 | 1 | -0/+3 |
| | |||||
* | Namespace Fixtures in ActiveRecord | Jason Noble | 2011-05-07 | 8 | -318/+320 |
| | | | [Fixes #439] | ||||
* | Class.new.name returns an empty string on 1.8 | José Valim | 2011-05-07 | 1 | -1/+1 |
| | |||||
* | Revert "Revert the merge because tests did not pass." | José Valim | 2011-05-07 | 3 | -5/+44 |
| | | | | This reverts commit 886818d2bab40585c0cea763002ffc16917dd0b3. | ||||
* | fix yield not working from around filter of observers, fixes Github#329 | Hemant Kumar | 2011-05-07 | 2 | -2/+27 |
| | |||||
* | Merge pull request #396 from asanghi/lh_4346 | Xavier Noria | 2011-05-06 | 2 | -29/+187 |
|\ | | | | | 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 | 2 | -29/+187 |
| | | |||||
* | | Update CHANGELOGs. | José Valim | 2011-05-06 | 1 | -19/+16 |
| | | |||||
* | | Merge pull request #399 from ernie/join_conditions_on_join | Jon Leighton | 2011-05-05 | 2 | -3/+14 |
|\ \ | | | | | | | 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 | 2 | -3/+9 |
| |/ | |||||
* | | Merge pull request #358 from baroquebobcat/fix_find_or_create_master | Aaron Patterson | 2011-05-05 | 2 | -3/+30 |
|\ \ | |/ |/| | Fix for lighthouse #6741 | ||||
| * | Fix for lighthouse #6741 | Nick Howard | 2011-05-01 | 2 | -3/+30 |
| | | | | | | | | | | | | | | - adds tests for find_or_create_by and find_or_initialize_by on has_many associations - changes the behavior of ActiveRecord::Associations::CollectionProxy#method_missing to differ to ActiveRecord::FinderMethods#find_or_instantiator_by_attributes for arg processing and saving so find_or_create_by's api on associations will be consistent w/ the api for model classes. | ||||
* | | Prepare for beta1 | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+1 |
| | | |||||
* | | ensure query cache is cleared when Rack body is closed, fixes bug reported ↵ | Aaron Patterson | 2011-05-04 | 2 | -0/+12 |
| | | | | | | | | on 951e18abea9c116fc5d6b330ca1dcd2890abe006 | ||||
* | | Bump up rack-cache, tzinfo and thor | Santiago Pastorino | 2011-05-04 | 1 | -1/+1 |
| | | |||||
* | | Move sandbox to AR and pass the sandbox as a value. This way, other ORMs ↵ | José Valim | 2011-05-04 | 2 | -1/+8 |
| | | | | | | | | like Datamapper can also have their own sandboxing in rails console. | ||||
* | | Remove defined?(ActiveRecord) and use the railtie hook instead. | José Valim | 2011-05-04 | 1 | -3/+4 |
| | | |||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-04 | 5 | -33/+41 |
|\ \ | |||||
| * | | Remove extra whitespaces | Sebastian Martinez | 2011-05-03 | 1 | -9/+9 |
| | | | |||||
| * | | Improves Mysql2 adapter docs | Sebastian Martinez | 2011-05-03 | 1 | -0/+6 |
| | | | |||||
| * | | Added #recreate_database docs | Sebastian Martinez | 2011-05-03 | 1 | -0/+2 |
| | | | |||||
| * | | Fixes on schema_definitions docs | Sebastian Martinez | 2011-05-03 | 1 | -3/+3 |
| | | | |||||
| * | | fixed-fonts on SchemaDefinitions | Sebastian Martinez | 2011-05-02 | 1 | -3/+3 |
| | | | |||||
| * | | Remove extra whitespaces | Sebastian Martinez | 2011-05-02 | 1 | -18/+18 |
| | | | |||||
* | | | added the mysql schema test to mysql2 adapter, and fixed the corresponding ↵ | Josh Kalderimis | 2011-05-03 | 3 | -3/+54 |
| | | | | | | | | | | | | failures | ||||
* | | | make sure IM repository is cleared after body is closed | Aaron Patterson | 2011-05-03 | 2 | -0/+12 |
| | | | |||||
* | | | proxying the body in the IM middleware so that IM is available for streaming ERb | Aaron Patterson | 2011-05-03 | 2 | -3/+47 |
| | | | |||||
* | | | adding a test case for the identity map middleware | Aaron Patterson | 2011-05-03 | 1 | -0/+34 |
| | | | |||||
* | | | favor collect over each in mysql* adapters | Josh Kalderimis | 2011-05-03 | 2 | -8/+4 |
| | | |