Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | sqlite transactions now logged | Gustavo Delfino | 2011-08-06 | 1 | -3/+3 |
| | | | motivation: http://stackoverflow.com/questions/6892630/sqlite-transactions-not-showing-in-test-log | ||||
* | Revert "to_key on a destroyed model should return nil". Closes #2440 | Santiago Pastorino | 2011-08-05 | 1 | -3/+2 |
| | | | | This reverts commit c5448721b5054b8a467958d60427fdee15eac604. | ||||
* | Revert "Explicitly included hashes in sentence regarding SQL-injection-safe ↵ | Xavier Noria | 2011-08-04 | 1 | -3/+3 |
| | | | | | | | | forms" Reason: The hash form is secure, and preferred over the array form if possible. This reverts commit 6dc749596c328c44c80f898d5fa860fff6cab783. | ||||
* | make the warning clear about the effect of using validates_associated on ↵ | Vijay Dev | 2011-08-04 | 1 | -9/+1 |
| | | | | both sides on an association. | ||||
* | Explicitly included hashes in sentence regarding SQL-injection-safe forms | Pete Campbell | 2011-08-04 | 1 | -3/+3 |
| | |||||
* | accept option for recreate db for postgres (same as mysql now) | artemk | 2011-08-04 | 1 | -2/+4 |
| | |||||
* | initializing @open_transactions in the initialize method | Aaron Patterson | 2011-08-03 | 1 | -4/+2 |
| | |||||
* | add a migrate class method and delegate to the new instance | Aaron Patterson | 2011-08-02 | 1 | -1/+4 |
| | |||||
* | Support backwards compatible interface for migration down/up with rails 3.0.x. | Christopher Meiklejohn | 2011-08-02 | 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 | 1 | -0/+4 |
| | | | | fixes #1592 | ||||
* | Revert "Merge pull request #2309 from smasry/master" | Jon Leighton | 2011-07-28 | 1 | -1/+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 | 1 | -1/+1 |
| | |||||
* | Fixed failing query when performing calculation with having based on select. | Dmitriy Kiriyenko | 2011-07-27 | 1 | -0/+1 |
| | |||||
* | Add a proxy_association method to association proxies, which can be called ↵ | Jon Leighton | 2011-07-27 | 2 | -6/+16 |
| | | | | by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner. | ||||
* | 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 | 1 | -6/+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 | 1 | -3/+6 |
|\ | | | | | 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 | -3/+6 |
| | | |||||
* | | 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 | 1 | -2/+1 |
|\ \ | | | | | | | Fix after_initialize and Base.create edge case | ||||
| * | | fix after_initialize edge case (close #2074 and close #2175) | Les Fletcher | 2011-07-24 | 1 | -2/+1 |
| | | | | | | | | | | | | 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 | -9/+5 |
| | | | |||||
* | | | Merge pull request #2238 from cesario/order-with-extra-spaces | Aaron Patterson | 2011-07-24 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | 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/+1 |
| |/ | |||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-24 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Changed a few instances of of words in the API docs written in British ↵ | Oemuer Oezkir | 2011-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | English to American English(according to Weber) | ||||
* | | Merge pull request #2185 from castlerock/lazy_load_abstract_adapter | Aaron Patterson | 2011-07-23 | 1 | -2/+0 |
|\ \ | | | | | | | lazy load ConnectionAdapters remove require. | ||||
| * | | lazy load ConnectionAdapters remove require. | Vishnu Atrai | 2011-07-22 | 1 | -2/+0 |
| | | | |||||
* | | | Merge pull request #2086 from amatsuda/date_multiparameter_nil | Xavier Noria | 2011-07-23 | 1 | -3/+6 |
|\ \ \ | | | | | | | | | 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 | -3/+6 |
| | | | | |||||
* | | | | 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 |
| | | | | | |||||
* | | | | | Fixes typo | Vijay Dev | 2011-07-22 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | adding more tests around database uri parsing | Aaron Patterson | 2011-07-21 | 1 | -5/+3 |
| | | | | |||||
* | | | | 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 | 1 | -1/+1 |
| | | | | |||||
* | | | | Provide database connection settings as a URL. | Glenn Gillen | 2011-07-20 | 1 | -0/+22 |
| | | | | |||||
* | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | bigdecimal should be typecast to a float on sqlite3. fixes #2162 | Aaron Patterson | 2011-07-20 | 1 | -0/+5 |
| |/ / |/| | | |||||
* | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | generates valid SQL | ||||
* | | | Merge pull request #195 from bigfix/active_model_include_serialization | José Valim | 2011-07-18 | 2 | -81/+1 |
|\ \ \ | | | | | | | | | 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. |