aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-131-0/+4
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile
| * Document exclamation point on dynamic findersFlorent Guilleux2011-08-131-0/+4
| |
| * accept option for recreate db for postgres (same as mysql now)artemk2011-08-131-2/+4
| |
| * initializing @open_transactions in the initialize methodAaron Patterson2011-08-131-4/+2
| |
| * add a migrate class method and delegate to the new instanceAaron Patterson2011-08-131-1/+4
| |
| * Support backwards compatible interface for migration down/up with rails 3.0.x.Christopher Meiklejohn2011-08-131-0/+1
| |
| * default writing the schema file as utf-8Aaron Patterson2011-08-131-1/+2
| |
| * dump IO encoding value along with schema.rb so the file can be reloaded. ↵Aaron Patterson2011-08-131-0/+4
| | | | | | | | fixes #1592
| * Revert "Merge pull request #2309 from smasry/master"Jon Leighton2011-08-131-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 #1697Samer Masry2011-08-131-1/+1
| |
| * Fixed failing query when performing calculation with having based on select.Dmitriy Kiriyenko2011-08-131-0/+1
| |
| * Add a proxy_association method to association proxies, which can be called ↵Jon Leighton2011-08-132-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 variablesVishnu Atrai2011-08-131-1/+1
| |
| * Revert "allow select to have multiple arguments"Piotr Sarnacki2011-08-131-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.
| * allow select to have multiple argumentsSławosz Sławiński2011-08-131-3/+6
| |
| * Revert "Explicitly included hashes in sentence regarding SQL-injection-safe ↵Xavier Noria2011-08-131-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 Dev2011-08-131-9/+1
| | | | | | | | both sides on an association.
| * Explicitly included hashes in sentence regarding SQL-injection-safe formsPete Campbell2011-07-281-3/+3
| |
* | Perf: don't mess around with thread local vars unless we actually need toJon Leighton2011-08-131-18/+23
| |
* | Fix default scope thread safety. Thanks @thedarkone for reporting.Jon Leighton2011-08-131-15/+26
| |
* | Allow ActiveRecord observers to be disabled.Myron Marston2011-08-121-1/+1
| | | | | | We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on.
* | add the gem requirement for sqlite3Aaron Patterson2011-08-101-0/+2
| |
* | Remove TODO comment I didn't mean to commitJon Leighton2011-08-091-2/+0
| |
* | Fully marshal AR::Base objects. Fixes #2431.Jon Leighton2011-08-081-21/+0
| |
* | Make it the responsibility of the connection to hold onto an ARel visitor ↵Jon Leighton2011-08-0818-44/+103
| | | | | | | | 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.
* | sqlite transactions now loggedGustavo Delfino2011-08-061-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 #2440Santiago Pastorino2011-08-051-3/+2
| | | | | | | | This reverts commit c5448721b5054b8a467958d60427fdee15eac604.
* | Revert "Explicitly included hashes in sentence regarding SQL-injection-safe ↵Xavier Noria2011-08-041-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 Dev2011-08-041-9/+1
| | | | | | | | both sides on an association.
* | Explicitly included hashes in sentence regarding SQL-injection-safe formsPete Campbell2011-08-041-3/+3
| |
* | accept option for recreate db for postgres (same as mysql now)artemk2011-08-041-2/+4
| |
* | initializing @open_transactions in the initialize methodAaron Patterson2011-08-031-4/+2
| |
* | add a migrate class method and delegate to the new instanceAaron Patterson2011-08-021-1/+4
| |
* | Support backwards compatible interface for migration down/up with rails 3.0.x.Christopher Meiklejohn2011-08-021-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-291-0/+4
| | | | | | | | fixes #1592
* | Revert "Merge pull request #2309 from smasry/master"Jon Leighton2011-07-281-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 #1697Samer Masry2011-07-271-1/+1
| |
* | Fixed failing query when performing calculation with having based on select.Dmitriy Kiriyenko2011-07-271-0/+1
| |
* | Add a proxy_association method to association proxies, which can be called ↵Jon Leighton2011-07-272-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 variablesVishnu Atrai2011-07-261-1/+1
| |
* | Revert "allow select to have multiple arguments"Piotr Sarnacki2011-07-261-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_apiPiotr Sarnacki2011-07-261-3/+6
|\ \ | |/ |/| allow select to have multiple arguments ie. Post.select(:id,:name,:author)
| * allow select to have multiple argumentsSławosz Sławiński2011-07-261-3/+6
| |
* | 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-251-2/+1
|\ \ | | | | | | Fix after_initialize and Base.create edge case
| * | fix after_initialize edge case (close #2074 and close #2175)Les Fletcher2011-07-241-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.thedarkone2011-07-251-9/+5
| | |