Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | No arguments for first! and last! | Pratik Naik | 2011-03-25 | 1 | -4/+4 | |
| | | ||||||
| * | comment typo fix | Josh Susser | 2011-03-25 | 1 | -2/+2 | |
| | | ||||||
| * | fixing whitespace errors. :bomb: | Aaron Patterson | 2011-03-25 | 1 | -2/+2 | |
| | | ||||||
* | | Use Arel to build subquery. Adapt tests to changed fixtures. | John Mileham | 2011-03-24 | 2 | -16/+15 | |
| | | ||||||
* | | Merge branch 'master' of github.com:rails/rails into count_behavior | John Mileham | 2011-03-24 | 97 | -612/+1890 | |
|\| | ||||||
| * | add #first! and #last! to models & relations | Josh Susser | 2011-03-24 | 2 | -0/+34 | |
| | | ||||||
| * | Fix before_type_cast for timezone aware attributes by caching converted ↵ | Adam Meehan | 2011-03-23 | 2 | -19/+16 | |
| | | | | | | | | value on write. Also remove read method reload arg on timezone attributes. | |||||
| * | Make clearing of HABTM join table contents happen in an after_destory callback. | Murray Steele | 2011-03-23 | 1 | -12/+12 | |
| | | | | | | | | The old method of redefining destroy meant that clearing the HABTM join table would happen as long as the call to destroy succeeded. Which meant if there was a before_destroy that stopped the instance being destroyed using normal means (returning false, raising ActiveRecord::Rollback) rather than exceptional means the join table would be cleared even though the instance wasn't destroyed. Doing it in an after_destroy hook avoids this and has the advantage of happening inside the DB transaction too. | |||||
| * | Failing test case to show that habtm join table contents are removed when a ↵ | Murray Steele | 2011-03-23 | 1 | -0/+34 | |
| | | | | | | | | model is destroyed but the destruction is blocked by a before_destroy. | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-23 | 2 | -4/+2 | |
| |\ | ||||||
| | * | remove bank line | Paco Guzman | 2011-03-18 | 1 | -1/+0 | |
| | | | ||||||
| | * | Remove incorrect comment that a default value of NULL cannot be set with ↵ | Manuel Meurer | 2011-03-16 | 1 | -3/+2 | |
| | | | | | | | | | | | | change_column_default. | |||||
| * | | use class_eval with a string when it's possible | Santiago Pastorino | 2011-03-22 | 2 | -5/+13 | |
| | | | ||||||
| * | | Allow to read and write AR attributes with non valid identifiers | Santiago Pastorino | 2011-03-22 | 4 | -2/+22 | |
| | | | ||||||
| * | | Do not in place modify what table_name returns | Santiago Pastorino | 2011-03-22 | 1 | -1/+1 | |
| | | | ||||||
| * | | adding missing require | Aaron Patterson | 2011-03-22 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into fuuu | Aaron Patterson | 2011-03-22 | 11 | -17/+120 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Do not show optional (.:format) block for wildcard route [#6605 state:resolved] pushing id insertion and prefetch primary keys down to Relation#insert use prepared statements to fetch the last insert id escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved] schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved] Reapply extensions when using except and only SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test Improved resolver docs a bit [action_view] docs for FileSystemResolver [action_view] added custom patterns to template resolver | |||||
| | * | | pushing id insertion and prefetch primary keys down to Relation#insert | Aaron Patterson | 2011-03-22 | 4 | -12/+23 | |
| | | | | ||||||
| | * | | use prepared statements to fetch the last insert id | Aaron Patterson | 2011-03-21 | 1 | -3/+4 | |
| | | | | ||||||
| | * | | escaping binary data encoding when inserting to sqlite3. Thanks Naruse! ↵ | Aaron Patterson | 2011-03-21 | 2 | -0/+27 | |
| | | | | | | | | | | | | | | | | [#6559 state:resolved] | |||||
| | * | | schemas set by set_table_name are respected by the mysql adapter. [#5322 ↵ | Aaron Patterson | 2011-03-21 | 2 | -2/+52 | |
| | | | | | | | | | | | | | | | | state:resolved] | |||||
| | * | | Reapply extensions when using except and only | Iain Hecker | 2011-03-21 | 2 | -0/+14 | |
| | |/ | ||||||
| * | | Add order clauses to fix some tests which were failing under 1.8 on oracle ↵ | Jon Leighton | 2011-03-18 | 2 | -14/+14 | |
| | | | | | | | | | | | | and postgres | |||||
| * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-16 | 6 | -10/+46 | |
| |\| | ||||||
| | * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-14 | 3 | -8/+15 | |
| | |\ | ||||||
| | | * | Adjust unique constraint comment to include info about the RecordNotUnique ↵ | Anders Elfving | 2011-03-13 | 1 | -4/+11 | |
| | | | | | | | | | | | | | | | | exception | |||||
| | | * | remove some blanks | Paco Guzman | 2011-03-11 | 2 | -4/+4 | |
| | | | | ||||||
| | * | | Remove invalid test | Andrew White | 2011-03-13 | 1 | -5/+1 | |
| | | | | | | | | | | | | | | | | | | | | The test fails on PostgreSQL when trying to load the records as the comments_count field is not included in the GROUP BY clause. | |||||
| | * | | Fixed a bug when empty? was called on a grouped Relation that wasn't loaded | Chris Oliver | 2011-03-12 | 2 | -1/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [#5829 state:resolved] Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | |||||
| | * | | Add additional text to NotImplementedErrors [#6328 state:resolved] | Mike Gehard | 2011-03-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | | oracle, y u defy me | Jon Leighton | 2011-03-16 | 5 | -13/+15 | |
| | | | | ||||||
| * | | | Fix tests under postgres - we should always put conditions in the WHERE part ↵ | Jon Leighton | 2011-03-12 | 4 | -19/+23 | |
| | | | | | | | | | | | | | | | | not in ON constraints because postgres requires that the table has been joined before the condition references it. | |||||
| * | | | Resolve some TODO comments which I decided did not need anything done | Jon Leighton | 2011-03-12 | 3 | -9/+5 | |
| | | | | ||||||
| * | | | Simplify implementation of ThroughReflection#chain | Jon Leighton | 2011-03-11 | 2 | -23/+3 | |
| | | | | ||||||
| * | | | Abstract some common code from AssociationScope and ↵ | Jon Leighton | 2011-03-11 | 4 | -97/+83 | |
| | | | | | | | | | | | | | | | | JoinDependency::JoinAssociation into a JoinHelper module | |||||
| * | | | Refactor JoinAssociation | Jon Leighton | 2011-03-10 | 1 | -100/+54 | |
| | | | | ||||||
| * | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-10 | 2 | -2/+2 | |
| |\| | | ||||||
| | * | | revises links to the API websites of individual components (no longer ↵ | Xavier Noria | 2011-03-09 | 1 | -1/+1 | |
| | |/ | | | | | | | | | | maintained), and rewrites the section about after and around filters in the controller guide | |||||
| | * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-07 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | |||||
| | * | | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 2 | -1/+27 | |
| | |/ | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | |||||
| * | | Rename Reflection#through_reflection_chain and #through_options to ↵ | Jon Leighton | 2011-03-10 | 5 | -50/+53 | |
| | | | | | | | | | | | | Reflection#chain and Reflection#options as they now no longer relate solely to through associations. | |||||
| * | | Move the code which builds a scope for through associations into a generic ↵ | Jon Leighton | 2011-03-10 | 9 | -215/+162 | |
| | | | | | | | | | | | | AssociationScope class which is capable of building a scope for any association. | |||||
| * | | Fix ↵ | Jon Leighton | 2011-03-07 | 2 | -2/+2 | |
| | | | | | | | | | | | | test_has_many_association_through_a_has_many_association_with_nonstandard_primary_keys | |||||
| * | | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 2 | -1/+27 | |
| | | | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | |||||
| * | | Refactor ThroughAssociation#join_to to be much smaller, and independent of ↵ | Jon Leighton | 2011-03-06 | 2 | -84/+34 | |
| | | | | | | | | | | | | construct_owner_conditions. | |||||
| * | | Refactor ThroughAssociation#tables to just be a flat array of tables in the ↵ | Jon Leighton | 2011-03-06 | 1 | -75/+70 | |
| | | | | | | | | | | | | order that they should be joined together. | |||||
| * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-05 | 11 | -15/+33 | |
| |\| | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG | |||||
| | * | use Arel::Table#alias rather than passing the :as parameter | Aaron Patterson | 2011-03-05 | 2 | -4/+4 | |
| | | | ||||||
| | * | Active Record typos. | R.T. Lechow | 2011-03-05 | 6 | -10/+10 | |
| | | |