Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Modify assert conditions not to be affected | Yasuo Honda | 2014-05-12 | 1 | -2/+3 |
| | | | | by each database bind variable naming conventions | ||||
* | Follow-up to #14990 [ci skip] | Jon Atack | 2014-05-07 | 1 | -10/+9 |
| | | | | | | | | Rewrite to avoid 'we'/'you', add missing period, and keep lines at 80 chars. Cheers :) Improve readability with help from @senny [ci skip] | ||||
* | Merge pull request #14982 from eric-chahin/GBV_refactor | Rafael Mendonça França | 2014-05-06 | 2 | -8/+6 |
|\ | | | | | Refactored AssociationScope#get_bind_values | ||||
| * | Refactor AssociationScope#get_bind_values | Eric Chahin | 2014-05-05 | 2 | -8/+6 |
| | | | | | | | | Added #join_id_for(owner) to reflection to avoid accessing the source_macro | ||||
* | | Fixed grammar | Fred Wu | 2014-05-06 | 1 | -1/+1 |
| | | |||||
* | | refactor and clean up delete_all method | eileencodes | 2014-05-05 | 1 | -9/+1 |
| | | | | | | | | | | | | | | | | Now that delete_all with destroy or delete_all dependency behave the same we no longer need this conditional. This means we can remove the new delete_all_with_dependency method I added and go straight to delete_records from delete_all, passing :all and the dependent directly. | ||||
* | | Add support for module-level table_suffix in models | Jenner LaFave | 2014-05-05 | 4 | -1/+63 |
|/ | | | | | This makes table_name_suffix work the same as table_name_prefix when using namespaced models. Pretty much the same as 67d1cec. | ||||
* | Improve CHANGELOG entry [ci skip] | Rafael Mendonça França | 2014-05-05 | 1 | -3/+3 |
| | |||||
* | Merge pull request #14978 from bogdan/relation-join | Rafael Mendonça França | 2014-05-05 | 5 | -2/+17 |
|\ | | | | | | | [Regression 4.0 -> 4.1] Put back Relation#join method as a delegate to Array | ||||
| * | Put back Relation#join method as a delegate to Array | Bogdan Gusiev | 2014-05-05 | 5 | -2/+17 |
| | | | | | | | | | | | | | | | | This is a regression 4.0 -> 4.1 fix. In 4.1.0 Relation#join is delegated to Arel#SelectManager. In 4.0 series it is delegated to Array#join This patch puts back the behaviour of 4.0 | ||||
* | | Get rid of unused method in AR Post test model | Carlos Antonio da Silva | 2014-05-05 | 1 | -4/+0 |
|/ | |||||
* | Arel master is 6.0.0 | Rafael Mendonça França | 2014-05-05 | 1 | -1/+1 |
| | |||||
* | Invert the if/else clause | Rafael Mendonça França | 2014-05-04 | 1 | -1/+1 |
| | | | | The case where the value is present is more common | ||||
* | Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exception | Rafael Mendonça França | 2014-05-04 | 3 | -1/+20 |
|\ | | | | | | | | | | | | | Fix exception when logging SQL w/ nil binary value. Conflicts: activerecord/CHANGELOG.md | ||||
| * | Fix exception when logging SQL w/ nil binary value. | James Coleman | 2014-05-02 | 3 | -1/+20 |
| | | |||||
* | | Convert column name to string only once | Kuldeep Aggarwal | 2014-05-04 | 1 | -1/+2 |
| | | |||||
* | | Use the reader attribute rather than the instance var when possible | Carlos Antonio da Silva | 2014-05-04 | 1 | -2/+2 |
| | | |||||
* | | Simplify building options hash in rename column method for mysql | Carlos Antonio da Silva | 2014-05-04 | 1 | -5/+6 |
| | | |||||
* | | Get rid of conditional since column_for handles raising now | Carlos Antonio da Silva | 2014-05-04 | 1 | -7/+4 |
| | | | | | | | | | | column_for will raise in case column is not found for the given table, so there is no need to handle that here. | ||||
* | | Simplify unless conditional with OR | Carlos Antonio da Silva | 2014-05-04 | 1 | -4/+2 |
| | | |||||
* | | Convert column name to string only once | Carlos Antonio da Silva | 2014-05-04 | 1 | -1/+2 |
| | | |||||
* | | refactor, move `column_for` to `AbstractAdapter` for better reuse. | Yves Senn | 2014-05-04 | 4 | -17/+11 |
| | | |||||
* | | Revert "Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar" | Yves Senn | 2014-05-03 | 1 | -107/+95 |
| | | | | | | | | | | This reverts commit fe9859600824268ff614cb3eb48b62c7165a1fbd, reversing changes made to add9560643ef79830febf47fa1228752d1df3502. | ||||
* | | Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar | Yves Senn | 2014-05-03 | 1 | -95/+107 |
|\ \ | | | | | | | Reorganize ActiveRecord's rake tasks | ||||
| * | | Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi] | Arun Agrawal | 2014-05-03 | 1 | -95/+107 |
| | | | |||||
* | | | Remove duplicated fixture addition | Carlos Antonio da Silva | 2014-05-03 | 1 | -1/+1 |
| | | | |||||
* | | | Refactor test to not care about the specific result of valid? | Carlos Antonio da Silva | 2014-05-03 | 1 | -3/+4 |
|/ / | | | | | | | | | | | Only care about its truthiness rather than asserting specific true/false values. If we need to check for the return value in particular, there will be a test for that. | ||||
* | | Merge pull request #14952 from gregmolnar/schema_load | Yves Senn | 2014-05-03 | 1 | -1/+1 |
|\ \ | | | | | | | make `db:structure:load` listed with `rake -T` | ||||
| * | | make `db:structure:load` listed with `rake -T` | Greg Molnar | 2014-05-02 | 1 | -1/+1 |
| | | | |||||
* | | | docs, restructure newly added part to `includes`. [ci skip] | Yves Senn | 2014-05-03 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | This is a follow up to #14139. /cc @carlosantoniodasilva | ||||
* | | | Merge pull request #14924 from eric-chahin/issue_13854 | Matthew Draper | 2014-05-03 | 5 | -1/+31 |
|\ \ \ | | | | | | | | | | | | | Fixed custom validation context bug for child associations | ||||
| * | | | Fixed custom validation context bug where child | Eric Chahin | 2014-05-01 | 5 | -1/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associations were not being saved. Fixes #13854. [Eric Chahin, Aaron Nelson, & Kevin Casey] | ||||
* | | | | Test typecasting on instance rather than class itself | Akshay Vishnoi | 2014-05-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add missing require to fix test :bomb: | Carlos Antonio da Silva | 2014-05-02 | 1 | -0/+1 |
| | | | | |||||
* | | | | Move dup destroyed test to specific file that tests dup logic | Carlos Antonio da Silva | 2014-05-02 | 2 | -9/+10 |
| |/ / |/| | | | | | | | | | | | Also change other related test to use existing record rather than creating new one. | ||||
* | | | push up bind params on "simple" subquery calculations | Aaron Patterson | 2014-05-02 | 2 | -3/+11 |
| |/ |/| | | | | | | | bind parameters we not being propogated to simple subquery calculation calls. This fixes it | ||||
* | | Enhance a bit a few changelog entries [ci skip] | Robin Dupret | 2014-05-02 | 1 | -6/+6 |
| | | |||||
* | | Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_mode | Rafael Mendonça França | 2014-05-01 | 4 | -5/+30 |
|\ \ | | | | | | | | | | | | | | | | | | | Symbolize variables of mysql/mysql2 connection configuration Conflicts: activerecord/CHANGELOG.md | ||||
| * | | Stringify variables names for mysql connections | Paul Nikitochkin | 2014-04-30 | 4 | -5/+30 |
| |/ | | | | | | | | | | | | | 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 | ||||
* | | Remove unused variable | Rafael Mendonça França | 2014-05-01 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #13640 from maginatics/fix_sqlite3_ensure_master | Rafael Mendonça França | 2014-05-01 | 3 | -3/+27 |
|\ \ | | | | | | | | | | | | | | | | | | | SQLite3: Always close statements. Conflicts: activerecord/CHANGELOG.md | ||||
| * | | SQLite3: Always close statements. | Timur Alperovich | 2014-01-15 | 3 | -3/+27 |
| | | | | | | | | | | | | | | | | | | SQLite3 adapter must make sure to close statements after queries. Fixes: #13631 | ||||
* | | | Give real privacy to class methods in AR::PredicateBuilder | Hector Satre | 2014-05-01 | 2 | -7/+12 |
| |/ |/| | |||||
* | | cleanup, remove trailing whitespace. [ci skip] | Yves Senn | 2014-04-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #14899 from ↵ | Aaron Patterson | 2014-04-28 | 4 | -8/+18 |
|\ \ | | | | | | | | | | | | | eileencodes/fix-delete-all-with-nil-dependency-to-not-produce-in-statement Fix delete all with nil (:nullify) dependency to not produce in statement | ||||
| * | | add test to check that loaded and non laoded are the same | eileencodes | 2014-04-28 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | Test checks that SQL is the same for a loaded vs not loaded association (category.categorizations, category.categorization.delete_all vs category.cartegroization.delete_al). This was fixed for delete_all dependency but was not fixed for no (:nullify, or nil) dependency). | ||||
| * | | clear shouldnt fire callbacks so remove order test | eileencodes | 2014-04-28 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | Since clear shouldn't fire callbacks the order doesn't matter since it was never updated. Remove the portion of this test that tests for order after clear. | ||||
| * | | rewrite test to correctly test clear method | eileencodes | 2014-04-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Clear should not call callbacks because it clear calls delete_all and then returns self. It should behave the same as delete_all. This test clarifies the goal of the test and tests the correct outcome. | ||||
| * | | flip conditional in delete_all to handle nullify better | eileencodes | 2014-04-28 | 1 | -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/master | Yves Senn | 2014-04-28 | 1 | -0/+6 |
|\ \ \ | |/ / |/| | | [ci skip] updating active_record/associations to demonstrate where conflict with eager loading. |