aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Don't short-circuit reject_if procAndrew White2016-01-221-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updating an associated record via nested attribute hashes the reject_if proc could be bypassed if the _destroy flag was set in the attribute hash and allow_destroy was set to false. The fix is to only short-circuit if the _destroy flag is set and the option allow_destroy is set to true. It also fixes an issue where a new record wasn't created if _destroy was set and the option allow_destroy was set to false. CVE-2015-7577
* | | | | | | | Merge pull request #23161 from schneems/schneems/fix-mysql-internalmetadataRichard Schneeman2016-01-251-2/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [close #23009] Limit key length
| * | | | | | | | [close #23009] Limit key lengthschneems2016-01-211-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mysql has a weird bug where it cannot index a string column of utf8mb4 if it is over a certain character limit. To get compatibility with msql we can add a limit to the key column. 191 characters is a very long key, it seems reasonable to limit across all adapters since using a longer key wouldn't be supported in mysql. Thanks to @kamipo for the original PR and the test refactoring. Conversation: https://github.com/rails/rails/pull/23009#issuecomment-171416629
* | | | | | | | | Merge pull request #23221 from vipulnsward/23209-fix-missin_source_typeRafael França2016-01-241-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing source_type if provided on hmt which belongs to an sti re…
| * | | | | | | | | Add missing source_type if provided on hmt which belongs to an sti recordVipul A M2016-01-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23209
* | | | | | | | | | Fix AR::Relation#cache_key to remove select scope added by userPrathamesh Sonpatki2016-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We don't need the select scope added by user as we only want to max timestamp and size of the collection. So we already know which columns to select. - Additionally having user defined columns in select scope blows the cache_key method with PostGreSQL because it needs all `selected` columns in the group_by clause or aggregate function. - Fixes #23038.
* | | | | | | | | | Merge pull request #23081 from ↵Kasper Timm Hansen2016-01-241-2/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/fix-cache-key-for-queries-with-offset Fix ActiveRecord::Relation#cache_key for relations with no results
| * | | | | | | | | | Fix ActiveRecord::Relation#cache_key for relations with no resultsPrathamesh Sonpatki2016-01-221-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When relations return no result or 0 result then cache_key should handle it gracefully instead of blowing up trying to access `result[:size]` and `result[:timestamp]`. - Fixes #23063.
* | | | | | | | | | | Pare back default `index` option for the migration generatorPrathamesh Sonpatki2016-01-242-1/+13
| |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Using `references` or `belongs_to` in migrations will always add index for the referenced column by default, without adding `index:true` option to generated migration file. - Users can opt out of this by passing `index: false`. - Legacy migrations won't be affected by this change. They will continue to run as they were before. - Fixes #18146
* | | | | | | | | | Add environment back to db:structure:loadAndrew White2016-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of the changes in #22967 the assumption in #18907 is no longer true because the internal metadata feature for Active Record requires a working environment.
* | | | | | | | | | 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`
| * | | | | | | | | | Define `:foreign_type` as a valid option in `SingularAssociation`yui-knk2016-01-193-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `:foreign_type` is a valid option for `belongs_to` and `has_one` so remove this to `SingularAssociation`.
* | | | | | | | | | | Use the database type to deserialize enumSean Griffin2016-01-231-4/+7
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes incorrect assumptions made by e991c7b that we can assume the DB is already casting the value for us. The enum type needs additional information to perform casting, and needs a subtype. I've opted not to call `super` in `cast`, as we have a known set of types which we accept there, and the subtype likely doesn't accept them (symbol -> integer doesn't make sense) Close #23190
* | | | | | | | | | [ci skip] Add note about tsrange and timezone awareness to docspalkan2016-01-221-1/+5
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #23080 from ↵Matthew Draper2016-01-221-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/fix-cache-key-for-loaded-empty-collection Fix ActiveRecord::Relation#cache_key for loaded empty collection
| * | | | | | | | | Fix ActiveRecord::Relation#cache_key for loaded empty collectionPrathamesh Sonpatki2016-01-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Before this patch if we try to find cache_key of a loaded but empty collection it used to give error because of trying to call `updated_at` on `nil` value generated by `collection.max_by(&timestamp_column).public_send(timestamp_column)`. - This commit fixes above error by checking if size is greater than zero or not.
* | | | | | | | | | Use bind parameters for ranges in where clausesSean Griffin2016-01-212-2/+36
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a similar case to wanting ot use bind params for limit and offset. Right now passing a range grows the amount of prepared statements in an unbounded fashion. We could avoid using prepared statements in that case, similar to what we do with arrays, but there's a known number of variants for ranges. This ends up duplicating some of the logic from Arel for how to handle potentially infinite ranges, and that behavior may be removed from Arel in the future. Fixes #23074
* | | | | | | | | Fix the API documentation layout of after_*_commitGenadi Samokovarov2016-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just noticed this on the [edge API]. [ci skip] [edge API]: http://edgeapi.rubyonrails.org/classes/ActiveRecord/Transactions/ClassMethods.html
* | | | | | | | | Pluralize counter_cache column name in example [ci skip]Amit Thawait2016-01-201-4/+4
| | | | | | | | |
* | | | | | | | | Add `ModelSchema::type_for_attribute` to the public APISean Griffin2016-01-191-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want this method to be the single canonical source of information about type metadata related to a model. This is the method I've been continuously recommending people use if they need this sort of access, as I have no plans to remove or change it at any point in the future. We can do ourselves a favor and get people to use this instead of relying on some other part of the internals that they shouldn't be by making this method public.
* | | | | | | | | run `type` column through attribtues API type casting.Yves Senn2016-01-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #21986. This makes it possible to write custom types that define a different mapping for STI columns.
* | | | | | | | | refer to rails command instead of rake in environment erroryuuji.yaginuma2016-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been to use an overall rails command in ea4f0e2baba8653b03fba154357842933cf7b778, in order to unify.
* | | | | | | | | Changed options for find_each and variants to have options start/finish ↵Vipul A M2016-01-182-47/+32
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of start_at/end_at based on comments at https://github.com/rails/rails/pull/12257#issuecomment-74688344
* | | | | | | | Merge pull request #20005 from kamipo/default_expression_supportRafael França2016-01-166-20/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add `:expression` option support on the schema default
| * | | | | | | | Fix extract default with CURRENT_TIMESTUMPRyuta Kamizono2016-01-131-2/+6
| | | | | | | | |
| * | | | | | | | Fix extract default with CURRENT_DATERyuta Kamizono2016-01-131-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default 'now'::date is CURRENT_DATE.
| * | | | | | | | Add expression support on the schema defaultRyuta Kamizono2016-01-134-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :posts do |t| t.datetime :published_at, default: -> { 'NOW()' } end
* | | | | | | | | Merge pull request #23067 from ↵Rafael França2016-01-162-22/+14
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/sql_for_insert_returns_values_for_passing_to_exec_insert `sql_for_insert` returns values for passing to `exec_insert`
| * | | | | | | | `sql_for_insert` returns values for passing to `exec_insert`Ryuta Kamizono2016-01-152-22/+14
| | | | | | | | |
* | | | | | | | | Merge pull request #23060 from ↵Richard Schneeman2016-01-151-18/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/revert-revert-migration-set-environment Revert "Revert "Set environment even when no migration runs""
| * | | | | | | | | Revert "Revert "Set environment even when no migration runs""schneems2016-01-141-18/+30
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 11e85b91731ca6125ee1db33553f984549a3bc2b.
* | | | | | | | | Merge pull request #23065 from kamipo/clean_up_internal_metadata_definitionRichard Schneeman2016-01-152-4/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Clean up internal metadata definition
| * | | | | | | | | Clean up internal metadata definitionRyuta Kamizono2016-01-152-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `t.index` in `create_table` instead of `add_index` It is slightly more efficient. Revert "Use `key` as primary key in schema." This reverts commit 350ae6cdc1ea83e21c23abd10e7e99c9a0bbdbd2. `:primary_key` option does nothing if `id: false`. https://github.com/rails/rails/blob/v5.0.0.beta1/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb#L251-L261
* | | | | | | | | | `last_insert_id_value` and `last_insert_id` are unused anymoreRyuta Kamizono2016-01-151-9/+1
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | These methods are private and unused from anywhere.
* | | | | | | | | Revert "Set environment even when no migration runs"Sean Griffin2016-01-141-30/+18
| | | | | | | | |
* | | | | | | | | Revert "Merge pull request #20835 from ↵Kasper Timm Hansen2016-01-141-23/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glittershark/if-and-unless-in-secure-token" This reverts commit 224eddfc0eeff6555ae88691306e61c7a9e8b758, reversing changes made to 9d681fc74c6251d5f2b93fa9576c9b2113116680. When merging the pull request, I misunderstood `has_secure_token` as declaring a model has a token from birth and through the rest of its lifetime. Therefore, supporting conditional creation doesn't make sense. You should never mark a model as having a secure token if there's a time when it shouldn't have it on creation.
* | | | | | | | | Merge pull request #23048 from kamipo/substitute_at_is_no_longer_usedSean Griffin2016-01-143-9/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | `substitute_at` is no longer used
| * | | | | | | | | `substitute_at` is no longer usedRyuta Kamizono2016-01-143-9/+2
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Arel handles substitution for bind parameters by now.
* | | | | | | | | Properly include the `from` clause when merging relationsSean Griffin2016-01-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that set the from clause was removed in bdc5141652770fd227455681cde1f9899f55b0b9. I did not give any reason for doing so. My assumption was that I intended to change it to use the clause objects, but forgot. We appeared to not have test coverage for this case. Fixes #22996
* | | | | | | | | Ensure enum scopes work properly with STI and inheritanceSean Griffin2016-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was changed to call `where` on a specific class in 813c8c07, but no reasoning was given and I can't see any good reason why we would need to do that. This will ensure that the method is called on whatever class the scope is called on. Fixes #23013
* | | | | | | | | Merge pull request #23017 from ↵Richard Schneeman2016-01-141-18/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/migration-sets-environment-value Set environment even when no migration runs
| * | | | | | | | | Set environment even when no migration runsschneems2016-01-111-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR addresses the issue described in https://github.com/rails/rails/pull/22967#issuecomment-170251635. If the database is non empty and has no new migrations than `db:migrate` will not set the environment. This PR works by always setting the environment value on successful `up` migration regardless of whether or not a migration was actually executed.
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #22584.
* | | | | | | | Improve error message for #or when it is structurally incompatibleRafael Mendonça França2016-01-131-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you are using scopes and you chaining these scopes it is hard to know which are the values that are incompatible. This way you can read the message and know for which values you need to look for. [Herminio Torres]
* | | | | | | | Revert "Change `WhereClause#merge` to same named columns on diff tables"Sean Griffin2016-01-121-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5d41cb3bfd6b19833261622ce5d339b1e580bd8b. This implementation does not properly handle cases involving predicates which are not associated with a bind param. I have the fix in mind, but don't have time to implement just yet. It will be more similar to #22823 than not.
* | | | | | | | Change `WhereClause#merge` to same named columns on diff tablesSean Griffin2016-01-121-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the predicates are an arel equality node where the left side is a full arel attribute, the binds just have the name of the column and nothing else. This means that while splitting the predicates can include the table as a factor, the binds cannot. It's entirely possible that we might be able to have the bind params carry a bit more information (I don't believe the name is used for anything but logging), and that is probably a worthwhile change to make in the future. However the simplest (and likely slightly faster) solution is to simply use the indices of the conflicts in both cases. This means that we only have to compute the collision space once, instead of twice even though we're doing an additional array iteration. Regardless, this method isn't a performance hotspot. Close #22823. [Ben Woosley & Sean Griffin]
* | | | | | | | Merge pull request #23004 from matthewd/default-scope-stiMatthew Draper2016-01-123-14/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make default scopes + STI happy again
| * | | | | | | | Skip the STI condition when evaluating a default scopeMatthew Draper2016-01-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given a default_scope on a parent of the current class, where that parent is not the base class, the parent's STI condition would become attached to the evaluated default scope, and then override the child's own STI condition. Instead, we can treat the STI condition as though it is a default scope, and skip it in this situation: the scope will be merged into the base relation, which already contains the correct STI condition. Fixes #22426.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 09:22:27 +0000