aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Remove unused variableyuuji.yaginuma2017-06-221-1/+1
* Merge pull request #29513 from kirs/fixture-yaml-fallbackRafael França2017-06-211-5/+4
|\
| * Avoid begin/rescue in fixture quotingKir Shatrov2017-06-201-5/+4
* | Keep INNER JOIN when merging relationsMaxime Lapointe2017-06-203-5/+40
|/
* Fix ActiveRecord::Persistence#touch with lockingbogdanvlviv2017-06-214-3/+33
* Fix destroy with locking_column value nullbogdanvlviv2017-06-203-1/+31
* Merge pull request #29504 from kirs/fixtures-arel-bulkRafael França2017-06-208-10/+116
|\
| * Use bulk INSERT to insert fixturesKir Shatrov2017-06-208-10/+116
* | Merge pull request #28833 from bogdanvlviv/add-test-cases-for-optimistic-lockingRafael França2017-06-202-3/+23
|\ \ | |/ |/|
| * Clean up 'Optimistic Locking' implementationbogdanvlviv2017-06-121-3/+4
| * Add test cases for optimistic lockingbogdanvlviv2017-06-121-0/+19
* | Merge pull request #29454 from kamipo/fix_exists_queries_with_cacheRafael França2017-06-193-51/+46
|\ \
| * | Ensure query caching for `select_*` methods in connection adaptersRyuta Kamizono2017-06-154-52/+41
| * | Fix `Relation#exists?` queries with query cacheRyuta Kamizono2017-06-152-1/+7
* | | Merge pull request #29494 from kamipo/prevent_extra_scope_constructionRafael França2017-06-193-3/+5
|\ \ \
| * | | Prevent extra `scope` construction in `find_target`Ryuta Kamizono2017-06-183-3/+5
* | | | Merge pull request #29486 from kirs/fixtures-arelRafael França2017-06-191-4/+11
|\ \ \ \
| * | | | Refactor #insert_fixtures to use ArelKir Shatrov2017-06-191-4/+11
* | | | | Merge pull request #29491 from kamipo/add_test_case_for_28754Matthew Draper2017-06-181-0/+19
|\ \ \ \ \
| * | | | | Add a test case for #28754Ryuta Kamizono2017-06-181-0/+19
| | |/ / / | |/| | |
* / | | | Remove debug printRyuta Kamizono2017-06-181-13/+0
|/ / / /
* | | | Merge pull request #29415 from kamipo/remove_unused_defined_associationGuillermo Iguaran2017-06-162-2/+1
|\ \ \ \
| * | | | Remove unused defined associationRyuta Kamizono2017-06-112-2/+1
| | |_|/ | |/| |
* | | | Merge pull request #29455 from kirs/remove-column-with-fk-mysqlGuillermo Iguaran2017-06-162-0/+17
|\ \ \ \
| * | | | Remove FK together with column in MySQLKir Shatrov2017-06-162-0/+17
* | | | | Merge pull request #29392 from alexcameron89/unpersisted_create_associationMatthew Draper2017-06-173-1/+14
|\ \ \ \ \
| * | | | | Raise on create for singular association when parent is unpersistedAlex Kitchens2017-06-083-1/+14
| |/ / / /
* | | | | Merge pull request #29431 from kamipo/fix_create_table_with_query_from_relationMatthew Draper2017-06-172-7/+10
|\ \ \ \ \
| * | | | | Fix `create_table` with query from relationRyuta Kamizono2017-06-132-7/+10
| | |/ / / | |/| | |
* | | | | Merge pull request #29461 from dnl/unscope_where_orMatthew Draper2017-06-172-1/+26
|\ \ \ \ \
| * | | | | Don't require 'unscope' to be the same for both sides of a 'or' relation.Dan Sherson2017-06-152-1/+26
* | | | | | Use nullable `id` column instead of a primary keyRyuta Kamizono2017-06-161-1/+2
| |_|_|/ / |/| | | |
* | | | | Merge pull request #29464 from eugeneius/raw_write_attributeRafael França2017-06-152-15/+12
|\ \ \ \ \
| * | | | | Don't map id to primary key in raw_write_attributeEugene Kenny2017-06-152-15/+12
| |/ / / /
* | | | | Merge pull request #29462 from kamipo/fix_dump_schema_information_with_empty_...Rafael França2017-06-152-1/+7
|\ \ \ \ \
| * | | | | Fix `dump_schema_information` with empty versionsRyuta Kamizono2017-06-152-1/+7
* | | | | | Merge pull request #29453 from kamipo/add_test_case_for_28274Guillermo Iguaran2017-06-151-0/+46
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add test cases for #28274Ryuta Kamizono2017-06-151-0/+46
| | |_|_|/ | |/| | |
* | | | | Remove deprecated option from docs [ci skip] (#29459)Vipul A M2017-06-151-6/+6
| |/ / / |/| | |
* | | | Merge pull request #29409 from eugeneius/skip_test_uuid_column_defaultRafael França2017-06-151-1/+2
|\ \ \ \
| * | | | Allow `uuid_test.rb` to be loaded on all adaptersEugene Kenny2017-06-141-1/+2
| | |/ / | |/| |
* | | | Prevent extra `sync_with_transaction_state`Ryuta Kamizono2017-06-151-5/+2
| |/ / |/| |
* | | Merge pull request #29378 from kamipo/avoid_overwriting_id_attribute_methodsRafael França2017-06-144-19/+24
|\ \ \
| * | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey`Ryuta Kamizono2017-06-074-19/+24
| | |/ | |/|
* | | Use `require_relative` instead of `require` with full pathbogdanvlviv2017-06-143-4/+4
* | | Add test for backward compatibility when using change_tableKoichi ITO2017-06-131-0/+15
| |/ |/|
* | Remove `null_allowed` option from doc [ci skip]yuuji.yaginuma2017-06-101-2/+1
|/
* Merge pull request #28868 from yahonda/pg10_oid_unknown_to_textMatthew Draper2017-06-071-8/+8
|\
| * PostgreSQL 10 converts unknown OID 705 to text 25Yasuo Honda2017-06-061-8/+8
* | Merge pull request #29362 from kamipo/remove_redundant_assert_nothing_raisedMatthew Draper2017-06-063-11/+0
|\ \