aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29950 from MaxLap/avoid_or_clause_duplicatesSean Griffin2017-07-311-6/+15
|\
| * Edits following the reviewsMaxime Lapointe2017-07-281-6/+8
| * Avoid duplicate clauses when using #orMaxime Lapointe2017-07-251-9/+16
* | Change http postgresql.org links to https [ci skip]yuuji.yaginuma2017-07-305-8/+8
* | Merge pull request #29946 from kamipo/passing_arel_to_where_is_boundableSean Griffin2017-07-281-4/+1
|\ \
| * | Building `where_clause` in `UniquenessValidator` is no longer neededRyuta Kamizono2017-07-261-4/+1
| |/
* | Use `predicate_builder.build_bind_attribute` wherever possibleRyuta Kamizono2017-07-284-8/+7
* | Eager load the association classes on bootRafael Mendonça França2017-07-271-7/+7
* | Use `_relation_for_itself` wherever possibleSean Griffin2017-07-261-3/+2
|/
* Merge pull request #29941 from kamipo/remove_single_element_array_preprocessSean Griffin2017-07-252-2/+2
|\
| * Remove single element array preprocessRyuta Kamizono2017-07-262-2/+2
* | Clarify add_column limit documentationLisa Ugray2017-07-251-0/+1
* | Allow `Relation#or` to accept a relation with different `references`Sean Griffin2017-07-251-1/+2
|/
* Merge pull request #29934 from kamipo/remove_join_informationSean Griffin2017-07-253-10/+5
|\
| * Remove useless `JoinInformation`Ryuta Kamizono2017-07-253-10/+5
* | Remove unused `queries_predicates`Ryuta Kamizono2017-07-251-12/+0
|/
* Merge pull request #29848 from kamipo/fix_distinct_count_with_order_and_limitRafael França2017-07-243-11/+24
|\
| * Should keep the table name qualified `*` for distinct subqueryRyuta Kamizono2017-07-221-1/+1
| * Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT`Ryuta Kamizono2017-07-223-11/+24
* | Merge pull request #29765 from lugray/fix_counter_cacheRafael França2017-07-242-4/+1
|\ \
| * | Add test for fixed `counter_cache` double incrementLisa Ugray2017-07-192-4/+1
* | | Fix test failures when prepared statements are disabledSean Griffin2017-07-243-14/+35
* | | Fix build failures on PGSean Griffin2017-07-241-0/+4
* | | Fix build failures on MySQLSean Griffin2017-07-242-2/+2
* | | Refactor Active Record to let Arel manage bind paramsSean Griffin2017-07-2426-329/+225
* | | Avoid modifying frozen string in check_schema_fileEugene Kenny2017-07-231-1/+1
* | | Merge pull request #29768 from janpieper/sort-enabled-extensions-in-dumpEileen M. Uchitelle2017-07-221-1/+1
|\ \ \
| * | | Sort enabled adapter extensions in schema dumpJan Pieper2017-07-121-1/+1
* | | | Merge pull request #29870 from kamipo/use_true_false_literalsSean Griffin2017-07-222-14/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use `TRUE` and `FALSE` boolean literals for MySQLRyuta Kamizono2017-07-202-14/+6
* | | | Merge pull request #29869 from kamipo/make_type_map_to_privateRafael França2017-07-214-17/+16
|\ \ \ \
| * | | | Make `type_map` to private because it is only used in the connection adapterRyuta Kamizono2017-07-204-17/+16
| |/ / /
* | | | Merge pull request #29855 from lugray/has_one_destroyed_by_associationRafael França2017-07-211-0/+2
|\ \ \ \
| * | | | Match destroyed_by_association for has_one to has_manyLisa Ugray2017-07-211-0/+2
| |/ / /
* / / / Use frozen-string-literal in ActiveRecordKir Shatrov2017-07-19235-0/+470
|/ / /
* | | Merge pull request #29033 from kamipo/make_preload_query_to_prepared_statementsSean Griffin2017-07-181-1/+1
|\ \ \ | |_|/ |/| |
| * | Make preload query to preparableRyuta Kamizono2017-07-071-1/+1
* | | Fix type casting a time for MariaDBRyuta Kamizono2017-07-191-1/+0
* | | Merge branch 'master' into fix_unscope_where_column_with_orSean Griffin2017-07-1827-180/+95
|\ \ \
| * \ \ 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-183-3/+19
| |\ \ \
| | * | | Fix unscoping `default_scope` for `Preloader`Ryuta Kamizono2017-07-191-1/+11
| | * | | Fix unscoping `default_scope` in STI associationsRyuta Kamizono2017-07-192-2/+8
| * | | | Don't convert dates to strings when using prepared statements in mysqlSean Griffin2017-07-181-0/+8
| |/ / /
| * | | Remove deprecated code concerning non-attributes and `*_will_change!`Sean Griffin2017-07-182-18/+3
| * | | Remove deprecated code concerning dirty methods in after callbacksSean Griffin2017-07-181-79/+8
| * | | Remove incorrect commentSean Griffin2017-07-181-2/+0
| * | | Fix `JoinDependency` with using a custom tableRyuta Kamizono2017-07-185-13/+15
| * | | Merge pull request #29796 from kamipo/fix_where_with_custom_tableSean Griffin2017-07-171-1/+1
| |\ \ \