aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25873 from schuetzm/warn_about_dirty_lockRafael Mendonça França2017-02-073-2/+18
|\
| * Deprecate locking of dirty recordsMarc Schütz2017-02-073-2/+18
* | Remove deprecated behavior that halts callbacks when the return is falseRafael Mendonça França2017-02-074-121/+4
* | Merge pull request #27608 from kamipo/remove_deprecated_passing_string_to_def...Rafael França2017-02-071-47/+0
|\ \ | |/ |/|
| * Remove deprecated passing string to define callbackRyuta Kamizono2017-02-041-47/+0
* | Revert "Remove useless `column_alias` in `subquery_for_count`"Ryuta Kamizono2017-02-072-3/+3
* | Merge pull request #27334 from kamipo/pk_and_ref_columns_should_be_identical_...Jeremy Daer2017-02-0712-31/+79
|\ \
| * | `primary_key` and `references` columns should be identical typeRyuta Kamizono2017-02-0712-31/+79
* | | Merge pull request #26378 from kamipo/decouple_building_arel_ast_for_uniquene...Jeremy Daer2017-02-064-41/+51
|\ \ \
| * | | Add `:nodoc:` to `case_sensitive_comparison` and `case_insensitive_comparison`Ryuta Kamizono2017-01-202-3/+3
| * | | Decouple the building Arel ASTs for uniqueness validatorRyuta Kamizono2016-12-254-38/+48
* | | | Remove useless `column_alias` in `subquery_for_count`Ryuta Kamizono2017-02-062-5/+5
| |/ / |/| |
* | | 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
| | |/ / / | |/| | |