aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251Santiago Pastorino2011-08-221-1/+1
|\ | | | | Use mysql_creation_options inside rescue block
| * Use mysql_creation_options inside rescue blockJonathon M. Abbott2011-08-141-1/+1
| | | | | | | | | | Commit ecd37084b28a05f05251 did not take into account the use of creation_options inside the access denied exception handler.
* | Merge pull request #2600 from al/finder_sql_example_updateXavier Noria2011-08-211-6/+10
|\ \ | | | | | | Updated the docs for the has_many :finder_sql option
| * | Updated the docs for the has_many :finder_sql option to reflect changes made ↵Alan Larkin2011-08-201-6/+10
| | | | | | | | | | | | in #a7e19b30ca71f62af516, i.e. the use of Procs when interpolation of the SQL is required.
* | | Fix PredicateBuilder clobbering select_values in subquery.Ernie Miller2011-08-202-1/+14
| | |
* | | Fix assumption of primary key name in PredicateBuilder subquery.Ernie Miller2011-08-202-1/+11
|/ /
* | prevent sql injection attacks by escaping quotes in column namesAaron Patterson2011-08-164-3/+20
| |
* | In 1efd88283ef68d912df215125951a87526768a51, ConnectionAdapters was put ↵Jon Leighton2011-08-163-14/+26
| | | | | | | | under eager_autoload. Due to the requires in that file, this caused ConnectionSpecification to be loaded, which references ActiveRecord::Base, which means the database connection is established. We do not want to connect to the database when Active Record is loaded, only when ActiveRecord::Base is first referenced by the user.
* | Revert "Merge pull request #2543 from htanata/unused_require_in_ar_test"Santiago Pastorino2011-08-161-0/+1
| | | | | | | | | | This reverts commit 87152f2604e73b218df90befda576f0acfed0bbf, reversing changes made to 0d3615f04c79f6e90d8ab33fdfc920b8faac9cb8.
* | Remove unused require.Hendy Tanata2011-08-161-1/+0
| |
* | Bump arel dependencyJon Leighton2011-08-151-1/+1
| |
* | Use new SelectManager#source methodJon Leighton2011-08-152-2/+2
| |
* | Use new SelectManager#projections= methodJon Leighton2011-08-153-4/+4
| |
* | use update.key instead of update.ast.key. make better use of select manager.Jon Leighton2011-08-153-26/+18
| |
* | Use a SelectCore rather than a full SelectManagerJon Leighton2011-08-152-4/+6
| |
* | Refactor building the update managerJon Leighton2011-08-154-16/+13
| |
* | Support for multi-table updates with limits, offsets and ordersJon Leighton2011-08-154-2/+77
| |
* | Support updates with joins. Fixes #522.Jon Leighton2011-08-155-4/+34
| |
* | Ensure empty has_many :through association preloaded via joins is marked as ↵Jon Leighton2011-08-152-3/+10
| | | | | | | | loaded. Fixes #2054.
* | Fix private methods which are delegated to. This previously worked because ↵Jon Leighton2011-08-152-13/+13
|/ | | | Module#delegate previously ignored method visibility.
* Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-132-1/+5
|\ | | | | | | | | | | | | | | | | | | | | 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
| |
| * Rubygems => RubyGemsSukeerthi Adiga2011-08-131-1/+1
| |
| * Quote these dates to prevent intermittent test failure. Suppose local time ↵Jon Leighton2011-08-132-4/+4
| | | | | | | | 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.
| * 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
| |
| * Ensure that .up and .down work as well.Christopher Meiklejohn2011-08-131-2/+13
| |
| * Support backwards compatible interface for migration down/up with rails 3.0.x.Christopher Meiklejohn2011-08-132-0/+25
| |
| * remove extra require for 'stringio' as it is required in helper.rbVishnu Atrai2011-08-131-1/+0
| |
| * magic comment test only if encoding_aware?.Arun Agrawal2011-08-131-3/+4
| |
| * Resolve warnings by instantizing @attrubtes as nilBrian Cardarella2011-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-132-3/+16
| | | | | | | | fixes #1592
| * Revert "Merge pull request #2309 from smasry/master"Jon Leighton2011-08-132-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-08-132-1/+6
| |
| * Fixed failing query when performing calculation with having based on select.Dmitriy Kiriyenko2011-08-132-0/+8
| |
| * Add a proxy_association method to association proxies, which can be called ↵Jon Leighton2011-08-134-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-08-131-1/+1
| | | | | | | | even spaces
| * 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-132-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.
| * allow select to have multiple argumentsSławosz Sławiński2011-08-132-3/+11
| |
| * Simplify the test by using id and name. `id` will be the only real sort ↵Franck Verrot2011-08-131-1/+1
| | | | | | | | criteria in any case as it's unique.
| * 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.
| * Removed trailing slash of 'Download and installation' Github URL as per ↵ejy2011-07-281-1/+1
| | | | | | | | convention
| * 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-133-15/+53
| |
* | Merge pull request #2514 from myronmarston/fix_active_record_observer_disablingJosé Valim2011-08-132-1/+13
|\ \ | | | | | | Allow ActiveRecord observers to be disabled.