Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-09-10 | 21 | -236/+348 |
|\ | |||||
| * | Revert "Add :accessible option to Associations for allowing mass assignments ↵ | Pratik Naik | 2008-09-10 | 6 | -157/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | using hash. [#474 state:resolved]" This reverts commit e0750d6a5c7f621e4ca12205137c0b135cab444a. Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_collection.rb | ||||
| * | Expanded documentation for new composed_of options | Rob Anderton | 2008-09-10 | 1 | -10/+53 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#892 state:committed] | ||||
| * | Added :constructor and :converter options to composed_of and deprecated the ↵ | Rob Anderton | 2008-09-10 | 4 | -33/+124 |
| | | | | | | | | | | | | conversion block Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Support :limit on update_all so that has_many with :limit can be safely updated | Tarmo Tänav | 2008-09-10 | 5 | -7/+41 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Fixed test_find_last_by_one_attribute_caches_dynamic_finder for postgresql 8.3 | Tarmo Tänav | 2008-09-10 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Missing doc updates | David Heinemeier Hansson | 2008-09-09 | 2 | -1/+3 |
| | | |||||
| * | Added find_last_by dynamic finder [status:committed #762] | miloops | 2008-09-09 | 3 | -5/+39 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Add special AssociationReflection methods for creating association objects, ↵ | Hongli Lai (Phusion) | 2008-09-09 | 7 | -16/+62 |
| | | | | | | | | | | | | | | | | and modify the code base to use those methods instead of creating association objects directly. This allows plugins to hook into association object creation behavior. [#986 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Make the options that has_many, belongs_to and other association generation ↵ | Hongli Lai (Phusion) | 2008-09-09 | 2 | -18/+32 |
| | | | | | | | | | | | | | | | | methods can accept, configurable. [#985 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Interpolation requires double quotes | Michael Koziarski | 2008-09-09 | 1 | -1/+1 |
| | | |||||
| * | Revert "Revert "Raise UnknownAttributeError when unknown attributes are ↵ | Jeremy Kemper | 2008-09-08 | 2 | -1/+17 |
| | | | | | | | | | | | | supplied via mass assignment"" This reverts commit 41efd73887c00ffd228b05d9346ec47a1f3759b9. | ||||
| * | Revert "Raise UnknownAttributeError when unknown attributes are supplied via ↵ | Jeremy Kemper | 2008-09-06 | 2 | -17/+1 |
| | | | | | | | | | | | | mass assignment" This reverts commit 108db00aa90fe266564483ab301cf0669cae600f. | ||||
* | | Flesh out the ActiveRecord::Validations::ClassMethods RDoc | John D. Hume | 2008-09-08 | 1 | -6/+17 |
| | | |||||
* | | Move the orphaned method RDoc of ↵ | John D. Hume | 2008-09-08 | 1 | -31/+33 |
| | | | | | | | | ActiveRecord::Validations::ClassMethods#validate into the module RDoc and rewrite the first bit. | ||||
* | | Change over examples to use {{count}} and {{value}} instead of %d and %s. | John D. Hume | 2008-09-07 | 1 | -9/+9 |
|/ | |||||
* | Use a more sensible resolution on the new millisecond benchmarks | David Heinemeier Hansson | 2008-09-05 | 2 | -2/+2 |
| | |||||
* | Changed all benchmarking reports to be in milliseconds | David Heinemeier Hansson | 2008-09-05 | 3 | -4/+6 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-09-04 | 1 | -1/+1 |
|\ | |||||
| * | Handle connection timeouts with a slightly nicer error message. | Michael Koziarski | 2008-09-04 | 1 | -1/+1 |
| | | |||||
* | | Rescue spurious failures in case dummy postgresql user or schema already exists | Jeremy Kemper | 2008-09-04 | 1 | -2/+2 |
|/ | |||||
* | Remove flawed execute("ROLLBACK") approach; #reset! defaults to nothing | Nick Sieger | 2008-09-04 | 2 | -5/+1 |
| | | | | | | Will need community help to fill out what #reset! should do for each adapter Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Default connection allow_concurrency to false (for PostgreSQL) | Nick Sieger | 2008-09-04 | 4 | -2/+20 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Deprecate verification_timeout and verify before reset | Nick Sieger | 2008-09-04 | 5 | -19/+18 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Fix transaction exception test | Jeremy Kemper | 2008-09-04 | 1 | -0/+1 |
| | |||||
* | still need to track whether we're the toplevel transaction | Jeremy Kemper | 2008-09-04 | 1 | -3/+10 |
| | |||||
* | PostgreSQL: introduce transaction_active? rather than tracking activity ↵ | Jeremy Kemper | 2008-09-04 | 1 | -0/+32 |
| | | | | ourselves | ||||
* | Merge docrails | Pratik Naik | 2008-09-03 | 10 | -61/+166 |
| | |||||
* | 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. |