aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
* Fix build. It seems that the Mocha's behavior were changed.kennyj2012-04-242-3/+9
|
* Be sure to correctly fetch PK name from MySQL even if the PK has some custom ↵Akira Matsuda2012-04-191-0/+30
| | | | | | | | | | | option Backports #5900 Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
* Adds test to check that circular preloading does not modify Model.unscoped ↵Benedikt Deicke2012-04-193-4/+26
| | | | | | | | (as described in #5667) Conflicts: activerecord/test/cases/associations/eager_test.rb
* Removes caching from ActiveRecord::Core::ClassMethods#relationBenedikt Deicke2012-04-191-0/+4
| | | | | | | | | | | | | | | The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place. The four places with calls to relations are: activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'" activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'" activerecord/lib/active_record/scoping/named.rb:38:in `scoped'" activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'" Conflicts: activerecord/lib/active_record/core.rb
* Revert "Fix #5667. Preloading should ignore scoping."Jeremy Kemper2012-04-181-11/+0
| | | | | | | | Causes a subtle regression where record.reload includes the default scope. Hard to reproduce in isolation. Seems like the relation is getting infected by some previous usage. This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.
* Fix tests of benchmark with silence equals to trueRafael Mendonça França2012-04-041-3/+1
|
* Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_selectAaron Patterson2012-03-301-11/+6
|\ | | | | Fixing Identity Map when using find select in rails 3.2
| * refactor the checking of the attributes of the record in IdentityMap#add, so ↵Arturo Pie2012-03-291-4/+5
| | | | | | | | it's more readable
| * Adds a test that breaks IM when using #selectArturo Pie2012-03-291-12/+6
| |
* | Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-301-0/+11
|/ | | | | | Conflicts: activerecord/test/cases/associations/eager_test.rb
* Merge pull request #5640 from yahonda/address_ora_00918_with_oracleSantiago Pastorino2012-03-281-1/+1
|\ | | | | Address an error for test_has_many_through_polymorphic_has_one with Oracle
| * Change the order argument from ('id') to ('taggings.id')Yasuo Honda2012-03-281-1/+1
| | | | | | | | to address ORA-00918 error
* | Test for #5549.Aaron Patterson2012-03-282-1/+16
| | | | | | | | | | | | | | | | Cherry-picked from e96d04a2e4e244ea5053cb4e8ab97db604d0c796. Conflicts: activerecord/lib/active_record/attribute_methods/read.rb
* | force datetime attributes to be changedSergey Nartimov2012-03-271-0/+14
|/ | | | backport ddb5d2f756d9d2655a07791a3b62832efd588474 to 3-2-stable
* Merge pull request #5537 from kennyj/fix_4399-32Aaron Patterson2012-03-231-0/+12
|\ | | | | [3-2-stable] migrate(:down) method with table_name_prefix
| * migrate(:down) method with table_name_prefixkennyj2012-03-211-0/+12
| |
* | Fix identity map testsCarlos Antonio da Silva2012-03-231-16/+16
| |
* | Add order to tests that rely on db ordering, to fix failing tests on pgCarlos Antonio da Silva2012-03-2213-46/+45
|/ | | | | | | Also skip persistente tests related to UPDATE + ORDER BY for postgresql PostgreSQL does not support updates with order by, and these tests are failing randomly depending on the fixture loading order now.
* Merge pull request #5437 from kennyj/fix_5430Aaron Patterson2012-03-151-0/+7
| | | | Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
* [3-2-stable] Fix GH #5399. connection_pools's keys are ↵kennyj2012-03-141-1/+7
| | | | ActiveRecord::Base::ConnectionSpecification objects.
* fix activerecord query_method regression with offset into FixnumDenis Jean2012-03-131-0/+4
| | | | | | add test to show offset query_methods on mysql & mysql2 change test to cover public API
* make sure connections returned after close are marked as in_useAaron Patterson2012-03-121-0/+10
|
* Add dynamic find_or_create_by_{attribute}! method.Andrew White2012-03-124-0/+52
| | | | | | | | | (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/dynamic_finder_match.rb
* Not need to pass join attributes to association buildRafael Mendonça França2012-03-083-12/+11
|
* Add test case to has_many through association when mass_assignment_sanitizer isRafael Mendonça França2012-03-084-4/+34
| | | | | | | | :strict Conflicts: activerecord/test/models/person.rb
* ensure that released connections move between threadsAaron Patterson2012-03-081-0/+18
|
* make active_connection? return true only if there is an open connection in ↵Aaron Patterson2012-03-081-0/+42
| | | | use for the current thread. fixes #5330
* Add tests to test that through associations are not readonly, and we can ↵kuahyeow2012-03-081-0/+11
| | | | update the records we retrive from the association
* Merge pull request #5316 from Jacobkg/masterJosé Valim2012-03-071-0/+3
| | | | Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
* Fix #5069 - Protect foreign key from mass assignment throught association ↵Jean Boussier2012-03-052-0/+38
| | | | builder
* Only run binary type cast test with encode! on Ruby 1.9Carlos Antonio da Silva2012-03-041-6/+8
|
* only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-021-0/+9
| | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
* Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.kennyj2012-02-292-3/+3
|
* Merge pull request #5096 from lawso017/masterAaron Patterson2012-02-211-3/+7
| | | | Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
* fix test with ruby 187-p358Arun Agrawal2012-02-181-1/+5
|
* Use real table and columns for index testRafael Mendonça França2012-02-081-3/+3
|
* Push proper test changes for previous commit conflicts.José Valim2012-02-081-2/+4
|
* Handle nil in add_index :length option in MySQLPaul Sadauskas2012-02-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | Our schema.rb is being generated with an `add_index` line similar to this: add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil} This is the same as it was on Rails 3.1.3, however, now when that schema.rb is evaluated, its generating bad SQL in MySQL: Mysql::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1: CREATE UNIQUE INDEX `xxx` ON `foo` (`foo`(8), `bar`()) This commit adds a check for nil on the length attribute to prevent the empty parens from being output. Conflicts: activerecord/test/cases/migration/index_test.rb Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix attribute_before_type_cast for serialized attributes. Fixes #4837.Jon Leighton2012-02-071-0/+15
| | | | | | Conflicts: activerecord/lib/active_record/core.rb
* let automatic EXPLAIN ignore CACHE notificationsXavier Noria2012-02-031-0/+48
|
* Merge pull request #4809 from cfeist/feist-sqlite-binary-corruptionAaron Patterson2012-02-022-1/+2
| | | | Fix for SQLite binary data corrupter (to master branch)
* Merge pull request #4543 from jdelStrother/find_or_initJon Leighton2012-02-011-0/+12
| | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by
* Fix broken tests added by 85c724d59Rafael Mendonça França2012-01-313-13/+13
|
* Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-312-0/+5
| | | | ids_reader method fixed, test added to has_many association (for PostgreSQL)
* Allow writing unknown attributes, but with a deprecation warning. Closes #4583.Jon Leighton2012-01-311-0/+7
|
* Add workaround and deprecation if the inherited hook is not executed. Closes ↵Jon Leighton2012-01-311-0/+10
| | | | #4757.
* Merge pull request #4763 from kennyj/fix_4754Jon Leighton2012-01-311-0/+16
| | | | [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
* Merge pull request #4715 from pwim/find-create-multi-argsJon Leighton2012-01-271-0/+11
| | | | Fix regression from Rails 3.1
* Merge pull request #4696 from rafaelfranca/issue-4653Aaron Patterson2012-01-261-2/+0
|\ | | | | Remove extra attributes from HABTM join tables in AR tests
| * Remove extra attributes from HABTM join tables in AR testsRafael Mendonça França2012-01-261-2/+0
| | | | | | | | | | | | | | | | | | HABTM Join tables should not have extra attributes When extra attributes is needed in HABTM join tables is better to use `has_many :through` association. Fix #4653