aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29848 from kamipo/fix_distinct_count_with_order_and_limitRafael França2017-07-247-45/+87
|\
| * Extract `Account` model to the dedicated fileRyuta Kamizono2017-07-222-34/+35
| * Should keep the table name qualified `*` for distinct subqueryRyuta Kamizono2017-07-222-1/+13
| * Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT`Ryuta Kamizono2017-07-225-11/+40
* | Fix `warning: assigned but unused variable - comment`Ryuta Kamizono2017-07-251-1/+1
* | Merge pull request #29765 from lugray/fix_counter_cacheRafael França2017-07-244-4/+18
|\ \
| * | Add test for fixed `counter_cache` double incrementLisa Ugray2017-07-194-4/+18
* | | Fix test failures when prepared statements are disabledSean Griffin2017-07-243-14/+35
* | | Fix build failures on PGSean Griffin2017-07-241-0/+4
* | | Merge pull request #29905 from kamipo/remove_duplicated_assertionSean Griffin2017-07-241-16/+2
|\ \ \
| * | | Remove duplicated assertion in `test_count_with_join`Ryuta Kamizono2017-07-241-16/+2
* | | | Fix build failures on MySQLSean Griffin2017-07-242-2/+2
* | | | Refactor Active Record to let Arel manage bind paramsSean Griffin2017-07-2436-458/+282
* | | | Merge pull request #29894 from eugeneius/check_schema_file_dup_stringKasper Timm Hansen2017-07-241-1/+1
|\ \ \ \
| * | | | Avoid modifying frozen string in check_schema_fileEugene Kenny2017-07-231-1/+1
* | | | | Merge pull request #29860 from georgeclaghorn/travel-back-automaticallyRafael França2017-07-241-4/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove time stubs after each testGeorge Claghorn2017-07-221-4/+0
* | | | | Merge pull request #29867 from koic/fix_a_failed_ar_test_when_using_oracleKasper Timm Hansen2017-07-231-2/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix a failued AR test when using OracleAdapterKoichi ITO2017-07-201-2/+10
* | | | | Merge pull request #29768 from janpieper/sort-enabled-extensions-in-dumpEileen M. Uchitelle2017-07-222-1/+15
|\ \ \ \ \
| * | | | | Sort enabled adapter extensions in schema dumpJan Pieper2017-07-122-1/+15
* | | | | | 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-219-31/+28
|\ \ \ \ \
| * | | | | Make `type_map` to private because it is only used in the connection adapterRyuta Kamizono2017-07-209-31/+28
| |/ / / /
* | | | | Merge pull request #29855 from lugray/has_one_destroyed_by_associationRafael França2017-07-213-0/+42
|\ \ \ \ \
| * | | | | Match destroyed_by_association for has_one to has_manyLisa Ugray2017-07-213-0/+42
| |/ / / /
* | | | | Merge pull request #29732 from kirs/frozen-activerecordRafael França2017-07-21677-11/+1366
|\ \ \ \ \
| * | | | | Reset column information after schema changedyuuji.yaginuma2017-07-202-0/+4
| * | | | | Use frozen-string-literal in ActiveRecordKir Shatrov2017-07-19676-11/+1362
| |/ / / /
* / / / / Revert "Extract `bind_param` and `bind_attribute` into `ActiveRecord::TestCase`"Sean Griffin2017-07-2113-46/+56
|/ / / /
* | | | 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
| |\ \ \ \