aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2358 from arunagw/test_fix_187_skipJosé Valim2011-07-311-3/+4
|\ | | | | skiping magic comment test for < 1.9
| * magic comment test only if encoding_aware?.Arun Agrawal2011-07-301-3/+4
| |
* | Resolve warnings by instantizing @attrubtes as nilBrian Cardarella2011-07-301-0/+1
|/
* default writing the schema file as utf-8Aaron Patterson2011-07-291-1/+2
|
* dump IO encoding value along with schema.rb so the file can be reloaded. ↵Aaron Patterson2011-07-292-3/+16
| | | | fixes #1592
* Revert "Merge pull request #2309 from smasry/master"Jon Leighton2011-07-282-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 #1697Samer Masry2011-07-272-1/+6
|
* Fixed failing query when performing calculation with having based on select.Dmitriy Kiriyenko2011-07-272-0/+8
|
* Add a proxy_association method to association proxies, which can be called ↵Jon Leighton2011-07-274-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 Atrai2011-07-261-1/+1
| | | | even spaces
* remove deprication warning for ruby 1.9.3-head for unused variablesVishnu Atrai2011-07-261-1/+1
|
* Revert "allow select to have multiple arguments"Piotr Sarnacki2011-07-262-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_apiPiotr Sarnacki2011-07-262-3/+11
|\ | | | | allow select to have multiple arguments ie. Post.select(:id,:name,:author)
| * allow select to have multiple argumentsSławosz Sławiński2011-07-262-3/+11
| |
* | Simplify the test by using id and name. `id` will be the only real sort ↵Franck Verrot2011-07-261-1/+1
| | | | | | | | criteria in any case as it's unique.
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-251-1/+1
|\ \ | |/ |/|
| * Fixed TypoJohn2011-07-241-1/+1
| |
* | Simplify the way default DATABASE_URL works.Glenn Gillen2011-07-251-1/+1
| |
* | Merge pull request #2236 from cldwalker/after_initializeSantiago Pastorino2011-07-253-2/+19
|\ \ | | | | | | Fix after_initialize and Base.create edge case
| * | use existing model for testing Base.create with #after_initializeGabriel Horner2011-07-244-23/+12
| | |
| * | simplify and be more explicit about create and after_initialize testsGabriel Horner2011-07-242-24/+12
| | |
| * | fix after_initialize edge case (close #2074 and close #2175)Les Fletcher2011-07-244-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.thedarkone2011-07-252-9/+25
| | |
* | | Merge pull request #2238 from cesario/order-with-extra-spacesAaron Patterson2011-07-242-0/+5
|\ \ \ | |_|/ |/| | Ordering with extra spaces was raising a SQL exception
| * | Ordering with extra spaces was raising a SQL exceptionFranck Verrot2011-07-242-0/+5
| |/
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-243-5/+5
|\ \ | |/ |/|
| * Changed a few instances of of words in the API docs written in British ↵Oemuer Oezkir2011-07-243-5/+5
| | | | | | | | | | | | English to American English(according to Weber)
* | Merge pull request #2185 from castlerock/lazy_load_abstract_adapterAaron Patterson2011-07-232-3/+2
|\ \ | | | | | | lazy load ConnectionAdapters remove require.
| * | lazy load ConnectionAdapters remove require.Vishnu Atrai2011-07-222-3/+2
| | |
* | | registers the recent change to date multiparameter handling in the CHANGELOGXavier Noria2011-07-231-0/+5
| | |
* | | Merge pull request #2086 from amatsuda/date_multiparameter_nilXavier Noria2011-07-232-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 blankAkira Matsuda2011-07-152-27/+15
| | | |
* | | | Merge pull request #2171 from arunagw/database-rake-1.9.2Santiago Pastorino2011-07-231-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 Agrawal2011-07-211-1/+2
| | | | | | | | | | | | | | | | having a bug with "Calling return within begin still executes else".
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-231-1/+1
|\ \ \ \
| * | | | use simpler words in docsVijay Dev2011-07-101-1/+1
| | | | |
* | | | | Merge pull request #2188 from vijaydev/patch-6Xavier Noria2011-07-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixes typo
| * | | | | Fixes typoVijay Dev2011-07-221-1/+1
| | |_|_|/ | |/| | |
* / | | | forgot to add this test caseAaron Patterson2011-07-221-0/+14
|/ / / /
* | | | adding changelog entry for connection urlsAaron Patterson2011-07-211-0/+5
| | | |
* | | | adding more tests around database uri parsingAaron Patterson2011-07-212-5/+37
| | | |
* | | | move around testsAaron Patterson2011-07-212-30/+10
| | | |
* | | | fix postgres connection url testTerence Lee2011-07-201-1/+1
| | | |
* | | | Add documentation for URL connection strings.Glenn Gillen2011-07-201-0/+6
| | | |
* | | | Added test for postgres connections as URL. Fixed query param parsing.Glenn Gillen2011-07-202-1/+14
| | | |
* | | | Provide database connection settings as a URL.Glenn Gillen2011-07-202-0/+33
| | | |
* | | | no need to sort the valuesAaron Patterson2011-07-201-1/+1
| | | |
* | | | assign_nested_attributes_for_collection_association should work with Ruby ↵Franck Verrot2011-07-202-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 Patterson2011-07-201-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 #2162Aaron Patterson2011-07-203-1/+17
| |/ / |/| |