aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #30773 from y-yagi/fix_30765Eileen M. Uchitelle2017-11-121-1/+2
|\
| * Make automatically synchronize test schema work inside engineyuuji.yaginuma2017-10-021-1/+2
* | Merge pull request #30791 from felipecvo/nested-attributes-docEileen M. Uchitelle2017-11-121-0/+12
|\ \
| * | Add update_only example to AR nested attributes doc [ci_skip]Felipe Oliveira2017-10-031-0/+12
| |/
* | Raise `TransactionTimeout` when lock wait timeout exceeded for PG adapterRyuta Kamizono2017-11-114-3/+35
* | Should test actual error which is raised from the databaseRyuta Kamizono2017-11-111-1/+23
* | Add missing autoload `Type` (#31123)Ryuta Kamizono2017-11-112-1/+1
* | Relation merging should keep joining orderRyuta Kamizono2017-11-112-10/+17
* | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2017-11-101-1/+1
* | Consolidate duplicated `to_ary`/`to_a` definitions in `Relation` and `Collect...Ryuta Kamizono2017-11-103-6/+9
* | Ensure `apply_join_dependency` for subqueries in `from` and `where`Ryuta Kamizono2017-11-103-0/+19
* | Remove useless preloader classesRyuta Kamizono2017-11-1010-104/+15
* | Merge pull request #30414 from bogdanvlviv/clear-mysql_database_tasksRafael França2017-11-093-139/+5
|\ \
| * | Simplify implementation of `MySQLDatabaseTasks`bogdanvlviv2017-10-303-135/+3
| * | Raise error if unsupported charset for mysqlbogdanvlviv2017-10-302-7/+5
* | | Merge pull request #25346 from bogdan/correct-tags-count-in-fixturesRafael França2017-11-095-11/+20
|\ \ \
| * | | Set counter caches to correct values in fixturesBogdan Gusiev2017-11-085-11/+20
* | | | Move Attribute and AttributeSet to ActiveModelLisa Ugray2017-11-0915-1284/+19
* | | | Should pass `test_no_locks_no_wait` not only on `PostgreSQLAdapter` and `Orac...Ryuta Kamizono2017-11-091-8/+5
* | | | Run `ConcurrentTransactionTest` if `supports_transaction_isolation?`Yasuo Honda2017-11-081-15/+13
* | | | `Mysql2Adapter` should pass `ConcurrentTransactionTest`Ryuta Kamizono2017-11-091-1/+1
* | | | Consolidate redundant `if` and `unless` with the same conditionRyuta Kamizono2017-11-091-3/+1
* | | | Don't expose accessors which are internal used onlyRyuta Kamizono2017-11-082-3/+6
* | | | Don't expose internal methods in `Preloader::ThroughAssociation`Ryuta Kamizono2017-11-081-8/+7
|/ / /
* | | Merge pull request #30714 from bogdanvlviv/fix-rails_db_migrate_VERSIONRafael França2017-11-066-12/+201
|\ \ \
| * | | Fix `bin/rails db:migrate` with specified `VERSION`bogdanvlviv2017-11-066-12/+201
* | | | Remove useless `associated_records_by_owner`Ryuta Kamizono2017-11-072-16/+10
|/ / /
* | | Merge pull request #28360 from kbrock/transaction_fixMatthew Draper2017-11-071-1/+1
|\ \ \
| * | | Properly check transaction in persistenceKeenan Brock2017-11-061-1/+1
* | | | Refactor Preloader CodeBogdan Gusiev2017-11-063-81/+40
|/ / /
* | | `scoping` should respect current class and STI constraint (#29199)Ryuta Kamizono2017-11-063-1/+25
* | | Fix preloading polymorphic multi-level through associationRyuta Kamizono2017-11-062-1/+18
* | | Fix preloading polymorphic association when through association has already l...Ryuta Kamizono2017-11-062-4/+27
* | | Ensure `apply_join_dependency` for `update_all` and `delete_all` if eager-loa...Ryuta Kamizono2017-11-062-19/+40
* | | Ensure `apply_join_dependency` for `collection_cache_key` if eager-loading is...Ryuta Kamizono2017-11-065-3/+17
* | | Remove unused classesyuuji.yaginuma2017-11-031-30/+0
* | | Enable `Style/RedundantReturn` rubocop rule, and fixed a couple moreRyuta Kamizono2017-11-011-1/+1
* | | Address incorrect number of queries executed at Oracle enhanced adapterYasuo Honda2017-10-311-1/+1
* | | Merge pull request #31004 from shuheiktgw/remove_unnecessary_returnsRafael França2017-10-312-2/+2
|\ \ \ | |/ / |/| |
| * | removed unnecessary returnsShuhei Kitagawa2017-10-282-2/+2
* | | `source_type_scope` should respect correct table aliasRyuta Kamizono2017-10-302-7/+17
* | | `PolymorphicReflection#scopes` is no longer used since a5651eb5Ryuta Kamizono2017-10-301-5/+0
* | | [ci skip]Update the documentation about the primary key typesuginoy2017-10-294-20/+20
* | | Merge pull request #31005 from shuheiktgw/remove_unnecessary_semicolonsMatthew Draper2017-10-283-3/+3
|\ \ \ | |/ / |/| |
| * | removed unnecessary semicolonsShuhei Kitagawa2017-10-282-2/+2
|/ /
* | Remove CHANGELOG entry for PR #28681 [ci skip]Prathamesh Sonpatki2017-10-271-4/+0
* | Fix all `s/trough/through/`Ryuta Kamizono2017-10-271-1/+1
* | Fix typo `s/trough/through/`Ryuta Kamizono2017-10-271-1/+1
* | Merge pull request #30682 from ahorek/fix_scope_forRyuta Kamizono2017-10-276-1/+11
|\ \
| * | delegate scope forpavel2017-10-276-1/+11