Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-25 | 1 | -1/+1 |
|\ | |||||
| * | Fixed Typo | John | 2011-07-24 | 1 | -1/+1 |
| | | |||||
* | | Simplify the way default DATABASE_URL works. | Glenn Gillen | 2011-07-25 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2236 from cldwalker/after_initialize | Santiago Pastorino | 2011-07-25 | 3 | -2/+19 |
|\ \ | | | | | | | Fix after_initialize and Base.create edge case | ||||
| * | | use existing model for testing Base.create with #after_initialize | Gabriel Horner | 2011-07-24 | 4 | -23/+12 |
| | | | |||||
| * | | simplify and be more explicit about create and after_initialize tests | Gabriel Horner | 2011-07-24 | 2 | -24/+12 |
| | | | |||||
| * | | fix after_initialize edge case (close #2074 and close #2175) | Les Fletcher | 2011-07-24 | 4 | -2/+42 |
| | | | | | | | | | | | | fix behavior when after_initialize is defined and a block is passed to Base.create | ||||
* | | | Bring back the ability to provide :order for update_all. | thedarkone | 2011-07-25 | 2 | -9/+25 |
| | | | |||||
* | | | Merge pull request #2238 from cesario/order-with-extra-spaces | Aaron Patterson | 2011-07-24 | 2 | -0/+5 |
|\ \ \ | |_|/ |/| | | Ordering with extra spaces was raising a SQL exception | ||||
| * | | Ordering with extra spaces was raising a SQL exception | Franck Verrot | 2011-07-24 | 2 | -0/+5 |
| |/ | |||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-24 | 3 | -5/+5 |
|\ \ | |/ |/| | |||||
| * | Changed a few instances of of words in the API docs written in British ↵ | Oemuer Oezkir | 2011-07-24 | 3 | -5/+5 |
| | | | | | | | | | | | | English to American English(according to Weber) | ||||
* | | Merge pull request #2185 from castlerock/lazy_load_abstract_adapter | Aaron Patterson | 2011-07-23 | 2 | -3/+2 |
|\ \ | | | | | | | lazy load ConnectionAdapters remove require. | ||||
| * | | lazy load ConnectionAdapters remove require. | Vishnu Atrai | 2011-07-22 | 2 | -3/+2 |
| | | | |||||
* | | | registers the recent change to date multiparameter handling in the CHANGELOG | Xavier Noria | 2011-07-23 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #2086 from amatsuda/date_multiparameter_nil | Xavier Noria | 2011-07-23 | 2 | -27/+15 |
|\ \ \ | | | | | | | | | convert multiple Date parameters into a nil if any of its bits were blank | ||||
| * | | | convert multiple Date parameters into a nil if any of its bits were blank | Akira Matsuda | 2011-07-15 | 2 | -27/+15 |
| | | | | |||||
* | | | | Merge pull request #2171 from arunagw/database-rake-1.9.2 | Santiago Pastorino | 2011-07-23 | 1 | -1/+2 |
|\ \ \ \ | |_|_|/ |/| | | | This conditions is required to work with database create task. 1.9.2 is h | ||||
| * | | | This conditions is required to work with database create task. 1.9.2 is ↵ | Arun Agrawal | 2011-07-21 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | having a bug with "Calling return within begin still executes else". | ||||
* | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | use simpler words in docs | Vijay Dev | 2011-07-10 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #2188 from vijaydev/patch-6 | Xavier Noria | 2011-07-22 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixes typo | ||||
| * | | | | | Fixes typo | Vijay Dev | 2011-07-22 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* / | | | | forgot to add this test case | Aaron Patterson | 2011-07-22 | 1 | -0/+14 |
|/ / / / | |||||
* | | | | adding changelog entry for connection urls | Aaron Patterson | 2011-07-21 | 1 | -0/+5 |
| | | | | |||||
* | | | | adding more tests around database uri parsing | Aaron Patterson | 2011-07-21 | 2 | -5/+37 |
| | | | | |||||
* | | | | move around tests | Aaron Patterson | 2011-07-21 | 2 | -30/+10 |
| | | | | |||||
* | | | | fix postgres connection url test | Terence Lee | 2011-07-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add documentation for URL connection strings. | Glenn Gillen | 2011-07-20 | 1 | -0/+6 |
| | | | | |||||
* | | | | Added test for postgres connections as URL. Fixed query param parsing. | Glenn Gillen | 2011-07-20 | 2 | -1/+14 |
| | | | | |||||
* | | | | Provide database connection settings as a URL. | Glenn Gillen | 2011-07-20 | 2 | -0/+33 |
| | | | | |||||
* | | | | no need to sort the values | Aaron Patterson | 2011-07-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | assign_nested_attributes_for_collection_association should work with Ruby ↵ | Franck Verrot | 2011-07-20 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | 1.9 [Closes #2106] Children attributes can be either String's or Symbol's, so let's check if the object responds to to_i. | ||||
* | | | | Revert "this fixes a brittle test in fixtures_test.rb which fails when you ↵ | Aaron Patterson | 2011-07-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | are in a timezone which is ahead of UTC but UTC is in the previous day still." This reverts commit f92cefa95f44bcd550c402a7f5ba914f3bd783cc. | ||||
* | | | | bigdecimal should be typecast to a float on sqlite3. fixes #2162 | Aaron Patterson | 2011-07-20 | 3 | -1/+17 |
| |/ / |/| | | |||||
* | | | this fixes a brittle test in fixtures_test.rb which fails when you are in a ↵ | Josh Kalderimis | 2011-07-20 | 1 | -2/+2 |
| | | | | | | | | | | | | timezone which is ahead of UTC but UTC is in the previous day still. | ||||
* | | | avoid Symbol#to_proc | Vijay Dev | 2011-07-20 | 1 | -1/+1 |
| | | | |||||
* | | | Explicitly require Active Support dependencies | Norman Clarke | 2011-07-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes errors when using Active Record outside of Rails. In Rails, these files are required by other classes that are always loaded, so this error does not happen. Without core_ext/module/delegation, a NoMethodError is raised because `delegate` remains undefined. Without core_ext/class/attribute_acessors, an ArgumentError is raised because `delegate` does not receive a value for its :to option. | ||||
* | | | ActiveRecord: Fix eager loading so that giving a blank order clause ↵ | Elliot Winkler | 2011-07-18 | 2 | -1/+13 |
| | | | | | | | | | | | | generates valid SQL | ||||
* | | | Merge pull request #195 from bigfix/active_model_include_serialization | José Valim | 2011-07-18 | 4 | -224/+134 |
|\ \ \ | | | | | | | | | ActiveModel support for the :include serialization option | ||||
| * | | | ActiveModel support for the :include serialization option | John Firebaugh | 2011-07-17 | 2 | -81/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves support for the :include serialization option for serializing associated objects out of ActiveRecord in into ActiveModel. The following methods support the :include option: * serializable_hash * to_json * to_xml Instances must respond to methods named by the values of the :includes array (or keys of the :includes hash). If an association method returns an object that is_a?(Enumerable) (which AR has_many associations do), it is assumed to be a collection association, and its elements must respond to :serializable_hash. Otherwise it must respond to :serializable_hash itself. While here, fix #858, XmlSerializer should not singularize already singular association names. | ||||
| * | | | Move to_xml tests to xml_serialization_test.rb | John Firebaugh | 2011-07-17 | 2 | -143/+133 |
| | | | | | | | | | | | | | | | | | | | | One duplicate was eliminated: test_to_xml_including_methods/ test_methods_are_called_on_object. | ||||
| * | | | We already have the record; no need to retrieve it again | John Firebaugh | 2011-07-17 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Refactor test case to use anonymous class - Thank you @tenderlove | Prem Sichanugrist | 2011-07-18 | 1 | -13/+8 |
| | | | |||||
* | | | Refactor the code a bit to reduce the duplication | Prem Sichanugrist | 2011-07-17 | 1 | -17/+8 |
| | | | |||||
* | | | Raise an ArgumentError if user passing less number of argument in the ↵ | Prem Sichanugrist | 2011-07-17 | 4 | -0/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic finder The previous behavior was unintentional, and some people was relying on it. Now the dynamic finder will always expecting the number of arguments to be equal or greater (so you can still pass the options to it.) So if you were doing this and expecting the second argument to be nil: User.find_by_username_and_group("sikachu") You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this: User.find_by_username_and_group("sikachu", nil) | ||||
* | | | Revert "Fix failure in test_preserves_existing_fixture_data from ↵ | Jon Leighton | 2011-07-17 | 1 | -2/+2 |
|/ / | | | | | | | | | | | test/cases/fixtures_test.rb when UTC and local time occur on different dates." I am pretty sure this was an incorrect fix, and it still failed in certain circumstances anyway. I am now unable to reproduce the original failure I was experiencing so will leave it for now and see if this pops up again. This reverts commit e4479b2f1bc54edf155408d51dd3236955150ce1. | ||||
* | | Merge pull request #2063 from elight/master | Santiago Pastorino | 2011-07-14 | 2 | -3/+29 |
|\ \ | | | | | | | Patch for https://github.com/rails/rails/issues/2059 | ||||
| * | | Fix and unit test for https://github.com/rails/rails/issues/2059 | Evan Light | 2011-07-14 | 2 | -3/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache key was incorrectly using timezone-dependent record#updated_at when it should be using a timezone-independent value to generate the cache key Minor refactoring to cache_key timezone test Closes #2059 Adds a test to validate the format of the cache_key for nil and present updated_at values Correctly handles updated_at == nil | ||||
* | | | Merge pull request #1807 from caius/find_in_batches_id_bug | Santiago Pastorino | 2011-07-14 | 2 | -2/+21 |
|\ \ \ | |/ / |/| | | Bugfix by stopping find_in_batches using the records after yielding. |