aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5-0-beta-sec'Aaron Patterson2016-01-256-7/+30
|\
| * bumping versionAaron Patterson2016-01-251-1/+1
| * Eliminate instance level writers for class accessorsAaron Patterson2016-01-223-4/+4
| * Don't short-circuit reject_if procAndrew White2016-01-222-2/+25
* | Merge pull request #23161 from schneems/schneems/fix-mysql-internalmetadataRichard Schneeman2016-01-252-9/+36
|\ \
| * | [close #23009] Limit key lengthschneems2016-01-212-9/+36
* | | When verifying size of relation, also verify count is ok.Vipul A M2016-01-251-0/+1
* | | Merge pull request #23221 from vipulnsward/23209-fix-missin_source_typeRafael França2016-01-246-0/+26
|\ \ \
| * | | Add missing source_type if provided on hmt which belongs to an sti recordVipul A M2016-01-246-0/+26
* | | | Fix AR::Relation#cache_key to remove select scope added by userPrathamesh Sonpatki2016-01-242-0/+7
* | | | Merge pull request #23081 from prathamesh-sonpatki/fix-cache-key-for-queries-...Kasper Timm Hansen2016-01-242-2/+13
|\ \ \ \
| * | | | Fix ActiveRecord::Relation#cache_key for relations with no resultsPrathamesh Sonpatki2016-01-222-2/+13
* | | | | Pare back default `index` option for the migration generatorPrathamesh Sonpatki2016-01-247-12/+51
| |/ / / |/| | |
* | | | Add environment back to db:structure:loadAndrew White2016-01-231-1/+1
* | | | Merge pull request #23102 from yui-knk/foreign_type_to_singular_associationEileen M. Uchitelle2016-01-233-3/+3
|\ \ \ \
| * | | | Define `:foreign_type` as a valid option in `SingularAssociation`yui-knk2016-01-193-3/+3
* | | | | Use the database type to deserialize enumSean Griffin2016-01-234-4/+19
* | | | | [ci skip] Add note about tsrange and timezone awareness to docspalkan2016-01-221-1/+5
| |/ / / |/| | |
* | | | Merge pull request #23080 from prathamesh-sonpatki/fix-cache-key-for-loaded-e...Matthew Draper2016-01-222-1/+11
|\ \ \ \
| * | | | Fix ActiveRecord::Relation#cache_key for loaded empty collectionPrathamesh Sonpatki2016-01-162-1/+11
* | | | | Use bind parameters for ranges in where clausesSean Griffin2016-01-212-2/+36
| |_|/ / |/| | |
* | | | Fix the API documentation layout of after_*_commitGenadi Samokovarov2016-01-201-3/+3
* | | | Pluralize counter_cache column name in example [ci skip]Amit Thawait2016-01-201-4/+4
* | | | Update CHANEGLOG for https://github.com/rails/rails/pull/20005 [ci skip]Prathamesh Sonpatki2016-01-201-1/+5
* | | | Add `ModelSchema::type_for_attribute` to the public APISean Griffin2016-01-191-1/+12
* | | | Fix test failure on PostgreSQL by sorting the result before comparisonPrathamesh Sonpatki2016-01-191-4/+5
* | | | run `type` column through attribtues API type casting.Yves Senn2016-01-193-0/+84
* | | | refer to rails command instead of rake in environment erroryuuji.yaginuma2016-01-191-2/+2
* | | | Changed options for find_each and variants to have options start/finish inste...Vipul A M2016-01-184-82/+46
| |/ / |/| |
* | | Merge pull request #20005 from kamipo/default_expression_supportRafael França2016-01-1611-44/+100
|\ \ \
| * | | Fix extract default with CURRENT_TIMESTUMPRyuta Kamizono2016-01-133-2/+24
| * | | Fix extract default with CURRENT_DATERyuta Kamizono2016-01-131-3/+8
| * | | Add expression support on the schema defaultRyuta Kamizono2016-01-138-39/+68
* | | | Merge pull request #23067 from kamipo/sql_for_insert_returns_values_for_passi...Rafael França2016-01-163-24/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | `sql_for_insert` returns values for passing to `exec_insert`Ryuta Kamizono2016-01-153-24/+16
* | | | Merge pull request #23060 from schneems/schneems/revert-revert-migration-set-...Richard Schneeman2016-01-152-19/+59
|\ \ \ \
| * | | | Fix intermittent test failuresschneems2016-01-141-0/+1
| * | | | Revert "Revert "Set environment even when no migration runs""schneems2016-01-142-19/+58
| |/ / /
* | | | Merge pull request #23065 from kamipo/clean_up_internal_metadata_definitionRichard Schneeman2016-01-152-4/+3
|\ \ \ \
| * | | | Clean up internal metadata definitionRyuta Kamizono2016-01-152-4/+3
* | | | | `last_insert_id_value` and `last_insert_id` are unused anymoreRyuta Kamizono2016-01-151-9/+1
| |/ / / |/| | |
* | | | Revert "Set environment even when no migration runs"Sean Griffin2016-01-142-58/+19
* | | | Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-t...Kasper Timm Hansen2016-01-145-45/+2
* | | | Merge pull request #23048 from kamipo/substitute_at_is_no_longer_usedSean Griffin2016-01-146-20/+3
|\ \ \ \
| * | | | `substitute_at` is no longer usedRyuta Kamizono2016-01-146-20/+3
| | |/ / | |/| |
* | | | Properly include the `from` clause when merging relationsSean Griffin2016-01-142-0/+10
* | | | Ensure enum scopes work properly with STI and inheritanceSean Griffin2016-01-141-1/+1
* | | | Merge pull request #23017 from schneems/schneems/migration-sets-environment-v...Richard Schneeman2016-01-142-19/+58
|\ \ \ \
| * | | | Set environment even when no migration runsschneems2016-01-112-1/+37
| * | | | Clean up duplicate migration logicschneems2016-01-112-18/+21
| | |/ / | |/| |