aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-01-171-0/+6
|\ | | | | | | | | | | | | * master: fix exception translation translate exceptions on prepared statement failure test to ensure bad prepared statements raise a StatementInvalid exception
| * fix exception translationAaron Patterson2014-01-172-3/+4
| |
| * translate exceptions on prepared statement failureAaron Patterson2014-01-172-6/+13
| |
| * test to ensure bad prepared statements raise a StatementInvalid exceptionAaron Patterson2014-01-171-0/+6
| |
* | fix the method signatureAaron Patterson2014-01-171-1/+1
| |
* | run the damn tests @tenderloveAaron Patterson2014-01-172-2/+2
| |
* | Merge branch 'adequaterecord' of github.com:rails/rails into adequaterecordAaron Patterson2014-01-171-1/+0
|\ \ | | | | | | | | | | | | * 'adequaterecord' of github.com:rails/rails: Remove outdated comment.
| * | Remove outdated comment.Rafael Mendonça França2014-01-171-1/+0
| | | | | | | | | | | | | | | | | | | | | The code duplication was removed and this comment is pointing to the wrong line. [ci skip]
* | | oops!Aaron Patterson2014-01-171-1/+1
|/ /
* | don't cache the connection (because we don't need to)Aaron Patterson2014-01-171-8/+7
| |
* | fixing explain tests for sqlite3Aaron Patterson2014-01-171-13/+13
| |
* | Revert "adding set_binds"Aaron Patterson2014-01-171-8/+0
| | | | | | | | This reverts commit 474ebc55bd13ad58626a49dfc44c8e6407813935.
* | remove dead codeAaron Patterson2014-01-172-8/+1
| |
* | Merge branch 'master' into adequaterecordAaron Patterson2014-01-173-178/+155
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix eager load of Serializers on Active Model Consistence in the block style Remove warnings on Ruby 2.1 Only some dynamic finders are deprecated. clean up security guide: his => their [ci skip] Remove warning Extract a method to simplify setup code Use minitest's skip rather than conditionals + early returns Move AR test classes inside the test case Do not set up a variable used only in two tests No need for instance vars on single tests Cleanup duplicated setup of callbacks in transactions tests No need to use #send with public methods Update deprecation warning to give more information about caller Update changelog Avoid scanning multiple render calls as a single match. Improve ERB dependency detection.
| * Extract a method to simplify setup codeCarlos Antonio da Silva2014-01-161-23/+27
| |
| * Use minitest's skip rather than conditionals + early returnsCarlos Antonio da Silva2014-01-161-47/+38
| |
| * Move AR test classes inside the test caseCarlos Antonio da Silva2014-01-161-38/+46
| |
| * Do not set up a variable used only in two testsCarlos Antonio da Silva2014-01-161-15/+18
| | | | | | | | | | Just create a local variable whenever we need the record, rather than doing an extra find for every test on the setup method.
| * No need for instance vars on single testsCarlos Antonio da Silva2014-01-161-8/+8
| |
| * Cleanup duplicated setup of callbacks in transactions testsCarlos Antonio da Silva2014-01-161-48/+19
| |
| * No need to use #send with public methodsCarlos Antonio da Silva2014-01-161-10/+10
| |
| * Update deprecation warning to give more information about callerT.J. Schuck2014-01-161-2/+2
| |
* | change query strategy based on adapterAaron Patterson2014-01-164-5/+51
| |
* | Merge branch 'master' into adequaterecordAaron Patterson2014-01-1614-60/+127
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Make AR::Base#touch fire the after_commit and after_rollback callbacks Fix test for cache_key + touched Revert "methods are defined right after the module_eval, so we don't need to do" Revert "Don't remove trailing slash from PATH_INFO for mounted apps" Add failing test for #13369 reset column information after fiddling with `Encoding.default_internal` we have `with_env_tz` as global test helper. Remove duplicate. isolate class attribute assignment in `migration_test.rb` use `teardown` for cleanup, not `setup`. tests without transactional fixtures need to cleanup afterwards. no need to `return skip` in tests. `skip` is enough. methods are defined right after the module_eval, so we don't need to do any line number maths Get rid of unused TransactionError constant Avoid converting :on option to array twice when defining commit/rollback callbacks Unify changelog entries about single quotes [ci skip] Use single quotes in generated files
| * Make AR::Base#touch fire the after_commit and after_rollback callbacksHarry Brundage2014-01-165-2/+71
| |
| * Fix test for cache_key + touchedCarlos Antonio da Silva2014-01-161-9/+9
| | | | | | | | | | Ensure the child can actually be touched. The `Bulb` model has no timestamp column, thus trying to touch it would return `nil`.
| * reset column information after fiddling with `Encoding.default_internal`Yves Senn2014-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves order depndent problems in `base_test.rb`. The leaked column information crashed test cases using the `Weird` class later on: ``` 2) Error: BasicsTest#test_group_weirds_by_from: SyntaxError: /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:387: invalid hex escape ... attribute_before_type_cast("\x{A4CA}\x{A4DE}\x{A4A8}", *arg... ... ^ /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:387: invalid hex escape ...te_before_type_cast("\x{A4CA}\x{A4DE}\x{A4A8}", *args) ... ^ /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:387: invalid hex escape ...e_type_cast("\x{A4CA}\x{A4DE}\x{A4A8}", *args) ... ^ /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:385:in `module_eval' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:385:in `define_proxy_call' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:294:in `block in define_attribute_method' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:285:in `each' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:285:in `define_attribute_method' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:252:in `block in define_attribute_methods' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:252:in `each' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:252:in `define_attribute_methods' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:72:in `block in define_attribute_methods' /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/2.0.0/mutex_m.rb:73:in `synchronize' /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/2.0.0/mutex_m.rb:73:in `mu_synchronize' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:69:in `define_attribute_methods' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:174:in `method_missing' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:45:in `public_send' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:45:in `_assign_attribute' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:32:in `block in assign_attributes' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:26:in `each' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:26:in `assign_attributes' /Users/senny/Projects/rails/activerecord/lib/active_record/core.rb:458:in `init_attributes' /Users/senny/Projects/rails/activerecord/lib/active_record/core.rb:191:in `initialize' /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:30:in `new' /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:30:in `new' /Users/senny/Projects/rails/activerecord/lib/active_record/persistence.rb:33:in `create' test/cases/base_test.rb:646:in `test_group_weirds_by_from' ```
| * we have `with_env_tz` as global test helper. Remove duplicate.Yves Senn2014-01-162-14/+0
| |
| * isolate class attribute assignment in `migration_test.rb`Yves Senn2014-01-161-22/+33
| | | | | | | | | | | | | | | | This makes the tests inside `migration_test.rb` order independent. The assignments to `Reminder.table_name_prefix` and `Reminder.table_name_suffix` previously leaked and had impact on following test cases. This patch isolates the assignments on a throw-away subclass.
| * use `teardown` for cleanup, not `setup`.Yves Senn2014-01-161-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | This solves order dependent issues where the last test leaked the query cache state. This resulted in the following error: ``` QueryCacheExpiryTest#test_cache_is_expired_by_habtm_delete [test/cases/query_cache_test.rb:275]: not all expectations were satisfied unsatisfied expectations: - expected exactly twice, invoked once: #<ActiveRecord::ConnectionAdapters::SQLite3Adapter:0x7f93e0c65838>.clear_query_cache(any_parameters) ```
| * tests without transactional fixtures need to cleanup afterwards.Yves Senn2014-01-161-0/+7
| | | | | | | | This fixes test order issues.
| * no need to `return skip` in tests. `skip` is enough.Yves Senn2014-01-164-4/+4
| |
| * Get rid of unused TransactionError constantCarlos Antonio da Silva2014-01-151-3/+0
| | | | | | | | | | | | This has been added 9 years ago in a677da209b16f43198b3485dda89dce862fb9bfb, and removed 6 years ago in 38f8252e2d0a109d1b833d6b289cd989e7bfffe4.
| * Avoid converting :on option to array twice when defining commit/rollback ↵Carlos Antonio da Silva2014-01-151-3/+2
| | | | | | | | callbacks
* | use a params hash so we know what bind parameters are usedAaron Patterson2014-01-153-25/+65
| |
* | some databases do not have bind params (mysql2) so take that in to accountAaron Patterson2014-01-141-2/+6
| |
* | fix exception translationAaron Patterson2014-01-142-3/+4
| |
* | Merge branch 'master' into set_bindsAaron Patterson2014-01-142-15/+2
|\| | | | | | | | | | | | | | | * master: rm dup code Conflicts: activerecord/test/cases/relations_test.rb
| * rm dup codeAaron Patterson2014-01-141-13/+0
| | | | | | | | https://github.com/rails/rails/blob/e64a83cdbd3ce836f3339c600c1006b20c23d8fd/activerecord/test/cases/relation/merging_test.rb#L80-91
* | test bind value equalityAaron Patterson2014-01-141-2/+2
| |
* | translate exceptions on prepared statement failureAaron Patterson2014-01-142-6/+13
| |
* | reorder bind indexes if joins produced bind valuesAaron Patterson2014-01-141-0/+9
| |
* | expliticly make STI column a bind valueAaron Patterson2014-01-141-4/+9
| |
* | Merge branch 'master' into set_bindsAaron Patterson2014-01-142-8/+7
|\| | | | | | | | | | | * master: directly create the ARel AST Updated comment to mention the enum mapping class method [ci skip]
| * directly create the ARel ASTAaron Patterson2014-01-141-6/+4
| | | | | | | | rather than allocating a new Relation, just make the AST directly
| * Updated comment to mention the enum mapping class method [ci skip]Godfrey Chan2014-01-141-2/+3
| |
| * "string" isn't a valid column type for ActiveRecordAaron Patterson2014-01-141-1/+1
| | | | | | | | | | Conflicts: activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
* | take in to account existing bind parameters when building the bind listAaron Patterson2014-01-141-21/+20
| |
* | match against bind valuesAaron Patterson2014-01-141-2/+2
| |
* | comment out the sqlite3 debug code (for now)Aaron Patterson2014-01-141-0/+7
| |