aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Do not consider the numeric attribute as changed if the old value isRafael Mendonça França2012-08-023-2/+21
| | | | | | | | | | | | | | | | | | | | zero and the new value is not a string. Before this commit this was the behavior r = Review.find_by_issue(0) r.issue => 0 r.changes => {} r.issue = 0 => 0 r.changed? => true r.changes => {"issue"=>[0,0]} Fixes #7237
* Backport #5168 to 3-2-stable. Fix a problem that NULLS is ignored by ↵kennyj2012-08-022-1/+6
| | | | postgresql_adapter.rb while creating distincts.
* This entry is wrongSantiago Pastorino2012-08-011-2/+0
|
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-011-2/+2
|
* Fix CHANGELOGSRafael Mendonça França2012-08-011-3/+16
|
* 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 "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-011-0/+6
| | | | [ci skip]
* 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-303-76/+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.
* 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.
* 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-262-2/+2
|\ | | | | | | | | | | | | | | | | | | * 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-261-1/+1
| |
| * bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
| |
| * updating the versionAaron Patterson2012-07-231-2/+2
| |
* | 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
| |
* | 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-262-0/+74
|/
* 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
* 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.
* 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.
* 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
* Update psql adapter to rename a default pkey sequence during rename_table.Robb Kidd2012-07-102-0/+27
|
* Merge pull request #6985 from sidonath/disable-query-cache-for-locksRafael Mendonça França2012-07-062-1/+17
| | | | | | Disable query cache for lock queries Conflicts: activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
* Backport #3329 to 3-2-stableFrancesco Rodriguez2012-07-022-15/+31
| | | | | | | Fix bug with autosave collection association on new record with a marked for destroy record in autosave collection. Fixes #6918.
* Merge pull request #6878 from masarakki/masterRafael Mendonça França2012-06-285-0/+41
| | | | | | fix bug in limit of enum columns of mysql Closes #6432
* Merge pull request #6900 from cbandy/issue-6898Carlos Antonio da Silva2012-06-281-0/+2
| | | | | | Require URI in ConnectionSpecification Conflicts: activerecord/lib/active_record/connection_adapters/connection_specification.rb
* Ensure Arel columns are typecasted properly when grouping with calculationCarlos Antonio da Silva2012-06-252-5/+9
| | | | | | | | Fix build issue with postgresql. Conflicts: activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb
* Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculationsRafael Mendonça França2012-06-242-6/+22
| | | | | | Stop assuming strings for grouped calculations Conflicts: activerecord/lib/active_record/relation/calculations.rb
* Remove waning of unused variableRafael Mendonça França2012-06-211-1/+0
|
* Merge branch 'acapilleri-update_nested_attributes'Rafael Mendonça França2012-06-212-5/+25
| | | | | | | Closes #6675 Conflicts: activerecord/lib/active_record/attribute_methods/dirty.rb
* Merge pull request #6758 from caironoleto/masterJosé Valim2012-06-181-13/+13
| | | | | | Fixing load config in some tasks Conflicts: activerecord/lib/active_record/railties/databases.rake
* Deprecating composed_of in ActiveRecordSteve Klabnik2012-06-185-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature adds a lot of complication to ActiveRecord for dubious value. Let's talk about what it does currently: class Customer < ActiveRecord::Base composed_of :balance, :class_name => "Money", :mapping => %w(balance amount) end Instead, you can do something like this: def balance @balance ||= Money.new(value, currency) end def balance=(balance) self[:value] = balance.value self[:currency] = balance.currency @balance = balance end Since that's fairly easy code to write, and doesn't need anything extra from the framework, if you use composed_of today, you'll have to add accessors/mutators like that. This feature will be removed in Rails 4.
* Remove unneded tests.Rafael Mendonça França2012-06-141-11/+1
| | | | | | | Before b081f6b59fb3f15d12043072ad9b331ffd2bc56e, this test are asserting that update_attribute does the dirty tracking. Since we deprecated this method and update_column write in the database directly this tests will always fail.
* registers the deprecation of update_attribute in the CHANGELOGXavier Noria2012-06-141-0/+8
|
* Deprecate update_attribute.Steve Klabnik2012-06-147-17/+41
| | | | | | | | | | | Historically, update_attribute and update_attributes are similar, but with one big difference: update_attribute does not run validations. These two methods are really easy to confuse given their similar names. Therefore, update_attribute is being deprecated in favor of update_column, and will be removed in Rails 4. See the discussion on rails-core here: https://groups.google.com/d/topic/rubyonrails-core/BWPUTK7WvYA/discussion
* Merge branch '3-2-stable-rel' into 3-2-stableAaron Patterson2012-06-124-5/+17
|\ | | | | | | | | | | | | | | | | | | * 3-2-stable-rel: updating changelogs bumping version numbers updating changelogs with security fixes updating changelogs Array parameters should not contain nil values. Additional fix for CVE-2012-2661
| * updating changelogsAaron Patterson2012-06-121-1/+3
| |
| * bumping version numbersAaron Patterson2012-06-111-1/+1
| |
| * updating changelogs with security fixesAaron Patterson2012-06-111-0/+4
| |
| * Additional fix for CVE-2012-2661Ernie Miller2012-06-112-3/+9
| | | | | | | | | | | | | | | | While the patched PredicateBuilder in 3.1.5 prevents a user from specifying a table name using the `table.column` format, it doesn't protect against the nesting of hashes changing the table context in the next call to build_from_hash. This fix covers this case as well.
* | Merge pull request #6715 from arunagw/add_assertsRafael Mendonça França2012-06-121-2/+2
| | | | | | | | Need a assert here in tests