Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve warnings by instantizing @attrubtes as nil | Brian Cardarella | 2011-07-30 | 1 | -0/+1 |
| | |||||
* | dump IO encoding value along with schema.rb so the file can be reloaded. ↵ | Aaron Patterson | 2011-07-29 | 1 | -3/+12 |
| | | | | fixes #1592 | ||||
* | Revert "Merge pull request #2309 from smasry/master" | Jon Leighton | 2011-07-28 | 1 | -5/+0 |
| | | | | | | | This reverts commit 9d396ee8195e31f646e0b89158ed96f4db4ab38f, reversing changes made to fa2bfd832c1d1e997d93c2269a485cc74782c86d. Reason: the change broke the build. | ||||
* | Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697 | Samer Masry | 2011-07-27 | 1 | -0/+5 |
| | |||||
* | Fixed failing query when performing calculation with having based on select. | Dmitriy Kiriyenko | 2011-07-27 | 1 | -0/+7 |
| | |||||
* | Add a proxy_association method to association proxies, which can be called ↵ | Jon Leighton | 2011-07-27 | 1 | -0/+5 |
| | | | | by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner. | ||||
* | remove deprication warning: ambiguous first argument; put parentheses or ↵ | Vishnu Atrai | 2011-07-26 | 1 | -1/+1 |
| | | | | even spaces | ||||
* | Revert "allow select to have multiple arguments" | Piotr Sarnacki | 2011-07-26 | 1 | -5/+0 |
| | | | | | | | This reverts commit 04cc446d178653d362510e79a22db5300d463161. I reverted it because apparently we want to use: select([:a, :b]) instead of select(:a, :b), but there was no tests for that form. | ||||
* | Merge pull request #2271 from slawosz/enhance_select_method_api | Piotr Sarnacki | 2011-07-26 | 1 | -0/+5 |
|\ | | | | | allow select to have multiple arguments ie. Post.select(:id,:name,:author) | ||||
| * | allow select to have multiple arguments | Sławosz Sławiński | 2011-07-26 | 1 | -0/+5 |
| | | |||||
* | | Simplify the test by using id and name. `id` will be the only real sort ↵ | Franck Verrot | 2011-07-26 | 1 | -1/+1 |
|/ | | | | criteria in any case as it's unique. | ||||
* | Merge pull request #2236 from cldwalker/after_initialize | Santiago Pastorino | 2011-07-25 | 2 | -0/+18 |
|\ | | | | | 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 | 3 | -0/+41 |
| | | | | | | | | 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 | 1 | -0/+20 |
| | | |||||
* | | Merge pull request #2238 from cesario/order-with-extra-spaces | Aaron Patterson | 2011-07-24 | 1 | -0/+4 |
|\ \ | | | | | | | Ordering with extra spaces was raising a SQL exception | ||||
| * | | Ordering with extra spaces was raising a SQL exception | Franck Verrot | 2011-07-24 | 1 | -0/+4 |
| |/ | |||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-24 | 2 | -4/+4 |
|\ \ | |/ |/| | |||||
| * | Changed a few instances of of words in the API docs written in British ↵ | Oemuer Oezkir | 2011-07-24 | 2 | -4/+4 |
| | | | | | | | | | | | | English to American English(according to Weber) | ||||
* | | Merge pull request #2086 from amatsuda/date_multiparameter_nil | Xavier Noria | 2011-07-23 | 1 | -24/+9 |
|\ \ | |/ |/| | 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 | 1 | -24/+9 |
| | | |||||
* | | forgot to add this test case | Aaron Patterson | 2011-07-22 | 1 | -0/+14 |
| | | |||||
* | | adding more tests around database uri parsing | Aaron Patterson | 2011-07-21 | 1 | -0/+34 |
| | | |||||
* | | move around tests | Aaron Patterson | 2011-07-21 | 2 | -30/+10 |
| | | |||||
* | | fix postgres connection url test | Terence Lee | 2011-07-20 | 1 | -1/+1 |
| | | |||||
* | | Added test for postgres connections as URL. Fixed query param parsing. | Glenn Gillen | 2011-07-20 | 1 | -0/+13 |
| | | |||||
* | | Provide database connection settings as a URL. | Glenn Gillen | 2011-07-20 | 1 | -0/+11 |
| | | |||||
* | | assign_nested_attributes_for_collection_association should work with Ruby ↵ | Franck Verrot | 2011-07-20 | 1 | -0/+5 |
| | | | | | | | | | | | | 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 | 2 | -1/+12 |
| | | |||||
* | | 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. | ||||
* | | ActiveRecord: Fix eager loading so that giving a blank order clause ↵ | Elliot Winkler | 2011-07-18 | 1 | -0/+12 |
| | | | | | | | | generates valid SQL | ||||
* | | Merge pull request #195 from bigfix/active_model_include_serialization | José Valim | 2011-07-18 | 2 | -143/+133 |
|\ \ | | | | | | | ActiveModel support for the :include serialization option | ||||
| * | | 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. | ||||
* | | Refactor test case to use anonymous class - Thank you @tenderlove | Prem Sichanugrist | 2011-07-18 | 1 | -13/+8 |
| | | |||||
* | | Raise an ArgumentError if user passing less number of argument in the ↵ | Prem Sichanugrist | 2011-07-17 | 2 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+27 |
|\ | | | | | 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 | 1 | -2/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+16 |
|\ \ | |/ |/| | Bugfix by stopping find_in_batches using the records after yielding. | ||||
| * | Stop find_in_batches using the records after yielding. | Caius Durling | 2011-06-21 | 1 | -0/+16 |
| | | | | | | | | | | | | Currently if the code that calls .find_in_batches modifies the yielded array in place then .find_in_batches can enter an infinite loop searching with ruby object ids in the database instead of the primary key of records in the database. This happens because it naively assumes the yielded array hasn't been modified before calling #id on the last object in the array. And ruby (1.8 at least) alias' #id to #object_id so an integer is still returned no matter what the last object is. By moving finding the #id of the last object before yielding the array it means the calling code can do whatever it wants to the array in terms of modifying it in place, and .find_in_batches doesn't care. | ||||
* | | Fix failure in test_preserves_existing_fixture_data from ↵ | Jon Leighton | 2011-07-12 | 1 | -2/+2 |
| | | | | | | | | test/cases/fixtures_test.rb when UTC and local time occur on different dates. | ||||
* | | Fix exception if old and new targets are both nil. Fixes #1471. | Jon Leighton | 2011-07-12 | 3 | -1/+14 |
| | | |||||
* | | Merge pull request #1929 from sobrinho/master | Santiago Pastorino | 2011-07-11 | 1 | -0/+14 |
|\ \ | | | | | | | Create a test case for disable_referential_integrity | ||||
| * | | Create a test case for disable_referential_integrity | Gabriel Sobrinho | 2011-07-01 | 1 | -0/+14 |
| | | | |||||
* | | | Merge pull request #1823 from gnarg/master | Santiago Pastorino | 2011-07-10 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | Log instrumentation name for exists? queries | ||||
| * | | | Log instrumentation name for exists? queries | Jon Guymon | 2011-06-22 | 1 | -0/+8 |
| | | | | |||||
* | | | | to_key on a destroyed model should return nil | Santiago Pastorino | 2011-07-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | formats | Akira Matsuda | 2011-07-09 | 1 | -5/+5 |
| | | | |