Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-09-03 | 29 | -430/+816 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/resources.rb | ||||
| * | Some performance goodness for inheritable attributes. | Clemens Kofler | 2008-09-03 | 1 | -7/+7 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Some performance goodness for AR. | Clemens Kofler | 2008-09-03 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Some performance goodness for AR associations. | Clemens Kofler | 2008-09-03 | 1 | -32/+32 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | More symbols for send and respond_to?. | Clemens Kofler | 2008-09-03 | 2 | -5/+5 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Database connections are now pooled, one pool per #establish_connection call. | Jeremy Kemper | 2008-09-02 | 9 | -20/+131 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pools start out empty and grow as necessary to a maximum size (default is 5, configure size with key 'pool' in your database configuration). If no connections are available, a thread will wait up to a 'wait_timeout' time (default is 5 seconds). Connections are verified and reset when checked out from the pool (usually upon first access to ActiveRecord::Base.connection), and returned back to the pool after each request. If you would like to use connection pools outside of ActionPack, there is an ActiveRecord::Base.connection_pool method that gives you access to the pool, and you can manually checkout/checkin connections, or supply a block to ActiveRecord::Base.connection_pool.with_connection which takes care of the checkout/checkin for you. [#936 state:resolved] | ||||
| | * | translates when a message symbol has been set on builtin validations | Iain Hecker | 2008-08-31 | 2 | -1/+35 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Fix tests that assumed implicit order by id | Jeremy Kemper | 2008-08-30 | 1 | -2/+2 |
| | | | |||||
| | * | Use reflection primary_key instead of id for when selecting association ids. | miloops | 2008-08-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | [#906 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Performance: Better query for ASSOCIATION_ids. Select only ids if the ↵ | miloops | 2008-08-30 | 4 | -17/+73 |
| | | | | | | | | | | | | | | | | | | association hasn't been loaded. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Make NamedScope#size behave identically to AssociationCollection#size. [#933 ↵ | Tom Stuart | 2008-08-29 | 2 | -1/+20 |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | 1.9: methods need to be coerced into strings | Joshua Peek | 2008-08-29 | 1 | -1/+1 |
| | | | |||||
| | * | Use a set for the named scope methods not a big regexp. | Michael Koziarski | 2008-08-29 | 1 | -2/+2 |
| | | | |||||
| * | | Minor tweak to retrieve_connection_pool -- recurse instead of loop | Nick Sieger | 2008-08-29 | 1 | -6/+4 |
| | | | |||||
| * | | Remove some synchronization that's probably overkill, assuming one doesn't ↵ | Nick Sieger | 2008-08-29 | 1 | -10/+1 |
| | | | | | | | | | | | | establish connections frequently | ||||
| * | | Collapse connection pool class hierarchy; YAGNI. | Nick Sieger | 2008-08-29 | 2 | -112/+51 |
| | | | | | | | | | | | | | | | - Add connection checkin and checkout callbacks to adapter to allow adapter-specific customization of behavior (e.g., JRuby w/ JNDI) | ||||
| * | | Make clear_active_connections! also return stale connections back to the pool | Nick Sieger | 2008-08-29 | 6 | -129/+112 |
| | | | | | | | | | | | | - also clean up some cruft remaining from per-thread connection cache | ||||
| * | | Remove CachedConnectionPerThread per-thread pooling mechanism in favor of a ↵ | Nick Sieger | 2008-08-29 | 6 | -18/+17 |
| | | | | | | | | | | | | fixed pool with default maximum of 5 connections | ||||
| * | | Deprecate allow_concurrency and make it have no effect | Nick Sieger | 2008-08-29 | 8 | -114/+27 |
| | | | |||||
| * | | Add connection reset and verification upon each connection checkout | Nick Sieger | 2008-08-29 | 3 | -4/+27 |
| | | | |||||
| * | | Fix typo: was using brackets instead of parens. Must need more sleep. | Nick Sieger | 2008-08-29 | 2 | -1/+11 |
| | | | |||||
| * | | Favor existing connections over new ones if available | Nick Sieger | 2008-08-29 | 1 | -3/+3 |
| | | | |||||
| * | | More doco and class/method renames. Now have a strategy for integration with ↵ | Nick Sieger | 2008-08-29 | 1 | -24/+39 |
| | | | | | | | | | | | | ActionPack. | ||||
| * | | Fix checkin method, add a couple more tests | Nick Sieger | 2008-08-29 | 2 | -5/+35 |
| | | | |||||
| * | | Nearing the finish line. Initial fixed-size connection pool implemented, ↵ | Nick Sieger | 2008-08-29 | 3 | -22/+156 |
| | | | | | | | | | | | | more docs | ||||
| * | | Clean up the code, get rid of reserve/release, add some more docs | Nick Sieger | 2008-08-29 | 1 | -34/+51 |
| | | | |||||
| * | | Extract a base class for connection pools, start to flesh out ↵ | Nick Sieger | 2008-08-29 | 1 | -84/+105 |
| | | | | | | | | | | | | reserve/release API | ||||
| * | | Split connection handler into single- and multiple-thread versions. | Nick Sieger | 2008-08-29 | 2 | -31/+57 |
| | | | |||||
| * | | Connection handling methods extracted out into separate ConnectionHandler class | Nick Sieger | 2008-08-29 | 3 | -105/+117 |
| | | | | | | | | | | | | - delegating methods left behind | ||||
| * | | Fix failure to retain value of allow_concurrency | Nick | 2008-08-29 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | - Also carry allow_concurrency value through to connection adapter (for postgresql) | ||||
| * | | Add synchronization to connection pool also | Nick | 2008-08-29 | 2 | -4/+14 |
| | | | |||||
| * | | Introduce synchronization around connection pool access | Nick | 2008-08-29 | 3 | -21/+47 |
| | | | | | | | | | | | | | | | | | | - use new active support Module#synchronize - allow_concurrency now switches between a null monitor and a regular monitor (defaulting to null monitor to avoid overhead) | ||||
| * | | Rename defined_connections to connection_pools | Nick | 2008-08-29 | 2 | -11/+21 |
| | | | | | | | | | | | | | | | - Distinguis meaning of "active_connections" to always mean connections associated with the current thread | ||||
| * | | Initial conversion to connection pool | Nick | 2008-08-29 | 4 | -195/+171 |
| |/ | | | | | | | | | | | So far so good, tests still run clean. Next steps: synchronize connection pool access and modification, and change allow_concurrency to simply switch a real lock for a null lock. | ||||
| * | Make case insensitive validates_uniqueness_of use unicode aware downcase method. | Eugene Pimenov | 2008-08-29 | 2 | -1/+13 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Make query-cache thread-local | Nick Sieger | 2008-08-29 | 1 | -14/+29 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Fix parentheses warnings | Michael Koziarski | 2008-08-29 | 1 | -1/+1 |
| | | |||||
| * | Fix NamedScope regex so methods containing "an" get delegated to ↵ | Jan De Poorter | 2008-08-29 | 2 | -1/+5 |
| | | | | | | | | | | | | proxy_found. [#901 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Missed changelog update for #501 | Jeremy Kemper | 2008-08-28 | 1 | -0/+2 |
| | | |||||
| * | Merge scoped :joins together instead of overwriting them. May expose scoping ↵ | Andrew White | 2008-08-28 | 4 | -15/+109 |
| | | | | | | | | | | | | | | | | bugs in your code! [#501 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Refactored AssociationCollection#count for uniformity and Ruby 1.8.7 support. | Ernie Miller | 2008-08-28 | 6 | -36/+49 |
| | | | | | | | | | | | | [#831 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-08-28 | 58 | -477/+1251 |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/callbacks.rb activeresource/lib/active_resource/base.rb | ||||
| * | Implement count limit/offset support for has_many associations | Tarmo Tänav | 2008-08-27 | 2 | -1/+16 |
| | | | | | | | | | | | | [#348 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Alias included associations if needed when doing a count | Tarmo Tänav | 2008-08-27 | 2 | -2/+12 |
| | | | | | | | | | | | | [#302 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Dirty: treat two changes resulting in the original value as being unchanged. | Tom Lea | 2008-08-27 | 2 | -1/+40 |
| | | | | | | | | | | | | [#798 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | PostgreSQL: fix quote_string for certain old pg drivers. [#94 state:resolved] | Lars Kanis | 2008-08-27 | 1 | -1/+1 |
| | | |||||
| * | respond_to? passes along splat args to avoid introducing the second arg if ↵ | Jeremy Kemper | 2008-08-27 | 1 | -2/+2 |
| | | | | | | | | it was omitted | ||||
| * | Merge commit 'sven/i18n' | Jeremy Kemper | 2008-08-27 | 2 | -15/+8 |
| |\ | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support.rb | ||||
| | * | i18n: fixed failing tests after removing #populate and #store_translations | Marko Seppae | 2008-08-27 | 1 | -12/+7 |
| | | | |||||
| | * | I18n: removed call to #populate from main library files | Marko Seppae | 2008-08-27 | 1 | -3/+1 |
| | | |