aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Deprecate `:mouseover` options for `image_tag` helper."Rafael Mendonça França2012-08-013-42/+10
| | | | | | | This reverts commit 1aff7725c7a04cde202cca906208560a55409e6a. Conflicts: actionpack/CHANGELOG.md
* Revert "Deprecate ActiveSupport::JSON::Variable"Rafael Mendonça França2012-08-013-23/+14
| | | | This reverts commit bcfa013399fd2c5b5d25c38912cba3560de1cc57.
* Fix CHANGELOGSRafael Mendonça França2012-08-012-14/+38
|
* removes the deprecation of update_attributeXavier Noria2012-08-012-3/+2
| | | | Applying the new policy here to not deprecate stuff in point releases.
* revises the deprecation warning of update_attributeXavier Noria2012-08-012-2/+2
| | | | | | | We have decided not to drop this important method in 4.0 and give it a longer deprecation cycle. On the other hand we do not expect to have update_column around for a long time, it is going to be replaced in favor of update_columns.
* Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` ↵Rafael Mendonça França2012-08-018-188/+63
| | | | | | | | | | | option" Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers." This reverts commit fc092a9cba5fceec38358072e50e09250cf58840. This reverts commit e9051e20aeb2c666db06b6217954737665878db7. This reverts commit d47d6e7eda3aa3e6aa28d0c17ac6801234bb97d1. This reverts commit 21141e777bdce8534e3755c8de7268324b3d8714.
* Revert "Deprecating composed_of in ActiveRecord"Rafael Mendonça França2012-08-015-24/+7
| | | | This reverts commit 44b313bc4e3762da64dde7894548f81c595147de.
* Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-018-97/+38
| | | | | | | | | | This reverts commit a79bfa92e7bdc31b346d13ee5447d3fdac382bfb. Conflicts: activerecord/CHANGELOG.md We shouldn't introducing deprecations in point releases. It will be deprecated in 4.0 instead.
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-017-10/+41
| | | | [ci skip]
* Merge pull request #7070 from jmazzi/3-2-stableRafael Mendonça França2012-08-011-3/+6
|\ | | | | Update documentation for Rails::Application#env_config
| * Update documentation for Rails::Application#env_configJustin Mazzi2012-07-161-3/+6
| |
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docsRafael Mendonça França2012-07-311-4/+3
| | | | | | | | Updated scaffold_controller generator docs #7146
* | Add CHANGELOG entry [ci skip]Rafael Mendonça França2012-07-311-0/+8
| |
* | Revert "Add update_columns and the suggestion of using update_columnsRafael Mendonça França2012-07-304-78/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of update_column" This reverts commit 9fa06c3d9811113259cb6e00a3a8454b3974add7. This reverts commit 17a64de4980683da3ca3c185205013a29a8cf88d. This reverts commit def9c85ffbdcf63e6c412b6bd4abafaa32ccdb5c, reversing changes made to 6b7d26cf3c061907aedc44f7f36776c9b36950fd. Reason: This was supposed to be released with 3.2.7 before the suggestion to use update_column. Since it was not release now is not good to suggest to use another method because it will confusing the people.
* | removes the AR session store from eager loaded code [fixes #7160]Xavier Noria2012-07-291-1/+10
| | | | | | | | | | See the comment in the file activerecord/lib/active_record.rb added by this patch for the rationale.
* | Merge pull request #7187 from frodsan/fix_test_helpRafael Mendonça França2012-07-281-2/+2
|\ \ | | | | | | Backport #6995 to 3-2 stable
| * | Backport #6995 to 3-2 stableFrancesco Rodriguez2012-07-281-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | Update `test_help` to config properly turn natural language option. Last versions of Turn don't monkey patch MiniTest to setup the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3). This patches the following behaviour: $ rake test:units `<top (required)>': undefined method `use_natural_language_case_names=' for MiniTest::Unit:Class (NoMethodError)
* | missing require: the AR session store depends on the AP abstract storeXavier Noria2012-07-281-0/+2
| | | | | | | | | | | | | | | | This require makes the dependency even more clear. In particular we are eager loading the session store but that does not work if AR is used outside Rails, this patch is preliminary work in fixing #7160.
* | adds a missing require from Active SupportXavier Noria2012-07-281-0/+1
| | | | | | | | This file uses mattr_accessor.
* | Only require the `:rails_env` task where is needed.Rafael Mendonça França2012-07-271-13/+13
| | | | | | | | | | | | | | | | | | | | `:rails_env` tasks is not needed in all the tasks that depends of `load_config`, only in the tasks that uses `Rails.env`. Since `:rails_env` task set the `Rails.env` to be "development" if it is not set we don't need the `||` statements too Fix #7175.
* | Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-07-2617-12/+57
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-rel: updating release date bumping to 3.2.7 updating the changelog * Do not convert digest auth strings to symbols. CVE-2012-3424 updating the version updating changelogs
| * | updating release dateAaron Patterson2012-07-267-7/+7
| | |
| * | bumping to 3.2.7Aaron Patterson2012-07-269-9/+9
| | |
| * | updating the changelogAaron Patterson2012-07-261-0/+2
| | |
| * | * Do not convert digest auth strings to symbols. CVE-2012-3424Aaron Patterson2012-07-261-2/+2
| | |
| * | updating the versionAaron Patterson2012-07-238-16/+16
| | |
| * | updating changelogsAaron Patterson2012-07-237-1/+44
| | |
* | | Merge pull request #7164 from parndt/patch-4Rafael Mendonça França2012-07-251-1/+1
|\ \ \ | | | | | | | | Switched update_column recommendation in changelog to update_columns
| * | | Switched update_column recommendation in changelog to update_columnsPhilip Arndt2012-07-261-1/+1
|/ / / | | | | | | This is related to #7159
* | | Fix AR#update_columns tests on Ruby 1.8.7Carlos Antonio da Silva2012-07-251-7/+7
| | |
* | | Merge pull request #7159 from parndt/update_columnsAaron Patterson2012-07-253-1/+77
|\ \ \ | |/ / |/| | Backport update_columns to Rails 3.2
| * | Suggest using update_columns instead of update_column.Philip Arndt2012-07-261-1/+1
| | | | | | | | | | | | | | | | | | update_column is deprecated in Rails 4.0 so it makes no sense to recommend adopting it only to require changing to update_columns in the very next release.
| * | New #update_columns method.Sebastian Martinez2012-07-263-0/+76
|/ /
* | Bump Journey requirements to 1.0.4Andrew White2012-07-231-1/+1
| | | | | | | | | | There are some Action Pack tests for regressions from 3.1 that require a later version of Journey to pass so bump to the current version.
* | Hash#fetch(fetch) is not the same as doing hash[key]Xavier Noria2012-07-211-1/+11
| |
* | `validates_inclusion_of` and `validates_exclusion_of` now acceptRafael Mendonça França2012-07-205-10/+60
| | | | | | | | | | | | `:within` option as alias of `:in` as documented. Fix #7118
* | Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-07-208-35/+108
| |
* | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-07-191-0/+3
| | | | | | | | Resolver tests fail if mysql adapter not installed
* | Merge pull request #7108 from arunagw/mocha_bumpRafael Mendonça França2012-07-191-1/+1
|\ \ | | | | | | Bumping mocha!
| * | Bumping mocha!Arun Agrawal2012-07-191-1/+1
| |/ | | | | | | | | Reason:- 0.12.0 introduced a bug where you got a exception which is now in 0.12.1 is a warning only!
* | Merge pull request #7080 from jfirebaugh/to_param_regressionJon Leighton2012-07-172-1/+7
|\ \ | | | | | | AR::Integration must be included after AM::Conversion
| * | AR::Integration must be included after AM::ConversionJohn Firebaugh2012-07-172-1/+7
|/ / | | | | | | | | | | Integration's definition of #to_param must override Conversion's. Otherwise, there is a regression from 3.1 in the behavior of a non-persisted AR::Base instance which nevertheless has an id.
* | Add support for optional root segments containing slashesAndrew White2012-07-172-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optional segments with a root scope need to have the leading slash outside of the parentheses, otherwise the generated url will be empty. However if the route has non-optional elements then the leading slash needs to remain inside the parentheses otherwise the generated url will have two leading slashes, e.g: Blog::Application.routes.draw do get '/(:category)', :to => 'posts#index', :as => :root get '/(:category)/author/:name', :to => 'posts#author', :as => :author end $ rake routes root GET /(:category)(.:format) posts#index author GET (/:category)/author/:name(.:format) posts#author This change adds support for optional segments that contain a slash, allowing support for urls like /page/2 for the root path, e.g: Blog::Application.routes.draw do get '/(page/:page)', :to => 'posts#index', :as => :root end $ rake routes root GET /(page/:page)(.:format) posts#index Fixes #7073 (cherry picked from commit d8745decaf59aad32aa2f09abdba99b8d0e48b31)
* | Merge pull request #4396 from kennyj/fix_4259Rafael Mendonça França2012-07-172-4/+40
|/ | | | Fix GH #4259. When we execute schema dumper, we must remove table_name_prefix and table_name_suffix.
* adds a missing require [fixes #6896]Xavier Noria2012-07-152-1/+1
| | | | | This file uses Time.zone, which is defined in active_support/core_ext/time/zones.rb.
* fixing tests to deal with data differences between prepared statements and ↵Aaron Patterson2012-07-133-3/+8
| | | | non-prepared statements
* Fixing texts; down to three failing tests.Jeremy Cole2012-07-132-15/+24
|
* Only use prepared statements when bind variables are presentJeremy Cole2012-07-131-34/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepared statements (prepare/execute/close) were being used unnecessarily when no bind variables were present, and disabling prepared statement using prepared_statements:false was principally broken. While bind variables were correctly substituted with prepared_statements:false, the prepared statement interface was still used, costing an extra two round trips per query. In addition to making this behavioral change, I also cleaned up the internals of exec_stmt and exec_without_stmt so that they behave the same (calling log and constructing the ActiveRecord::Result in the same way). Moving the check for binds.empty? to exec_query also will mean that several code paths explicitly calling exec_without_stmt could be cleaned up to once again call exec_query instead. I have also left the check for binds.empty? in exec_stmt, since it is not a private method and could be called directly with an empty binds array. For the sake of clarity in this patch, I have not made those changes. = The previous behavior = When issuing a Foo.find(1) with prepared_statements:true, the bind variable is present in the prepared query, and execute shows a value passed: Connect root@localhost on rails_test Query SET SQL_AUTO_IS_NULL=0 Statistics Query SHOW FULL FIELDS FROM `foos` Query SHOW TABLES LIKE 'foos' Query SHOW CREATE TABLE `foos` Prepare SELECT `foos`.* FROM `foos` WHERE `foos`.`id` = ? LIMIT 1 Execute SELECT `foos`.* FROM `foos` WHERE `foos`.`id` = 1 LIMIT 1 Close stmt Quit When issuing a Foo.find(1) with prepared_statements:false, the bind variable has already been removed and substituted with the value, but the prepared statement interface is used anyway: Connect root@localhost on rails_test Query SET SQL_AUTO_IS_NULL=0 Statistics Query SHOW FULL FIELDS FROM `foos` Query SHOW TABLES LIKE 'foos' Query SHOW CREATE TABLE `foos` Prepare SELECT `foos`.* FROM `foos` WHERE `foos`.`id` = 1 LIMIT 1 Execute SELECT `foos`.* FROM `foos` WHERE `foos`.`id` = 1 LIMIT 1 Close stmt Quit = With this patch applied = When issuing a Foo.find(1) with prepared_statements:true, the bind variable is present in the prepared query, and execute shows a value passed: Connect root@localhost on rails_test Query SET SQL_AUTO_IS_NULL=0 Statistics Query SHOW FULL FIELDS FROM `foos` Query SHOW TABLES LIKE 'foos' Query SHOW CREATE TABLE `foos` Prepare SELECT `foos`.* FROM `foos` WHERE `foos`.`id` = ? LIMIT 1 Execute SELECT `foos`.* FROM `foos` WHERE `foos`.`id` = 1 LIMIT 1 Close stmt Quit When issuing a Foo.find(1) with prepared_statements:false, the bind variable has been removed and substituted with the value, and the query interface is used instead of the prepared statement interface: Connect root@localhost on rails_test Query SET SQL_AUTO_IS_NULL=0 Statistics Query SHOW FULL FIELDS FROM `foos` Query SHOW TABLES LIKE 'foos' Query SHOW CREATE TABLE `foos` Query SELECT `foos`.* FROM `foos` WHERE `foos`.`id` = 1 LIMIT 1 Quit
* Merge pull request #7031 from robbkidd/rename_sequences_too_backport_to_3-2Piotr Sarnacki2012-07-112-0/+27
|\ | | | | Back-port #6874 to 3.2: psql adapter should rename a default pk sequence during rename_table
| * Update psql adapter to rename a default pkey sequence during rename_table.Robb Kidd2012-07-102-0/+27
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:53:24 +0000