Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | do not compute table names for abstract classes | Akira Matsuda | 2011-08-24 | 1 | -0/+4 |
| | |||||
* | Fix PredicateBuilder clobbering select_values in subquery. | Ernie Miller | 2011-08-20 | 1 | -0/+13 |
| | |||||
* | Fix assumption of primary key name in PredicateBuilder subquery. | Ernie Miller | 2011-08-20 | 1 | -0/+10 |
| | |||||
* | prevent sql injection attacks by escaping quotes in column names | Aaron Patterson | 2011-08-16 | 1 | -0/+17 |
| | |||||
* | Revert "Merge pull request #2543 from htanata/unused_require_in_ar_test" | Santiago Pastorino | 2011-08-16 | 1 | -0/+1 |
| | | | | | This reverts commit 87152f2604e73b218df90befda576f0acfed0bbf, reversing changes made to 0d3615f04c79f6e90d8ab33fdfc920b8faac9cb8. | ||||
* | Remove unused require. | Hendy Tanata | 2011-08-16 | 1 | -1/+0 |
| | |||||
* | Support for multi-table updates with limits, offsets and orders | Jon Leighton | 2011-08-15 | 1 | -0/+30 |
| | |||||
* | Support updates with joins. Fixes #522. | Jon Leighton | 2011-08-15 | 1 | -0/+8 |
| | |||||
* | Ensure empty has_many :through association preloaded via joins is marked as ↵ | Jon Leighton | 2011-08-15 | 1 | -0/+8 |
| | | | | loaded. Fixes #2054. | ||||
* | Fix default scope thread safety. Thanks @thedarkone for reporting. | Jon Leighton | 2011-08-13 | 1 | -0/+18 |
| | |||||
* | Merge pull request #2514 from myronmarston/fix_active_record_observer_disabling | José Valim | 2011-08-13 | 1 | -0/+12 |
|\ | | | | | Allow ActiveRecord observers to be disabled. | ||||
| * | Allow ActiveRecord observers to be disabled. | Myron Marston | 2011-08-12 | 1 | -0/+12 |
| | | | | | | We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on. | ||||
* | | Work around for lolruby bug. (Read on for explanation.) | Jon Leighton | 2011-08-13 | 2 | -5/+14 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were experiencing CI test failures, for example: * 3-1-stable: http://travis-ci.org/#!/rails/rails/builds/79473/L407 * master: http://travis-ci.org/#!/rails/rails/builds/79507/L80 These failures only happened on 1.8.7-p352, and we were only able to reproduce on the Travis CI VM worker. We even tried creating a new 32 bit Ubuntu VM and running the tests on that, and it all worked fine. After some epic trial and error, we discovered that replacing the following: fuu = Marshal.load(Marshal.dump(fuu)) with: marshalled = Marshal.dump(fuu) fuu = Marshal.load(marshalled) seemed to prevent the failure. We have NO IDEA why this is. If anyone has some great insight to contribute then that is welcome. Otherwise, hopefully this will just help us get the CI green again. Many thanks to @joshk for help with sorting this out. | ||||
* | Fully marshal AR::Base objects. Fixes #2431. | Jon Leighton | 2011-08-08 | 1 | -0/+13 |
| | |||||
* | Make it the responsibility of the connection to hold onto an ARel visitor ↵ | Jon Leighton | 2011-08-08 | 5 | -24/+19 |
| | | | | for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now. | ||||
* | Fixed test_disable_referential_integrity on Oracle | Raimonds Simanovskis | 2011-08-08 | 1 | -0/+3 |
| | | | On Oracle disable_referential_integrity before execution of block will disable foreign key constraints and after block will enable them but when constraints are enabled then they are validated. Therefore created record with invalid foreign key should be deleted before enabling foreign key constraints. | ||||
* | Revert "to_key on a destroyed model should return nil". Closes #2440 | Santiago Pastorino | 2011-08-05 | 1 | -1/+1 |
| | | | | This reverts commit c5448721b5054b8a467958d60427fdee15eac604. | ||||
* | Fix test for Rubinius | Santiago Pastorino | 2011-08-05 | 1 | -1/+1 |
| | |||||
* | pg does not allow aliases in the having clause, but functions are fine | Aaron Patterson | 2011-08-05 | 1 | -1/+1 |
| | |||||
* | Quote these dates to prevent intermittent test failure. Suppose local time ↵ | Jon Leighton | 2011-08-04 | 1 | -2/+2 |
| | | | | is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved. | ||||
* | Ensure that .up and .down work as well. | Christopher Meiklejohn | 2011-08-02 | 1 | -2/+13 |
| | |||||
* | Support backwards compatible interface for migration down/up with rails 3.0.x. | Christopher Meiklejohn | 2011-08-02 | 1 | -0/+24 |
| | |||||
* | remove extra require for 'stringio' as it is required in helper.rb | Vishnu Atrai | 2011-07-31 | 1 | -1/+0 |
| | |||||
* | 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 |
|/ | |||||
* | 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 | 1 | -0/+13 |
|\ | | | | | Fix after_initialize and Base.create edge case | ||||
| * | use existing model for testing Base.create with #after_initialize | Gabriel Horner | 2011-07-24 | 1 | -9/+7 |
| | | |||||
| * | simplify and be more explicit about create and after_initialize tests | Gabriel Horner | 2011-07-24 | 1 | -18/+10 |
| | | |||||
| * | fix after_initialize edge case (close #2074 and close #2175) | Les Fletcher | 2011-07-24 | 1 | -0/+23 |
| | | | | | | | | 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 |
| | |