Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2358 from arunagw/test_fix_187_skip | José Valim | 2011-07-31 | 1 | -3/+4 |
|\ | | | | | skiping magic comment test for < 1.9 | ||||
| * | magic comment test only if encoding_aware?. | Arun Agrawal | 2011-07-30 | 1 | -3/+4 |
| | | |||||
* | | Resolve warnings by instantizing @attrubtes as nil | Brian Cardarella | 2011-07-30 | 1 | -0/+1 |
|/ | |||||
* | default writing the schema file as utf-8 | Aaron Patterson | 2011-07-29 | 1 | -1/+2 |
| | |||||
* | dump IO encoding value along with schema.rb so the file can be reloaded. ↵ | Aaron Patterson | 2011-07-29 | 2 | -3/+16 |
| | | | | fixes #1592 | ||||
* | Revert "Merge pull request #2309 from smasry/master" | Jon Leighton | 2011-07-28 | 2 | -6/+1 |
| | | | | | | | 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 | 2 | -1/+6 |
| | |||||
* | Fixed failing query when performing calculation with having based on select. | Dmitriy Kiriyenko | 2011-07-27 | 2 | -0/+8 |
| | |||||
* | Add a proxy_association method to association proxies, which can be called ↵ | Jon Leighton | 2011-07-27 | 4 | -6/+27 |
| | | | | 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 | ||||
* | remove deprication warning for ruby 1.9.3-head for unused variables | Vishnu Atrai | 2011-07-26 | 1 | -1/+1 |
| | |||||
* | Revert "allow select to have multiple arguments" | Piotr Sarnacki | 2011-07-26 | 2 | -11/+3 |
| | | | | | | | 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 | 2 | -3/+11 |
|\ | | | | | 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 | 2 | -3/+11 |
| | | |||||
* | | 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 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 |
| |/ / |/| | |