aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13111 from akshay-vishnoi/typoCarlos Antonio da Silva2013-11-302-2/+2
|\ | | | | Typo fixes [ci skip]
| * Typo fixes [ci skip]Akshay Vishnoi2013-11-302-2/+2
| |
* | Raise `ArgumentError` when `has_one` is used with `counter_cache`Godfrey Chan2013-11-295-2/+25
| | | | | | | | | | | | | | | | | | Previously, the `has_one` macro incorrectly accepts the `counter_cache` option due to a bug, although that options was never supported nor functional on `has_one` and `has_one ... through` relationships. It now correctly raises an `ArgumentError` when passed that option. For reference, this bug was introduced in 52f8e4b9.
* | Remove unused variableRafael Mendonça França2013-11-291-1/+1
|/ | | | | This method is not using the block variable directly since it is calling yield
* Merge pull request #13095 from kuldeepaggarwal/test-case-updationYves Senn2013-11-291-8/+3
|\ | | | | removed unnecessary test case
| * updating options documentation for associationsKuldeep Aggarwal2013-11-291-8/+3
| | | | | | | | removed unnecessary test case and improved test case for belongs_to having invalid options
* | Merge pull request #13099 from kamipo/remove_case_sensitive_equality_operatorCarlos Antonio da Silva2013-11-291-4/+0
|\ \ | | | | | | Remove `DatabaseStatements#case_sensitive_equality_operator`. It has been deprecated already.
| * | Remove `DatabaseStatements#case_sensitive_equality_operator`. It has been ↵Ryuta Kamizono2013-11-291-4/+0
| | | | | | | | | | | | deprecated already.
* | | Merge pull request #13100 from akshay-vishnoi/f-refactorCarlos Antonio da Silva2013-11-291-3/+8
|\ \ \ | |/ / |/| | #type_cast - improve performance & readability
| * | #type_cast - improve performance & readabilityAkshay Vishnoi2013-11-291-3/+8
| | |
* | | fix mysql version check in rename_indexCody Cutrer2013-11-282-2/+2
| |/ |/| | | | | also clarify native rename_index support is >= 5.7, not > 5.7
* | implement rename_index natively for MySQL > 5.7Cody Cutrer2013-11-282-0/+12
| |
* | first pass through CHANGELOGS to extract 4_1_release_notes. [ci skip]Yves Senn2013-11-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Extract **notable changes**, **deprecations** and **removals** from each CHANGELOG. I tried to reference the commits and pull requests for new features and deprecations. In the process I also made some minor changes to the CHANGELOGS. The 4_1_release_notes guide is declared WIP.
* | Do not create synonym named subjectsYasuo Honda2013-11-271-3/+0
| | | | | | | | | | | | | | because it is only used in `activerecord/test/cases/adapters/oracle/synonym_test.rb` See rails/rails#13054
* | Merge pull request #13054 from senny/remove_oracle_testsYves Senn2013-11-271-17/+0
|\ \ | | | | | | Remove leftover Oracle tests.
| * | the oracle adapter lives in a gem. Tests should live there as well.Yves Senn2013-11-261-17/+0
| | |
* | | [ci skip]removed obsolete information about `options` parameter in create methodKuldeep Aggarwal2013-11-271-3/+0
| | |
* | | [ci skip] used new syntax for scopesKuldeep Aggarwal2013-11-271-1/+1
| | |
* | | Merge pull request #13061 from ↵Rafael Mendonça França2013-11-263-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | laurocaetano/fix-uniqueness-validation-for-aliased-attribute Fix bug when validating the uniqueness of an aliased attribute. Conflicts: activerecord/CHANGELOG.md
* | | changed update counter to act on unscoped modelheruku2013-11-264-1/+19
| | |
* | | Merge pull request #13049 from senny/remove_firebird_testsRafael Mendonça França2013-11-263-148/+0
|\ \ \ | |/ / |/| | remove leftover firebird adapter tests.
| * | remove leftover firebird adapter tests.Yves Senn2013-11-263-148/+0
| | |
* | | tyopAkira Matsuda2013-11-261-1/+1
|/ /
* / `rename_index`: add the new index before removing the old one.Yves Senn2013-11-263-8/+29
|/ | | | | | | | | | | This prevents the following error when a MySQL index on a foreign key column is renamed: ``` ActiveRecord::StatementInvalid: Mysql2::Error: Cannot drop index 'index_engines_on_car_id': needed in a foreign key constraint: DROP INDEX `index_engines_on_car_id` ON `engines` ``` refs: #13038.
* move changelog entry to the topBrian Thomas Storti2013-11-251-6/+6
|
* Raise `RecordNotDestroyed` when children can't be replacedBrian Thomas Storti2013-11-255-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12812 Raise `ActiveRecord::RecordNotDestroyed` when a child marked with `dependent: destroy` can't be destroyed. The following code: ```ruby class Post < ActiveRecord::Base has_many :comments, dependent: :destroy end class Comment < ActiveRecord::Base before_destroy do return false end end post = Post.create!(comments: [Comment.create!]) post.comments = [Comment.create!] ```` would result in a `post` with two `comments`. With this commit, the same code would raise a `RecordNotDestroyed` exception, keeping the `post` with the same `comment`.
* require the files we testAaron Patterson2013-11-251-0/+1
|
* Merge pull request #13034 from vipulnsward/some_typosRafael Mendonça França2013-11-252-2/+2
|\ | | | | Fix some minor typos
| * Fix some minor typos [ci skip]Vipul A M2013-11-262-2/+2
| |
* | Merge pull request #13029 from akshay-vishnoi/documentationYves Senn2013-11-251-4/+4
|\ \ | |/ |/| `delgated` => `delegated`
| * `delgated` => `delegated`Akshay Vishnoi2013-11-251-4/+4
| |
* | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-244-19/+19
|\ \ | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
| * | Change syntax format for example returned valuesPrem Sichanugrist2013-11-114-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
* | | Fix validation on uniqueness of empty associationEvgeny Li2013-11-223-1/+24
| | |
* | | Improve changelogsCarlos Antonio da Silva2013-11-221-2/+1
| | | | | | | | | | | | | | | Also make Action Mailer changelog format more consistent with the others [ci skip]
* | | Merge pull request #12962 from ↵Xavier Noria2013-11-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | kamipo/call_initialize_schema_migrations_table_from_migration Use `SchemaStatements#initialize_schema_migrations_table` instead of `ActiveRecord::SchemaMigration.create_table`.
| * | | 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
| |