aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | remove unnecessary code from delete methodeileencodes2014-04-281-10/+2
| | | | | | | | | | | | | | | Now that we have a new method delete_all_with_dependency this coupled conditional is no longer needed.
* | | write a new method to be accessed from delete_alleileencodes2014-04-281-1/+9
| | | | | | | | | | | | | | | | | | The delete method is very coupled with delete all even though only a portion of the conditionals apply. Decoupling this will make the code easier to understand and manipulate.
* | | Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtmYves Senn2014-04-254-2/+15
|\ \ \ | | | | | | | | Fix to use custom join table in habtm
| * | | Fix custom join_table name on habtm reflectionsKassio Borges2014-04-254-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | When used a custom join_table name on a habtm, rails was not saving it on Reflections. This causes a problem when rails loads fixtures, because it uses the reflections to set database with fixtures.
* | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-2522-314/+416
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (28 commits) move AR length validation tests into separate test-case. No need for trailing slash on migration path. reset `@arel` when modifying a Relation in place. PostgreSQL Timestamps always map to `:datetime`. [ci skip] Improve formatting and yml Fix a typo in the doc of forty_two AR FinderMethod Improve readability of contributing to rails guide. [ci skip] Precompile the image we're referencing, too. `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty transactions. Fixed an issue with migrating legacy json cookies. Correct comment [ci skip] Perfer to define methods instead of calling test Fix syntax error Add CHANGELOG entry for #14757 [ci skip] Fix run-on sentences and improve grammar [skip ci] Add test for using ActionView::Helpers::FormHelper.label with block and html select! renamed to avoid name collision Array#select! Rearrange deck chairs on the titanic. Organize connection handling test cases. Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon. ActionController::Renderers documentation fix ...
| * | | move AR length validation tests into separate test-case.Yves Senn2014-04-242-42/+48
| | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/validations/association_validation_test.rb
| * | | No need for trailing slash on migration path.Jeremy Kemper2014-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes a double // in Dir.glob that breaks Ruby 2.2-trunk. Not really a bug, but not relevant to this test either. Originally added in ed21f0c50270139ddb6993acfdaea4586ffd09a3
| * | | reset `@arel` when modifying a Relation in place.Yves Senn2014-04-243-1/+18
| | | | | | | | | | | | | | | | /cc @tenderlove
| * | | PostgreSQL Timestamps always map to `:datetime`.Jefferson Lai2014-04-242-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The PG Adapter should use `:datetime` consistently instead of mapping mispellings to `:timestamp`. See #14513
| * | | Fix a typo in the doc of forty_two AR FinderMethodEric Bouchut2014-04-241-1/+1
| | | |
| * | | `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty ↵Lucas Mazza2014-04-233-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | transactions. Closes #14841.
| * | | Perfer to define methods instead of calling testRafael Mendonça França2014-04-221-4/+4
| | | | | | | | | | | | | | | | This file is using this pattern already
| * | | Fix syntax errorRafael Mendonça França2014-04-221-0/+1
| | | |
| * | | Add CHANGELOG entry for #14757 [ci skip]Rafael Mendonça França2014-04-221-0/+6
| | | |
| * | | Merge pull request #14757 from estsauver/14752Rafael Mendonça França2014-04-225-6/+19
| |\ \ \ | | | | | | | | | | Fix behavior of select! to be consistent with select #14752
| | * | | select! renamed to avoid name collision Array#select!Earl J St Sauver2014-04-215-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14752 Select mimics the block interface of arrays, but does not mock the block interface for select!. This change moves the api to be a private method, _select!.
| * | | | Merge pull request #14573 from habermann24/has_many_through_fixRafael Mendonça França2014-04-225-2/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly handle scoping with has_many :through. Fixes #14537. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_through_associations_test.rb
| | * | | | Minor improvement: Use the merge method on the relation instead of ↵Jan Habermann2014-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | instance_eval directly.
| | * | | | Simplify the code in target_scopeJan Habermann2014-04-031-5/+2
| | | | | |
| | * | | | Add a CHANGELOG entry for the has_many :through scoping fix (See #14537 for ↵Jan Habermann2014-04-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | details).
| | * | | | Properly handle scoping with has_many :through. Fixes #14537.Jan Habermann2014-04-034-2/+25
| | | | | |
| * | | | | Rearrange deck chairs on the titanic. Organize connection handling test cases.Jeremy Kemper2014-04-214-249/+246
| | | | | |
* | | | | | use statement cache for belongs_to relationsAaron Patterson2014-04-223-3/+17
| | | | | |
* | | | | | extract record fetching to a method for belongs_toAaron Patterson2014-04-221-1/+5
| | | | | |
* | | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-2024-78/+248
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (74 commits) [ci skip] builtin -> built-in Fix code indentation and improve formatting Grammar fix in Getting Started Guide Make URL escaping more consistent Optimize URI escaping Always escape string passed to url helper. Remove statement assuming coffee shop/public space wifi is inherently insecure Don't rely on Arel master in bug report template [ci skip] wrap methods in backticks [ci skip] "subhash" --> "sub-hash" multibyte_conformance.rb --> multibyte_conformance_test.rb Fix inconsistent behavior from String#first/#last `@destroyed` should always be set to `false` when an object is duped. remove warning `warning: ambiguous first argument; put parentheses or even spaces` :uglify -> :uglifier Regression test for irregular inflection on has_many Singularize association names before camelization Fix spelling and proper nouns Optimize select_value, select_values, select_rows and dry up checking whether to exec with cache for Postgresql adapter Include default rails protect_from_forgery with: :exception ... Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
| * | | | | `@destroyed` should always be set to `false` when an object is duped.Kuldeep Aggarwal2014-04-193-0/+21
| | | | | |
| * | | | | remove warningKuldeep Aggarwal2014-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `warning: ambiguous first argument; put parentheses or even spaces`
| * | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-04-181-2/+2
| |\ \ \ \ \
| | * | | | | [ci skip] Use valid current config in exampleschneems2014-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | | `reaping_frequency` is used in Active Record `reap_frequency` is not
| * | | | | | Merge pull request #14790 from krisselden/optimize-postgres-selectsRafael Mendonça França2014-04-182-19/+41
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Optimize select_value, select_values, select_rows in Postgresql adapter.
| | * | | | | | Optimize select_value, select_values, select_rows and dry up checking ↵Kris Selden2014-04-172-19/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whether to exec with cache for Postgresql adapter Reduces creating unused objects, with the most dramatic reduction in select_values which used to map(&:first) an array of single element arrays.
| * | | | | | | Merge pull request #14793 from arthurnn/fixes_8928Rafael Mendonça França2014-04-183-2/+16
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Fixed has_many association to make it support irregular inflections.
| | * | | | | | Regression test for irregular inflection on has_manyArthur Neves2014-04-182-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a Changelog entry [related #9702] [fixes #8928]
| | * | | | | | Singularize association names before camelizationJavier Goizueta2014-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that irregular multi-word pluralization rules have to be defined only for snake-case strings.
| * | | | | | | Bring SQLite3Adpter init API closer to othersArthur Neves2014-04-172-3/+2
| |/ / / / / /
| * | | | | | Merge pull request #14773 from eric-chahin/null_relation_fixYves Senn2014-04-163-2/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Changed the NullRelation so that when count is called with #group it wil...
| | * | | | | | Changed the NullRelation so that when count is called with #group it will ↵Eric Chahin2014-04-163-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly return an empty hash instead of zero. Fixes issue #14721 Conflicts: activerecord/CHANGELOG.md
| * | | | | | | `sanitize_sql_like` escapes `escape_character` not only backslash.Yves Senn2014-04-162-5/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This is a follow up to: fe4b0eee05f59831e1468ed50f55fbad0ce11e1d * The originating PR is #14222 * It should fix the build
| * | | | | | SQL Like escaping helper method. [Rob Gilson & Yves Senn]Rob Gilson2014-04-163-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14222. This is a follow up to #6104 This does not have the backwards compatibility issues brought up in implementation to break.
| * | | | | | Add CHANGELOG entry for #14766 [ci skip]Rafael Mendonça França2014-04-151-0/+6
| | | | | | |
| * | | | | | Merge pull request #14765 from byroot/refactor-counter-cache-create-and-destroyRafael Mendonça França2014-04-153-34/+44
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor counter cache create and destroy
| | * | | | | | Hide BelongsToAssociation#increment_counters and #decrement_countersJean Boussier2014-04-152-3/+2
| | | | | | | |
| | * | | | | | Restore the destroy_by_association check in post destroy counter cacheJean Boussier2014-04-151-2/+9
| | | | | | | |
| | * | | | | | Set _after_create_counter_called flag to make update counter cache workJean Boussier2014-04-151-1/+6
| | | | | | | |
| | * | | | | | Use inheritance chain instead of callbacks to increment counter caches after ↵Jean Boussier2014-04-142-20/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | destroy
| | * | | | | | Use inheritance chain instead of callbacks to increment counter caches after ↵Jean Boussier2014-04-143-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create
| * | | | | | | Changed change_column in PG schema_statements.rb to make sure that the ↵Eric Chahin2014-04-153-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uuid_generate function was not being quoted.
| * | | | | | | Merge pull request #14762 from dwo/masterArthur Nogueira Neves2014-04-151-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use YAML.load_file in database tasks example
| | * | | | | | | use YAML.load_file in database tasks exampleRobin Tweedie2014-04-151-1/+1
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than YAML.load(File.read(path)). YAML.load_file is also used in guides/rails_guides/helper.rb since 2011, the only other precedent I could find.
| * | | | | | | Make sure the column_name is different from 'all'.Lauro Caetano2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 968c581ea34b5236af14805e6a77913b1cb36238 have fixed the EagerLoadTest, but not in the correct way. The problem was when `empty?` or `size` was called on relation. It was triggering `count(:all)`, which was passing `:all` as the column name to `count` on Calculations. On the other hand, the method `calculate` on Calculations was calling `construct_relation_for_association_calculations` instead of `perform_calculation`, because `has_include?` was returning `true` since `column_name` was present. To prevent calling the wrong method to perform the calculation, we have to check if the `column_name` is present and if it is different from `:all` (which is now used to correctly do `count` with `select`). More information here: https://github.com/rails/rails/commit/968c581ea34b5236af14805e6a77913b1cb36238#commitcomment-6006135