aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Use `SchemaStatements#initialize_schema_migrations_table` instead of ↵Ryuta Kamizono2013-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::SchemaMigration.create_table`.
* | | | | | replace custom Time stubbing with `travel` and `travel_to`.Yves Senn2013-11-211-37/+7
| | | | | |
* | | | | | Fix ActiveRecord::Relation#unscopeJon Leighton2013-11-207-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm pretty confused about the addition of this method. The documentation says that it was intended to allow the removal of values from the default scope (in contrast to #except). However it behaves exactly the same as except: https://gist.github.com/jonleighton/7537008 (other than having a slightly enhanced syntax). The removal of the default scope is allowed by 94924dc32baf78f13e289172534c2e71c9c8cade, which was not a change we could make until 4.1 due to the need to deprecate things. However after that change #unscope still gives us nothing that #except doesn't already give us. However there *is* a desire to be able to unscope stuff in a way that persists across merges, which would allow associations to be defined which unscope stuff from the default scope of the associated model. E.g. has_many :comments, -> { unscope where: :trashed } So that's what this change implements. I've also corrected the documentation. I removed the guide references to #except as I think unscope really supercedes #except now. While we're here, there's also a potential desire to be able to write this: has_many :comments, -> { unscoped } However, it doesn't make sense and would not be straightforward to implement. While with #unscope we're specifying exactly what we want to be removed from the relation, with "unscoped" we're just saying that we want it to not have some things which were added earlier on by the default scope. However in the case of an association, we surely don't want *all* conditions to be removed, otherwise the above would just become "SELECT * FROM comments" with no foreign key constraint. To make the above work, we'd have to somehow tag the relation values which get added when evaluating the default scope in order to differentiate them from other relation values. Which is way too much complexity and therefore not worth it when most use cases can be satisfied with unscope. Closes #10643, #11061.
* | | | | | swap arguments for some `assert_equal` statements => `expected, actual`Yves Senn2013-11-201-6/+6
|/ / / / /
* | | | | use arel nodes to represent non-string `order_values`.Yves Senn2013-11-194-24/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug when merging relations of different classes. ``` Given: Post.joins(:author).merge(Author.order(name: :desc)).to_sql Before: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "posts"."name" DESC After: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "authors"."name" DESC ```
* | | | | Revert "Properly require database tasks so we have access to the raised ↵Rafael Mendonça França2013-11-193-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constant" This reverts commit fbcd46b1a0d255a34d29caa77bbd31c287446333. This is not needed anymore. See 7280965
* | | | | Revert "Explicitly exit with status "1" for create and drop failures"Rafael Mendonça França2013-11-196-51/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 22f80ae57b26907f662b7fd50a7270a6381e527e. See https://github.com/rails/rails/commit/22f80ae57b26907f662b7fd50a7270a6381e527e#commitcomment-4640676 Conflicts: activerecord/CHANGELOG.md
* | | | | use arel `master` and update activerecord to depend on arel `5.0.0`.Yves Senn2013-11-191-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | This is a follow-up to 3053fee954c1e28b23f7e00921d7b9b3b3867fa5. > The `master` branch should use the `master` branch.
* | | | Do not count query for all_constraints and all_tab_cols in OracleYasuo Honda2013-11-181-1/+1
| | | |
* | | | Address test_merging_where_relations failure by adding `order("posts.id")`Yasuo Honda2013-11-181-1/+1
| | | |
* | | | Add description for db:create and db:drop test tasks in ARCarlos Antonio da Silva2013-11-171-2/+4
| | | | | | | | | | | | | | | | | | | | This will help identify these tasks exists, since they are easier to setup things for running all AR tests.
* | | | Properly require database tasks so we have access to the raised constantCarlos Antonio da Silva2013-11-173-0/+3
| | | | | | | | | | | | | | | | Fix travis failures.
* | | | Drop unused param `should_be_quoted` to `PostgreSQLColumn#array_to_string`Vipul A M2013-11-171-1/+1
| | | |
* | | | pass the pk to compile_updateAaron Patterson2013-11-163-3/+6
| | | |
* | | | Merge pull request #12918 from versioncontrol/rails-12866Rafael Mendonça França2013-11-163-1/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks to see if the record contains the foreign_key to set the inverse automatically Conflicts: activerecord/CHANGELOG.md
| * | | | Checks to see if the record contains the foreign_key to set the inverse ↵Edo Balvers2013-11-163-1/+14
| | | | | | | | | | | | | | | | | | | | automatically
* | | | | Fix bad test order dependency between LoadAllFixturesTest#test_all_there and ↵Ryan Davis2013-11-161-6/+10
| | | | | | | | | | | | | | | | | | | | FoxyFixturesTest#test_ignores_belongs_to_symbols_if_association_and_foreign_key_are_named_the_same
* | | | | Fix bad test order dependency between ↵Ryan Davis2013-11-161-8/+16
| | | | | | | | | | | | | | | | | | | | test/cases/validations/i18n_generate_message_validation_test.rb and test/cases/validations/uniqueness_validation_test.rb
* | | | | test should clean up after themselvesAaron Patterson2013-11-151-0/+3
| | | | |
* | | | | Merge pull request #12779 from ↵Aaron Patterson2013-11-154-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dougbarth/dont_swallow_exceptions_during_transactional_statements_in_mysql Don't swallow exceptions in transctional statements
| * | | | | Remove tests for not swallowing exceptions.Doug Barth2013-11-152-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | From PR, @tenderlove would prefer to not maintain these tests.
| * | | | | Don't swallow exceptions in transctional statementsDoug Barth2013-11-054-10/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MySQL connection adapater swallows all StandardError exceptions, which includes Mysql::Error and Mysql2::Error. The comment in the exception clause claims errors thrown here indicate that transactions aren't supported by the server but that isn't necessarily true. It's possible the MySQL server has gone away and swallowing a failed commit may let the application return a successful response when the data has not been saved. Also, replication libraries like Galera require that the application handle exceptions thrown at BEGIN/COMMIT. I'm unable to determine what version of MySQL threw an exception for transactional statements. I tried as far back as 3.23.49 with InnoDB disabled but BEGIN & COMMIT statements do not throw an error. If there's a real case for this logic to continue, we could instead push this behavior into a configuration setting. The exception swallowing has been there since the beginning: db045dbbf60b53dbe013ef25554fd013baf88134
* | | | | | Merge pull request #12531 from iamvery/database-tasks-exit-statusRafael Mendonça França2013-11-156-16/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly exit with status "1" for create and drop task failures Conflicts: activerecord/CHANGELOG.md
| * | | | | | Explicitly exit with status "1" for create and drop failuresJay Hayes2013-11-116-16/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A non-zero exit status allows subsequent shell commands to be chained together such as: `rake db:reset test:prepare && rspec && cap deploy` (if you're feeling brave :) * Any exceptions raised during the `create` and `drop` tasks are caught in order to print a "pretty" message to the user. Unfortunately doing so prevents rake from aborting with a non-zero exit status to the shell. * Therefore we re-raise the exceptions after the "pretty" message and re-catch them in the task. * From the task we explicitly exit with a non-zero status. This method was chosen (rather than just letting rake fail from the exception) so that the backtrace is suppressed and the output to stderr is unchanged. * Update activerecord CHANGELOG
* | | | | | | explain how `to_param` wil truncate long values. [ci skip] refs #12900.Yves Senn2013-11-151-0/+3
| | | | | | |
* | | | | | | added one test case and example for ActiveRecord::Base.to_param methodKuldeep Aggarwal2013-11-152-0/+10
| | | | | | |
* | | | | | | document id prefixed String usage of `.find`. refs #12891 [ci skip]Yves Senn2013-11-151-5/+6
| | | | | | |
* | | | | | | Fix test name [ci skip]Carlos Antonio da Silva2013-11-142-3/+1
| | | | | | |
* | | | | | | Fix AR Changelog examples and improve syntax highlight [ci skip]Carlos Antonio da Silva2013-11-141-12/+12
| | | | | | |
* | | | | | | Revert "Used Yield instead of block.call" -- this causes all of ↵David Heinemeier Hansson2013-11-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep". This reverts commit d3a1ce1cdc60d593de1682c5f4e3230c8db9a0fd.
* | | | | | | Fix that eager loading of polymorphic associations did not work with ↵David Heinemeier Hansson2013-11-143-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | association empty?/any? predicates any more (there is still a problem when select is applied to a relation, or if you try association#exists? -- but its easier to work around)
* | | | | | | Merge pull request #12893 from javan/to-param-addendumRafael Mendonça França2013-11-142-8/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Addendum to #12891
| * | | | | | | Addendum to #12891Javan Makhmali2013-11-142-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix incorrectly named tests * Restore Object#to_param behavior * Ensure param is derived from a squished and truncated string
* | | | | | | | Merge pull request #12819 from vipulnsward/also_dup_column_typesRafael Mendonça França2013-11-141-3/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Also dup `column_types` in AR::Result `initialize_copy`
| * | | | | | | Also dup `column_types` in AR::Result `initialize_copy`Vipul A M2013-11-101-3/+4
| | | | | | | |
* | | | | | | | Merge pull request #12889 from kuldeepaggarwal/speed_upsRafael Mendonça França2013-11-141-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Used Yield instead of block.call
| * | | | | | | | Used Yield instead of block.callKuldeep Aggarwal2013-11-151-3/+3
| | | | | | | | |
* | | | | | | | | Add AR::Base.to_param for convenient "pretty" URLs derived from a model's ↵Javan Makhmali2013-11-144-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attribute or method.
* | | | | | | | | Merge pull request #12832 from vipulnsward/move_schema_creationYves Senn2013-11-142-78/+84
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Move `SchemaCreation` to its own file instead of `AbstractAdapter`.
| * | | | | | | | | Move `SchemaCreation` to its own file instead of `AbstractAdapter`.Vipul A M2013-11-122-78/+84
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12845 from amatsuda/should_ar_depend_on_railsGuillermo Iguaran2013-11-131-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Refer to Rails.env from AR only when Rails is defined
| * | | | | | | | | Refer to Rails.env only when Rails is definedAkira Matsuda2013-11-111-1/+5
| | | | | | | | | |
* | | | | | | | | | Merge pull request #12772 from dmathieu/no_touchingRafael Mendonça França2013-11-135-0/+112
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add No Touching
| * | | | | | | | | | add #no_touching on ActiveRecord modelsDamien Mathieu2013-11-135-0/+112
| | | | | | | | | | |
* | | | | | | | | | | fix weird Emacs auto indentation. [ci skip]Yves Senn2013-11-131-8/+8
| | | | | | | | | | |
* | | | | | | | | | | tests for merging Relations of different classes.Yves Senn2013-11-131-0/+19
| | | | | | | | | | |
* | | | | | | | | | | move Relation#merge tests into separate file.Yves Senn2013-11-132-121/+131
| | | | | | | | | | |
* | | | | | | | | | | Ensure that a column added in a test is being removed after allAkira Matsuda2013-11-131-0/+7
|/ / / / / / / / / /
* | | | | | | | | | Remove the unused, undocumented SQLite3Adapter#supports_count_distinct?Ben Woosley2013-11-121-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has returned true since 3cc9b5f1, and is not used internally.
* | | | | | | | | | Drop a sqlite_version check because we only support SQLite 3.6.16 or newer.Ben Woosley2013-11-122-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop some comments that document the implementation rather than the interface.