aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* TableAlias leg ordering has changed, so change accordinglyAaron Patterson2011-03-301-1/+1
|
* Merge branch 'master' into zomgAaron Patterson2011-03-2912-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 Patterson2011-03-291-2/+4
| | | | | | | | exception happens
| * clearing active connections in the ConnectionManagement middleware if an ↵Aaron Patterson2011-03-291-0/+3
| | | | | | | | exception happens
| * proxy body responses so we close database connections after body is flushedAaron Patterson2011-03-291-7/+24
| |
| * Quote find_in_batches ORDER BY clause [#6620 state:resolved]Andrew White2011-03-293-3/+14
| |
| * Delegate first!, last!, any? and many? to scopedAndrew White2011-03-291-1/+2
| |
| * Change exists? so that it doesn't instantiate records [#6127 state:resolved]Andrew White2011-03-291-4/+10
| |
| * make sure we have an active database connection before running each ↵Aaron Patterson2011-03-281-1/+5
| | | | | | | | connection management test
| * adding active_connections? to the connection pool for finding open connectionsAaron Patterson2011-03-281-0/+6
| |
| * adding active_connection? to the connection poolAaron Patterson2011-03-281-0/+6
| |
| * sql logger ignores schema statementsAaron Patterson2011-03-282-2/+5
| |
| * Bring #reorder backSebastian Martinez2011-03-282-1/+5
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Added new #update_column method.Sebastian Martinez2011-03-272-0/+15
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Revert "Removed #update_attribute method. New #update_column method."Sebastian Martinez2011-03-272-10/+11
| | | | | | | | | | | | This reverts commit 45c233ef819dc7b67e259dd73f24721fec28b8c8. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Removed #update_attribute method. New #update_column method.Sebastian Martinez2011-03-262-11/+10
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * removes unnecessary selfs, and mentions that first! and last! take no ↵Xavier Noria2011-03-261-4/+6
| | | | | | | | arguments in their API docs
| * No arguments for first! and last!Pratik Naik2011-03-251-4/+4
| |
| * comment typo fixJosh Susser2011-03-251-2/+2
| |
* | Use Arel to build subquery. Adapt tests to changed fixtures.John Mileham2011-03-241-13/+12
| |
* | Merge branch 'master' of github.com:rails/rails into count_behaviorJohn Mileham2011-03-2441-503/+692
|\|
| * add #first! and #last! to models & relationsJosh Susser2011-03-241-0/+10
| |
| * Fix before_type_cast for timezone aware attributes by caching converted ↵Adam Meehan2011-03-231-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 Steele2011-03-231-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/docrailsXavier Noria2011-03-232-4/+2
| |\
| | * remove bank linePaco Guzman2011-03-181-1/+0
| | |
| | * Remove incorrect comment that a default value of NULL cannot be set with ↵Manuel Meurer2011-03-161-3/+2
| | | | | | | | | | | | change_column_default.
| * | use class_eval with a string when it's possibleSantiago Pastorino2011-03-222-5/+13
| | |
| * | Allow to read and write AR attributes with non valid identifiersSantiago Pastorino2011-03-222-2/+7
| | |
| * | Do not in place modify what table_name returnsSantiago Pastorino2011-03-221-1/+1
| | |
| * | Merge branch 'master' into fuuuAaron Patterson2011-03-228-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#insertAaron Patterson2011-03-224-12/+23
| | | |
| | * | use prepared statements to fetch the last insert idAaron Patterson2011-03-211-3/+4
| | | |
| | * | escaping binary data encoding when inserting to sqlite3. Thanks Naruse! ↵Aaron Patterson2011-03-211-0/+8
| | | | | | | | | | | | | | | | [#6559 state:resolved]
| | * | schemas set by set_table_name are respected by the mysql adapter. [#5322 ↵Aaron Patterson2011-03-211-2/+16
| | | | | | | | | | | | | | | | state:resolved]
| | * | Reapply extensions when using except and onlyIain Hecker2011-03-211-0/+6
| | |/
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-165-10/+20
| |\|
| | * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-143-8/+15
| | |\
| | | * Adjust unique constraint comment to include info about the RecordNotUnique ↵Anders Elfving2011-03-131-4/+11
| | | | | | | | | | | | | | | | exception
| | | * remove some blanksPaco Guzman2011-03-112-4/+4
| | | |
| | * | Fixed a bug when empty? was called on a grouped Relation that wasn't loadedChris Oliver2011-03-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | [#5829 state:resolved] Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| | * | Add additional text to NotImplementedErrors [#6328 state:resolved]Mike Gehard2011-03-121-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 Leighton2011-03-071-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 Leighton2011-03-123-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 doneJon Leighton2011-03-123-9/+5
| | |
| * | Simplify implementation of ThroughReflection#chainJon Leighton2011-03-111-22/+2
| | |
| * | Abstract some common code from AssociationScope and ↵Jon Leighton2011-03-114-97/+83
| | | | | | | | | | | | JoinDependency::JoinAssociation into a JoinHelper module
| * | Refactor JoinAssociationJon Leighton2011-03-101-100/+54
| | |
| * | Rename Reflection#through_reflection_chain and #through_options to ↵Jon Leighton2011-03-104-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 Leighton2011-03-109-215/+162
| | | | | | | | | | | | AssociationScope class which is capable of building a scope for any association.