aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #14924 from eric-chahin/issue_13854Matthew Draper2014-05-031-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Fixed custom validation context bug for child associations
| * | | | | Fixed custom validation context bug where childEric Chahin2014-05-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associations were not being saved. Fixes #13854. [Eric Chahin, Aaron Nelson, & Kevin Casey]
* | | | | | push up bind params on "simple" subquery calculationsAaron Patterson2014-05-021-2/+4
| |/ / / / |/| | | | | | | | | | | | | | | | | | | bind parameters we not being propogated to simple subquery calculation calls. This fixes it
* | | | | Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_modeRafael Mendonça França2014-05-011-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbolize variables of mysql/mysql2 connection configuration Conflicts: activerecord/CHANGELOG.md
| * | | | | Stringify variables names for mysql connectionsPaul Nikitochkin2014-04-301-5/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For mysql2/mysql adapters, `sql_mode` variable name set in `database.yml` as string, was ignored and `sql_mode` was set to use strict mode. Fixes #14895
* | | | | Merge pull request #13640 from maginatics/fix_sqlite3_ensure_masterRafael Mendonça França2014-05-011-3/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQLite3: Always close statements. Conflicts: activerecord/CHANGELOG.md
| * | | | | SQLite3: Always close statements.Timur Alperovich2014-01-151-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQLite3 adapter must make sure to close statements after queries. Fixes: #13631
* | | | | | Give real privacy to class methods in AR::PredicateBuilderHector Satre2014-05-011-7/+8
| |/ / / / |/| | | |
* | | | | cleanup, remove trailing whitespace. [ci skip]Yves Senn2014-04-291-1/+1
| | | | |
* | | | | Merge pull request #14899 from ↵Aaron Patterson2014-04-281-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eileencodes/fix-delete-all-with-nil-dependency-to-not-produce-in-statement Fix delete all with nil (:nullify) dependency to not produce in statement
| * | | | | flip conditional in delete_all to handle nullify bettereileencodes2014-04-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nullify (or nil dependency) was doing the same thing delete_all was doing in issue #14546, creating a large IN statement if the association was loaded. Loaded and not loaded associations should behave the same. The IN statement is also not great because it's inefficient.
* | | | | | Merge pull request #14139 from anilmaurya/masterYves Senn2014-04-281-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ci skip] updating active_record/associations to demonstrate where conflict with eager loading.
| * | | | | [ci skip] updating active_record/associations to demonstrate where conflict ↵anilmaurya2014-04-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | with eager loading.
* | | | | | simplify the delete all w/ dependency methodeileencodes2014-04-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After reviewing this code I realized the conditional that was there previously was basically saying if the dependency is not delete all. This is a better, cleaner, and clearer way to write this method.
* | | | | | 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-252-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix to use custom join table in habtm
| * | | | | Fix custom join_table name on habtm reflectionsKassio Borges2014-04-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-259-16/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | reset `@arel` when modifying a Relation in place.Yves Senn2014-04-242-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | /cc @tenderlove
| * | | | | PostgreSQL Timestamps always map to `:datetime`.Jefferson Lai2014-04-241-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions. Closes #14841.
| * | | | | Merge pull request #14757 from estsauver/14752Rafael Mendonça França2014-04-224-5/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix behavior of select! to be consistent with select #14752
| | * | | | | select! renamed to avoid name collision Array#select!Earl J St Sauver2014-04-214-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-2/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | |
| | * | | | | | Properly handle scoping with has_many :through. Fixes #14537.Jan Habermann2014-04-031-2/+7
| | | | | | | |
* | | | | | | | 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-2017-77/+124
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-191-0/+1
| | | | | | | |
| * | | | | | | 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-181-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | Fixed has_many association to make it support irregular inflections.
| | * | | | | | | | 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-161-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14222. This is a follow up to #6104 This does not have the backwards compatibility issues brought up in implementation to break.
| * | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:37:16 +0000