aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29520 from kirs/serialize-vs-postgres-native-columnSean Griffin2017-08-043-0/+42
|\
| * Do not let use `serialize` on native JSON/array columnKir Shatrov2017-08-043-0/+42
* | Use `Concurrent::Map` than `Mutex` and `Mutex_m` for statement cachesRyuta Kamizono2017-08-042-10/+6
* | Fix all rubocop violationsRafael Mendonça França2017-08-031-2/+2
* | Passing `klass` to `StatementCache.new`Ryuta Kamizono2017-08-046-32/+31
* | Merge pull request #30011 from guilherme/fix-migration-generator-special-casesSean Griffin2017-08-031-1/+1
|\ \
| * | Handling add/remove to/from migration edge casesGuilherme Reis Campos2017-08-031-1/+1
* | | Merge pull request #29914 from kamipo/relation_merger_should_not_fill_empty_v...Matthew Draper2017-08-023-19/+30
|\ \ \
| * | | `get_value` and `set_value` in `Relation` are no longer used externallyRyuta Kamizono2017-07-251-9/+10
| * | | `Relation::Merger` should not fill `values` with empty valuesRyuta Kamizono2017-07-252-10/+20
* | | | Merge pull request #29842 from kamipo/fix_find_by_with_rangeMatthew Draper2017-08-023-4/+12
|\ \ \ \
| * | | | Fix `find_by` with range conditionsRyuta Kamizono2017-07-203-4/+12
* | | | | Merge pull request #29271 from rails/unlock-minitestKasper Timm Hansen2017-08-0215-64/+83
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into unlock-minitestRafael Mendonça França2017-08-01684-1127/+2560
| |\ \ \ \ \
| * | | | | | Move `reset_pk_sequence!` test to `AdapterTestWithoutTransaction`yuuji.yaginuma2017-07-171-20/+20
| * | | | | | Reset column information after schema changedyuuji.yaginuma2017-07-161-0/+2
| * | | | | | Merge pull request #29380 from y-yagi/insert_environment_value_to_table_befor...Kasper Timm Hansen2017-07-151-0/+4
| |\ \ \ \ \ \
| | * | | | | | Insert environment value to `InternalMetadata` after recreating the tableyuuji.yaginuma2017-06-091-0/+4
| * | | | | | | Stupid empty line added after merge.Kasper Timm Hansen2017-07-151-1/+0
| * | | | | | | Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-07-15152-1011/+1789
| |\ \ \ \ \ \ \
| * | | | | | | | Add teardown to reset_connection at MysqlTypeLookupTestYasuo Honda2017-06-071-0/+7
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Load schema before assertionyuuji.yaginuma2017-06-061-0/+6
| * | | | | | | Merge pull request #29341 from y-yagi/explicitly_clear_type_map_before_run_testMatthew Draper2017-06-042-10/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Explicitly clear type map before run `test_only_reload_type_map_once_for_ever...yuuji.yaginuma2017-06-032-10/+12
| * | | | | | | | Reset the fixture cache after (re)loading the schemaMatthew Draper2017-06-031-0/+2
| |/ / / / / / /
| * | | | | | | Merge pull request #29332 from yahonda/unlock-minitest_unknown_type_fixRafael França2017-06-021-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Clean up `type_map` at the end of test_respond_to_for_non_selected_elementYasuo Honda2017-06-021-0/+5
| * | | | | | | | Merge branch 'master' into unlock-minitestRafael Mendonça França2017-06-0245-293/+369
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Use existing class in PersistenceTest::SaveTestAlex Kitchens2017-06-011-21/+7
| * | | | | | | | Merge pull request #29287 from alexcameron89/fix-db-statement-test-48104Matthew Draper2017-06-011-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Reset primary key sequence in FixturesResetPkSequenceTestsAlex Kitchens2017-05-311-0/+1
| * | | | | | | | | Ensure fixtures are loaded for FoxyFixturesTestAlex Kitchens2017-05-311-0/+2
| * | | | | | | | | Make sure to disable extension after testyuuji.yaginuma2017-05-311-6/+2
| |/ / / / / / / /
| * | | | | | | | Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-05-29129-908/+957
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Explicitly create necessary data for testyuuji.yaginuma2017-05-131-0/+4
| * | | | | | | | | Run ReloadModelTest in a different proccessRafael Mendonça França2017-04-271-1/+3
| * | | | | | | | | Only clean the connection of the current connection poolRafael Mendonça França2017-04-261-1/+1
| * | | | | | | | | Don't use same table between primary_keys tests and composite_primary_keys testsPrathamesh Sonpatki2017-04-261-7/+7
| * | | | | | | | | Fix one more test randomly failing due to array ordering issue on PG adapterPrathamesh Sonpatki2017-04-261-2/+2
| * | | | | | | | | Fix the random failure of `test_create_resets_cached_counters`Prathamesh Sonpatki2017-04-262-2/+7
| * | | | | | | | | Fix random test failure of test_create_resets_cached_countersPrathamesh Sonpatki2017-04-261-2/+2
| * | | | | | | | | Don't add specific id's to the readers fixturesPrathamesh Sonpatki2017-04-261-2/+0
* | | | | | | | | | Merge pull request #29724 from eugeneius/sync_primary_keyMatthew Draper2017-08-024-5/+57
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Sync transaction state when accessing primary keyEugene Kenny2017-07-094-5/+57
* | | | | | | | | | Merge pull request #30024 from kamipo/remove_redundant_unless_branchSean Griffin2017-07-311-2/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove redundant `unless current_adapter?(:OracleAdapter)`Ryuta Kamizono2017-07-281-2/+0
* | | | | | | | | | | Add backticks around method [ci skip]Ryuta Kamizono2017-08-011-1/+1
* | | | | | | | | | | Merge pull request #29950 from MaxLap/avoid_or_clause_duplicatesSean Griffin2017-07-313-6/+66
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Edits following the reviewsMaxime Lapointe2017-07-282-27/+43
| * | | | | | | | | | Avoid duplicate clauses when using #orMaxime Lapointe2017-07-253-9/+53