aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #27674 from kjg/migration_generator_honor_path_configAndrew White2017-01-173-2/+22
|\
| * Generate migrations at path set by `config.paths["db/migrate"]`Kevin Glowacz2017-01-163-2/+22
* | Merge pull request #27700 from kenta-s/remove-meaningless-line-from-adapter-testAndrew White2017-01-171-1/+0
|\ \
| * | Remove meaningless line from adapter_test.rbkenta-s2017-01-161-1/+0
* | | SQLite: Foreign Key SupportRyuta Kamizono2017-01-176-30/+81
* | | Should work foreign key in test schema without `if supports_foreign_keys?` st...Ryuta Kamizono2017-01-172-8/+6
| |/ |/|
* | Add CHANGELOG entry for #27701Andrew White2017-01-161-0/+4
* | Merge pull request #27701 from kamipo/translate_foreign_key_violationAndrew White2017-01-162-45/+74
|\ \
| * | Translate Foreign Key violation to the specific exception for SQLite3 adapterRyuta Kamizono2017-01-162-45/+74
| |/
* / Allow SQLServerAdapter to opt into a few tests.Ken Collins2017-01-163-4/+4
|/
* Merge pull request #27683 from eugeneius/update_counters_empty_touch_testKasper Timm Hansen2017-01-151-0/+9
|\
| * Add test for update_counters with empty touchEugene Kenny2017-01-151-0/+9
* | Revert "Don't guard against `touch: []`."Kasper Timm Hansen2017-01-151-1/+2
* | Merge pull request #27618 from kamipo/fix_uuid_default_nilKasper Timm Hansen2017-01-152-20/+37
|\ \
| * | Fix UUID primary key with default nil in legacy migrationRyuta Kamizono2017-01-092-1/+20
| * | Should test uuid legacy migration without `supports_pgcrypto_uuid?`Ryuta Kamizono2017-01-091-19/+17
* | | Don't guard against `touch: []`.Kasper Timm Hansen2017-01-151-2/+1
| |/ |/|
* | Merge pull request #27660 from akihiro17/updates-timestampKasper Timm Hansen2017-01-144-7/+32
|\ \
| * | Add the touch option to ActiveRecord#increment! and decrement!akihiro172017-01-144-7/+32
* | | `type_condition` should be overwritten by `create_with_value` in `scope_for_c...Ryuta Kamizono2017-01-151-1/+1
* | | Fix pool_from_any_process to use most recent speceileencodes2017-01-132-1/+36
|/ /
* | class Foo < Struct.new(:x) creates an extra unneeded anonymous classAkira Matsuda2017-01-136-16/+12
* | Reduce string objects by using \ instead of + or << for concatenating stringsAkira Matsuda2017-01-127-12/+12
* | beginrescueendAkira Matsuda2017-01-121-5/+3
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-01-111-3/+3
|\ \
| * | `meta-data` --> `metadata`Jon Moss2016-12-311-3/+3
* | | Fix indentKouhei Sutou2017-01-111-1/+1
* | | oops! :scream_cat:Akira Matsuda2017-01-101-1/+1
* | | Use temporary connection pool for the tests clearing AR::Base's active_connec...Akira Matsuda2017-01-101-59/+92
* | | Reconnecting AR::Base's connection breaks sqlite3_mem testsAkira Matsuda2017-01-101-2/+6
* | | sqlite3_mem tests are broken since 79887593c18919fed49f441d64236362cb755872Akira Matsuda2017-01-101-0/+2
* | | Merge pull request #27621 from dylanahsmith/mysql2-nil-connection-testYves Senn2017-01-101-1/+2
|\ \ \
| * | | activerecord/test: Fix Mysql2ConnectionTest#test_execute_after_disconnectDylan Thacker-Smith2017-01-091-1/+2
* | | | Improve deprecation message for deprecated reflection class nameRyuta Kamizono2017-01-101-1/+1
* | | | Suppress deprecation message to `has_and_belongs_to_many` only onceRyuta Kamizono2017-01-101-2/+2
|/ / /
* | | Merge pull request #27551 from kirs/deprecate-class-name-as-classKasper Timm Hansen2017-01-095-3/+27
|\ \ \ | |_|/ |/| |
| * | Deprecate reflection class name to accept a classKir Shatrov2017-01-095-3/+27
* | | Merge pull request #25427 from eugeneius/update_increment_documentationKasper Timm Hansen2017-01-081-8/+8
|\ \ \ | |/ / |/| |
| * | Update increment! documentation [ci skip]Eugene Kenny2016-08-151-8/+8
* | | Merge pull request #27603 from prathamesh-sonpatki/fix-random-failureSantiago Pastorino2017-01-081-0/+2
|\ \ \
| * | | Fix random failure related to migration environmentPrathamesh Sonpatki2017-01-071-0/+2
* | | | Merge pull request #27602 from prathamesh-sonpatki/followup-27596Santiago Pastorino2017-01-081-1/+8
|\ \ \ \
| * | | | Followup of #27596, test output of "run" method as wellPrathamesh Sonpatki2017-01-071-1/+8
| |/ / /
* | | | Merge pull request #27598 from NickLaMuro/fix-deep-nesting-where-clauses-with...Sean Griffin2017-01-072-1/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Adds .to_s to table_name callNick LaMuro2017-01-061-1/+1
| * | | Add failing test for where with joinsNick LaMuro2017-01-061-0/+17
* | | | Preserve `up` and `down` return typeschneems2017-01-062-2/+18
|/ / /
* | | Merge pull request #27294 from eavgerinos/doc-ar-callbacks-orderRafael França2017-01-061-0/+49
|\ \ \
| * | | [ci skip] ActiveRecord: Document order of CallbacksAggelos Avgerinos2016-12-221-0/+49
* | | | Privatize unneededly protected methods in Active RecordAkira Matsuda2017-01-055-16/+12