Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | TableAlias leg ordering has changed, so change accordingly | Aaron Patterson | 2011-03-30 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into zomg | Aaron Patterson | 2011-03-29 | 12 | -25/+105 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (51 commits) order is not guaranteed by this select, so add an order and call first! oracle stores this with microseconds, so convert to seconds before comparing make sure that active connections are not cleared during test when an exception happens clearing active connections in the ConnectionManagement middleware if an exception happens proxy body responses so we close database connections after body is flushed Pass the proper method_name instead of hardcoding to action_name. Quote find_in_batches ORDER BY clause [#6620 state:resolved] Delegate first!, last!, any? and many? to scoped Dont call authenticate_or_request_with_http_basic twice Remove 'warning: ambiguous first argument' when running ActionPack tests Change exists? so that it doesn't instantiate records [#6127 state:resolved] Move mapper_test to the appropriate location Update the wildcard route to be non-greedy by default, therefore be able to match the (.:format) segment [#6605 state:resolved] Fix examples Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH] make sure we have an active database connection before running each connection management test adding active_connections? to the connection pool for finding open connections adding active_connection? to the connection pool testing app delegation from the ConnectionManagement middleware namespacing connection management tests. :heart: ... | ||||
| * | make sure that active connections are not cleared during test when an ↵ | Aaron Patterson | 2011-03-29 | 1 | -2/+4 |
| | | | | | | | | exception happens | ||||
| * | clearing active connections in the ConnectionManagement middleware if an ↵ | Aaron Patterson | 2011-03-29 | 1 | -0/+3 |
| | | | | | | | | exception happens | ||||
| * | proxy body responses so we close database connections after body is flushed | Aaron Patterson | 2011-03-29 | 1 | -7/+24 |
| | | |||||
| * | Quote find_in_batches ORDER BY clause [#6620 state:resolved] | Andrew White | 2011-03-29 | 3 | -3/+14 |
| | | |||||
| * | Delegate first!, last!, any? and many? to scoped | Andrew White | 2011-03-29 | 1 | -1/+2 |
| | | |||||
| * | Change exists? so that it doesn't instantiate records [#6127 state:resolved] | Andrew White | 2011-03-29 | 1 | -4/+10 |
| | | |||||
| * | make sure we have an active database connection before running each ↵ | Aaron Patterson | 2011-03-28 | 1 | -1/+5 |
| | | | | | | | | connection management test | ||||
| * | adding active_connections? to the connection pool for finding open connections | Aaron Patterson | 2011-03-28 | 1 | -0/+6 |
| | | |||||
| * | adding active_connection? to the connection pool | Aaron Patterson | 2011-03-28 | 1 | -0/+6 |
| | | |||||
| * | sql logger ignores schema statements | Aaron Patterson | 2011-03-28 | 2 | -2/+5 |
| | | |||||
| * | Bring #reorder back | Sebastian Martinez | 2011-03-28 | 2 | -1/+5 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Added new #update_column method. | Sebastian Martinez | 2011-03-27 | 2 | -0/+15 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Revert "Removed #update_attribute method. New #update_column method." | Sebastian Martinez | 2011-03-27 | 2 | -10/+11 |
| | | | | | | | | | | | | This reverts commit 45c233ef819dc7b67e259dd73f24721fec28b8c8. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Removed #update_attribute method. New #update_column method. | Sebastian Martinez | 2011-03-26 | 2 | -11/+10 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | removes unnecessary selfs, and mentions that first! and last! take no ↵ | Xavier Noria | 2011-03-26 | 1 | -4/+6 |
| | | | | | | | | arguments in their API docs | ||||
| * | 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 |
| | | |||||
* | | Use Arel to build subquery. Adapt tests to changed fixtures. | John Mileham | 2011-03-24 | 1 | -13/+12 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails into count_behavior | John Mileham | 2011-03-24 | 41 | -503/+692 |
|\| | |||||
| * | add #first! and #last! to models & relations | Josh Susser | 2011-03-24 | 1 | -0/+10 |
| | | |||||
| * | Fix before_type_cast for timezone aware attributes by caching converted ↵ | Adam Meehan | 2011-03-23 | 1 | -4/+5 |
| | | | | | | | | 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. | ||||
| * | 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 | 2 | -2/+7 |
| | | | |||||
| * | | Do not in place modify what table_name returns | Santiago Pastorino | 2011-03-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into fuuu | Aaron Patterson | 2011-03-22 | 8 | -17/+57 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | [#6559 state:resolved] | ||||
| | * | | schemas set by set_table_name are respected by the mysql adapter. [#5322 ↵ | Aaron Patterson | 2011-03-21 | 1 | -2/+16 |
| | | | | | | | | | | | | | | | | state:resolved] | ||||
| | * | | Reapply extensions when using except and only | Iain Hecker | 2011-03-21 | 1 | -0/+6 |
| | |/ | |||||
| * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-16 | 5 | -10/+20 |
| |\| | |||||
| | * | 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 |
| | | | | |||||
| | * | | Fixed a bug when empty? was called on a grouped Relation that wasn't loaded | Chris Oliver | 2011-03-12 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | [#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> | ||||
| | * | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 1 | -1/+12 |
| | | | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | ||||
| * | | Fix tests under postgres - we should always put conditions in the WHERE part ↵ | Jon Leighton | 2011-03-12 | 3 | -18/+22 |
| | | | | | | | | | | | | 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 | 1 | -22/+2 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | Rename Reflection#through_reflection_chain and #through_options to ↵ | Jon Leighton | 2011-03-10 | 4 | -45/+48 |
| | | | | | | | | | | | | 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. |