aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #27389 from kamipo/fix_mysql_pk_dumping_correctlyJeremy Daer2017-02-0611-236/+191
|\
| * Restore custom primary key tests lost at #26266Ryuta Kamizono2017-02-041-25/+43
| * Restore the behaviour of the compatibility layer for integer-like PKsRyuta Kamizono2017-02-046-174/+111
| * Correctly dump integer-like primary key with default nilRyuta Kamizono2017-02-045-40/+40
* | Merge pull request #27884 from kamipo/deprecate_migration_keysJeremy Daer2017-02-067-6/+18
|\ \
| * | Deprecate `ColumnDumper#migration_keys`Ryuta Kamizono2017-02-077-6/+18
* | | Remove useless `MySQL::Column` testsRyuta Kamizono2017-02-071-42/+0
|/ /
* | Merge pull request #27919 from bf4/correct_spellingArthur Nogueira Neves2017-02-069-15/+15
|\ \
| * | Correct spellingBenjamin Fleischer2017-02-059-15/+15
| |/
* / Indicate action that failed in YamlColumnKir Shatrov2017-02-054-10/+10
|/
* Merge pull request #27865 from composerinteralia/collection-ids-setter-bugEileen M. Uchitelle2017-02-033-2/+17
|\
| * Fix collection_singular_ids= bugDaniel Colson2017-02-023-2/+17
* | Fix a test of AR::Type::TypeMap#lookup when using OracleKoichi ITO2017-02-021-6/+14
|/
* Virtual/generated column support for MySQL 5.7.5+ and MariaDB 5.2.0+Ryuta Kamizono2017-02-0113-28/+170
* Chain scope constraints should respect own table aliasRyuta Kamizono2017-02-016-5/+41
* Merge pull request #27859 from yahonda/diag27826Rafael França2017-01-311-11/+22
|\
| * Use temporary connection pool for sqlite3_mem adapterYasuo Honda2017-01-311-11/+22
* | Merge pull request #27767 from benoittgt/freeze_sql_type_with_get_oid_typeArthur Nogueira Neves2017-01-311-1/+1
|\ \
| * | Freeze default empty string for sql_type in get_oid_typeBenoit Tigeot2017-01-221-1/+1
* | | Merge pull request #27855 from kevinzwhuang/finder-methods-typo-fixEileen M. Uchitelle2017-01-311-2/+2
|\ \ \
| * | | Fix grammar typo about sort in finder_methods.rbKevin Huang2017-01-301-2/+2
* | | | Merge pull request #27838 from kamipo/reload_destroyed_through_recordRafael França2017-01-312-0/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Reload `through_record` that has been destroyed in `create_through_record`Ryuta Kamizono2017-01-292-0/+11
* | | | Merge pull request #27849 from joevandyk/patch-2Rafael França2017-01-311-1/+2
* | | | Merge pull request #27797 from y-yagi/correctly_check_error_messageArthur Nogueira Neves2017-01-302-5/+13
|\ \ \ \
| * | | | correctly check error messageyuuji.yaginuma2017-01-252-5/+13
* | | | | Avoid lambda scopes when possibleAaron Patterson2017-01-301-3/+1
* | | | | deprecate `scope_chain`Aaron Patterson2017-01-302-5/+17
* | | | | update comments and call `super`Aaron Patterson2017-01-301-24/+3
* | | | | remove caching until we prove it is requiredAaron Patterson2017-01-301-7/+3
* | | | | Fix `scopes` implementation on `PolymorphicReflection`Aaron Patterson2017-01-303-54/+15
* | | | | Implement `scopes` method on each Reflectioneileencodes2017-01-301-5/+47
| |_|_|/ |/| | |
* | | | Merge pull request #27787 from y-yagi/show_correct_class_name_in_migration_errorRafael França2017-01-302-3/+4
|\ \ \ \
| * | | | show correct class name in migration inherited directly erroryuuji.yaginuma2017-01-242-3/+4
| |/ / /
* | | | Merge pull request #27847 from jaredbeck/patch-6Rafael França2017-01-301-0/+2
|\ \ \ \
| * | | | Docs: Specify return value of `save!`Jared Beck2017-01-301-0/+2
* | | | | Merge pull request #27743 from jordanlewis/simplify-postgres-column-definitionsRafael França2017-01-301-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Simplify Postgres query for column_definitions()Jordan Lewis2017-01-301-5/+5
| | |/ / | |/| |
* | | | Merge pull request #27773 from kirs/serialized-error-attributeRafael França2017-01-305-17/+34
|\ \ \ \ | |/ / / |/| | |
| * | | Report the attribute on ActiveRecord::SerializationTypeMismatchKir Shatrov2017-01-295-17/+34
| |/ /
* | | Missing require "active_support/multibyte/chars"Akira Matsuda2017-01-271-0/+1
* | | Add assertion messagesAkira Matsuda2017-01-252-2/+2
|/ /
* / move `db_migrate_path` method to `Migration` moduleyuuji.yaginuma2017-01-223-16/+8
|/
* Deprecate `initialize_schema_migrations_table` and `initialize_internal_metad...Ryuta Kamizono2017-01-206-13/+21
* Revert "Merge pull request #27718 from kamipo/remove_internal_public_methods"Matthew Draper2017-01-206-13/+18
* Merge pull request #27384 from matthewd/bigint-pk-tweaksMatthew Draper2017-01-205-9/+7
|\
| * Tweak bigint PK handlingMatthew Draper2017-01-185-9/+7
* | Add CHANGELOG entry for #24743Ryuta Kamizono2017-01-191-2/+6
* | assert_send is going to be deprecated since minitest 5.10.0Akira Matsuda2017-01-182-2/+2
* | Make sure to clear query cache to prevent sporadic test failureAkira Matsuda2017-01-181-0/+4