aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #23067 from kamipo/sql_for_insert_returns_values_for_passi...Rafael França2016-01-162-22/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | `sql_for_insert` returns values for passing to `exec_insert`Ryuta Kamizono2016-01-152-22/+14
* | | | | | | Merge pull request #23060 from schneems/schneems/revert-revert-migration-set-...Richard Schneeman2016-01-151-18/+30
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Set environment even when no migration runs""schneems2016-01-141-18/+30
| |/ / / / / /
* | | | | | | 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-141-30/+18
* | | | | | | Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-t...Kasper Timm Hansen2016-01-141-23/+2
* | | | | | | Merge pull request #23048 from kamipo/substitute_at_is_no_longer_usedSean Griffin2016-01-143-9/+2
|\ \ \ \ \ \ \
| * | | | | | | `substitute_at` is no longer usedRyuta Kamizono2016-01-143-9/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Properly include the `from` clause when merging relationsSean Griffin2016-01-141-0/+3
* | | | | | | 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-141-18/+30
|\ \ \ \ \ \ \
| * | | | | | | Set environment even when no migration runsschneems2016-01-111-1/+10
| * | | | | | | Clean up duplicate migration logicschneems2016-01-111-17/+20
| | |/ / / / / | |/| | | | |
* | | | | | | update doc for << method of has_many associationankit19102016-01-141-0/+1
| |/ / / / / |/| | | | |
* | | | | | fix regression when loading fixture files with symbol keys.Yves Senn2016-01-131-2/+3
* | | | | | Improve error message for #or when it is structurally incompatibleRafael Mendonça França2016-01-131-6/+8
* | | | | | Revert "Change `WhereClause#merge` to same named columns on diff tables"Sean Griffin2016-01-121-10/+11
* | | | | | Change `WhereClause#merge` to same named columns on diff tablesSean Griffin2016-01-121-11/+10
* | | | | | Merge pull request #23004 from matthewd/default-scope-stiMatthew Draper2016-01-123-14/+20
|\ \ \ \ \ \
| * | | | | | Skip the STI condition when evaluating a default scopeMatthew Draper2016-01-122-3/+3
| * | | | | | Active scopes apply to child classes, though not parents/siblingsMatthew Draper2016-01-121-11/+17
| |/ / / / /
* / / / / / Allow manually setting environment valueschneems2016-01-112-6/+17
|/ / / / /
* | | | | Extract `MySQL::TypeMetadata` class to `connection_adapters/mysql/type_metada...Ryuta Kamizono2016-01-112-28/+34
* | | | | Extract `MySQL::Column` class to `connection_adapters/mysql/column.rb`Ryuta Kamizono2016-01-112-46/+52
* | | | | Merge pull request #22992 from akshay-vishnoi/fix-docsSean Griffin2016-01-091-1/+1
|\ \ \ \ \
| * | | | | [ci skip] fix typoAkshay Vishnoi2016-01-101-1/+1
* | | | | | Revert "Switch `has_secure_token` to `before_save`."Kasper Timm Hansen2016-01-091-4/+3
* | | | | | Switch `has_secure_token` to `before_save`.Kasper Timm Hansen2016-01-091-3/+4
* | | | | | Support :if and :unless in has_secure_tokenGriffin Smith2016-01-091-2/+23
|/ / / / /
* | | | | Merge pull request #22988 from y-yagi/match_environment_variable_name_and_err...Richard Schneeman2016-01-091-1/+1
|\ \ \ \ \
| * | | | | match the environment variable name that actually checking and error messageyuuji.yaginuma2016-01-091-1/+1
* | | | | | [ci skip] `automatic_inverse_of` returns `false` not `nil` (document fix)yui-knk2016-01-091-1/+1
|/ / / / /
* | | | | Merge pull request #22976 from schneems/schneems/schema-migration-primary-keySean Griffin2016-01-081-1/+1
|\ \ \ \ \
| * | | | | Get update_attributes working with SchemaMigrationschneems2016-01-081-1/+1
* | | | | | Fix the broken buildSean Griffin2016-01-081-0/+2
* | | | | | Refactor tz aware types, add support for PG rangesSean Griffin2016-01-083-8/+21
* | | | | | Merge pull request #22967 from schneems/schneems/generic-metadataSean Griffin2016-01-089-7/+149
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixing tests and re-locating error checking.schneems2016-01-082-9/+10
| * | | | | Fix kwarg to not have circular dependencyschneems2016-01-081-1/+1
| * | | | | Use hash like syntax for InternalMetadataschneems2016-01-084-11/+9
| * | | | | Add EnvironmentMismatchErrorschneems2016-01-082-4/+25
| * | | | | Use `key` as primary key in schema.schneems2016-01-081-1/+1
| * | | | | [ci skip] Add comment to remove silenced code.schneems2016-01-071-0/+1
| * | | | | Prevent destructive action on production databaseschneems2016-01-078-7/+128
* | | | | | Merge pull request #22973 from kamipo/fix_select_values_method_signatureRafael França2016-01-082-4/+4
|\ \ \ \ \ \
| * | | | | | Fix `select_values` method signature for consistencyRyuta Kamizono2016-01-082-4/+4
* | | | | | | `{update|delete}_sql` are almost the same as `{update|delete}`Ryuta Kamizono2016-01-084-25/+2
|/ / / / / /