aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29033 from kamipo/make_preload_query_to_prepared_statementsSean Griffin2017-07-184-4/+4
|\
| * Make preload query to preparableRyuta Kamizono2017-07-074-4/+4
* | Fix type casting a time for MariaDBRyuta Kamizono2017-07-191-1/+0
* | Merge branch 'master' into fix_unscope_where_column_with_orSean Griffin2017-07-1847-403/+363
|\ \
| * \ Merge pull request #29785 from cswilliams/rescue_postgres_connection_errors_o...Sean Griffin2017-07-181-0/+1
| |\ \
| | * | Catch postgres connection errors when trying to dealloc the statement poolChris Williams2017-07-131-0/+1
| * | | Merge pull request #29834 from kamipo/fix_unscoping_default_scope_with_sti_as...Sean Griffin2017-07-186-3/+39
| |\ \ \
| | * | | Fix unscoping `default_scope` for `Preloader`Ryuta Kamizono2017-07-192-1/+13
| | * | | Fix unscoping `default_scope` in STI associationsRyuta Kamizono2017-07-195-2/+26
| * | | | Don't convert dates to strings when using prepared statements in mysqlSean Griffin2017-07-182-3/+19
| |/ / /
| * | | Fix typo s/rause/raise/Ryuta Kamizono2017-07-191-1/+1
| * | | Remove deprecated code concerning non-attributes and `*_will_change!`Sean Griffin2017-07-184-24/+7
| * | | Remove deprecated code concerning dirty methods in after callbacksSean Griffin2017-07-182-83/+11
| * | | Remove incorrect commentSean Griffin2017-07-181-2/+0
| * | | Fix `JoinDependency` with using a custom tableRyuta Kamizono2017-07-186-18/+29
| * | | Merge pull request #29801 from kamipo/extract_null_relation_testSean Griffin2017-07-172-118/+82
| |\ \ \
| | * | | Ensure calculation methods execute no queriesRyuta Kamizono2017-07-151-60/+14
| | * | | Extract `NullRelationTest` from `RelationTest`Ryuta Kamizono2017-07-152-118/+128
| | |/ /
| * | | Merge pull request #29799 from kamipo/remove_outdated_test_scoped_responds_to...Sean Griffin2017-07-171-8/+0
| |\ \ \
| | * | | Remove outdated `test_scoped_responds_to_delegated_methods`Ryuta Kamizono2017-07-151-8/+0
| | |/ /
| * | | Merge pull request #25564 from brewski/serializable_hash_fixSean Griffin2017-07-171-4/+2
| |\ \ \
| | * | | Correctly handle frozen options for ActiveRecord::Serialization#serializable_...Brian Abreu2016-12-092-5/+3
| * | | | Merge pull request #29796 from kamipo/fix_where_with_custom_tableSean Griffin2017-07-172-5/+5
| |\ \ \ \
| | * | | | Fix `where` with a custom tableRyuta Kamizono2017-07-182-5/+5
| * | | | | `Persistence#delete` should not be affected by scopingRyuta Kamizono2017-07-182-1/+12
| |/ / / /
| * | | | Merge pull request #29788 from kamipo/remove_unused_mutex_mRafael França2017-07-172-3/+2
| |\ \ \ \
| | * | | | Make `generated_attribute_methods` to privateRyuta Kamizono2017-07-141-1/+1
| | * | | | Remove unused `Mutex_m` in Active ModelRyuta Kamizono2017-07-141-2/+1
| | | |/ / | | |/| |
| * | | | Allow multiparameter assigned attributes to be used with `text_field`Sean Griffin2017-07-173-1/+17
| * | | | Merge pull request #29825 from kamipo/remove_useless_arel_engineSean Griffin2017-07-174-19/+3
| |\ \ \ \
| | * | | | Remove useless `arel_engine`Ryuta Kamizono2017-07-174-19/+3
| * | | | | Post.joins(:users) should not be affected by `User.current_scope`Sean Griffin2017-07-173-4/+19
| |/ / / /
| * | | | Enable `Layout/FirstParameterIndentation` copRyuta Kamizono2017-07-171-1/+1
| * | | | Merge pull request #29812 from kamipo/remove_unused_requiresKasper Timm Hansen2017-07-162-5/+0
| |\ \ \ \
| | * | | | Remove unused requiresRyuta Kamizono2017-07-162-5/+0
| * | | | | Merge pull request #29782 from y-yagi/follow_up_29699Kasper Timm Hansen2017-07-162-3/+13
| |\ \ \ \ \
| | * | | | | Set `represent_boolean_as_integer` via `configuration`yuuji.yaginuma2017-07-162-3/+13
| * | | | | | Merge pull request #29813 from kamipo/fix_create_with_multiparameter_attributesKasper Timm Hansen2017-07-162-16/+34
| |\ \ \ \ \ \
| | * | | | | | Fix `create_with` with multiparameter attributesRyuta Kamizono2017-07-162-16/+34
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #29814 from kamipo/dont_cache_scope_for_createKasper Timm Hansen2017-07-164-14/+6
| |\ \ \ \ \ \
| | * | | | | | Don't cache `scope_for_create`Ryuta Kamizono2017-07-164-14/+6
| | |/ / / / /
| * / / / / / Fix code formatting for QueryMethods#selectRobin Dupret2017-07-161-2/+3
| |/ / / / /
| * | | | | Merge pull request #29809 from kamipo/remove_unused_ivarsKasper Timm Hansen2017-07-161-2/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove unused `@last`, `@order_clause`, and `@join_dependency`Ryuta Kamizono2017-07-161-2/+1
| * | | | | Fix `create_with` using both string and symbolRyuta Kamizono2017-07-169-18/+20
| * | | | | Use `where(id: 10)` rather than `where(relation.table[:id].eq(10))`Ryuta Kamizono2017-07-161-5/+5
| |/ / / /
| * | | | Merge pull request #29679 from kamipo/add_test_case_for_27724Kasper Timm Hansen2017-07-152-0/+12
| |\ \ \ \
| | * | | | Add a test case for overwriting existing condition on associationsRyuta Kamizono2017-07-072-0/+12
| * | | | | Merge pull request #29769 from kamipo/remove_extra_order_for_firstKasper Timm Hansen2017-07-152-32/+28
| |\ \ \ \ \
| | * | | | | Remove extra `.merge!(order: "id")` for `Relation#first` in testsRyuta Kamizono2017-07-132-32/+28