aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29770 from y-yagi/fix_boolean_column_migration_scriptKasper Timm Hansen2017-07-152-2/+2
|\
| * Fix boolean column migration scriptyuuji.yaginuma2017-07-132-2/+2
* | Remove useless `aliased_table_name` in `JoinDependency`Ryuta Kamizono2017-07-154-18/+1
|/
* Merge pull request #29699 from lugray/represent_boolean_as_integerMatthew Draper2017-07-128-8/+90
|\
| * Change sqlite3 boolean serialization to use 1 and 0Lisa Ugray2017-07-118-8/+90
* | Merge pull request #29746 from kamipo/extract_fake_klassRafael França2017-07-113-52/+38
|\ \
| * | Extract `FakeKlass` in `relation_test.rb` and `relation/mutation_test.rb`Ryuta Kamizono2017-07-113-52/+38
| |/
* / [Action Record] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-113-0/+3
|/
* * Don't eagerly require Rails' minitest plugin.Kasper Timm Hansen2017-07-101-1/+1
* Merge pull request #29655 from kirs/frozen-friendly-ap-arMatthew Draper2017-07-101-1/+2
|\
| * Prepare AP and AR to be frozen string friendlyKir Shatrov2017-07-061-1/+2
* | Merge pull request #29715 from reverbdotcom/ptd/fix-invalid-uuidsMatthew Draper2017-07-092-2/+4
|\ \
| * | Don't allow uuids with orphan curly bracespdebelak2017-07-072-2/+4
* | | Add backticks [ci skip]Ryuta Kamizono2017-07-091-2/+2
* | | Merge pull request #28867 from eugeneius/skip_query_cache_in_batchesMatthew Draper2017-07-0911-20/+224
|\ \ \
| * | | Skip query cache for in_batches and friendsEugene Kenny2017-07-0610-20/+216
* | | | Merge pull request #29692 from fimmtiu/avoid-translating-non-database-exceptionsMatthew Draper2017-07-093-2/+31
|\ \ \ \
| * | | | Remove driver-specific hard-coding in the tests.Dennis Taylor2017-07-071-9/+1
| * | | | Rename the StatementInvalid test method for clarity.Dennis Taylor2017-07-071-1/+1
| * | | | Fix changelog wording as suggested.Dennis Taylor2017-07-071-2/+2
| * | | | Use StandardError instead of RuntimeError.Dennis Taylor2017-07-061-2/+2
| * | | | Fix indentation style for private method.Dennis Taylor2017-07-051-5/+5
| * | | | Don't translate non-database exceptions.Dennis Taylor2017-07-053-2/+39
| |/ / /
* | | | Merge pull request #29495 from eugeneius/_write_attributeMatthew Draper2017-07-096-13/+19
|\ \ \ \
| * | | | Rename raw_write_attribute to write_attribute_without_type_castEugene Kenny2017-07-073-8/+8
| * | | | Improve the performance of writing attributesEugene Kenny2017-06-184-8/+14
* | | | | Merge pull request #29706 from kamipo/use_information_schema_to_extract_expre...Matthew Draper2017-07-092-2/+2
|\ \ \ \ \
| * | | | | Use `information_schema` to extract `generation_expression` for MariaDBRyuta Kamizono2017-07-072-2/+2
| | |_|/ / | |/| | |
* / | | | Fix default `CURRENT_TIMESTAMP` in schema dumping for MariaDB 10.2Ryuta Kamizono2017-07-071-2/+2
|/ / / /
* | / / Fix extracting MariaDB versionRyuta Kamizono2017-07-071-2/+6
| |/ / |/| |
* | | Fix `ActiveModel::Type::DateTime#serialize`Lisa Ugray2017-07-051-0/+13
* | | Merge pull request #29413 from kamipo/fix_association_with_scope_including_joinsRafael França2017-07-049-70/+60
|\ \ \
| * | | Fix eager loading association with scope including joinsRyuta Kamizono2017-07-044-11/+28
| * | | Fix preloading association with scope including joinsRyuta Kamizono2017-07-046-49/+32
| * | | Remove unused `association_key` and `table` methods in `Preloader::Association`Ryuta Kamizono2017-07-041-10/+0
| | |/ | |/|
* | | Merge pull request #29667 from kamipo/add_missing_attr_name_to_sRafael França2017-07-041-2/+3
|\ \ \
| * | | Add missing `attr_name.to_s` in `AttributeMutationTracker`Ryuta Kamizono2017-07-041-2/+3
| |/ /
* | | Merge pull request #29653 from kamipo/fix_test_copying_migrations_preserving_...Rafael França2017-07-043-6/+9
|\ \ \
| * | | Fix `test_copying_migrations_preserving_magic_comments`Ryuta Kamizono2017-07-023-6/+9
* | | | Remove database specific JSON typesRyuta Kamizono2017-07-053-14/+0
| |/ / |/| |
* | | Add backticks [ci skip]Ryuta Kamizono2017-07-031-2/+2
* | | Merge branch 'master' into require_relative_2017Xavier Noria2017-07-0237-147/+326
|\ \ \
| * \ \ Merge pull request #29658 from kamipo/remove_redundant_assert_respond_toKasper Timm Hansen2017-07-021-26/+0
| |\ \ \
| | * | | Remove redundant `assert_respond_to`Ryuta Kamizono2017-07-031-26/+0
| * | | | :warning: "Use assert_nil if expecting nil. This will fail in Minitest 6."Akira Matsuda2017-07-021-1/+1
| |/ / /
| * | | Fix removed version 5.2 to 6.0 in the deprecation messageRyuta Kamizono2017-07-021-1/+1
| * | | Apply record state based on parent transaction stateeileencodes2017-07-014-3/+96
| * | | Deprecate and replace `set_state` methodeileencodes2017-07-013-6/+73
| |/ /
| * | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-02679-691/+12
| * | Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-02679-12/+691
| |\ \