aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23345 from ↵Rafael França2016-01-301-0/+7
|\ | | | | | | | | yui-knk/warning_when_composite_primary_key_is_detected Warn if `AR.primary_key` is called for a table who has composite prim…
| * Warn if `AR.primary_key` is called for a table who has composite primary keyyui-knk2016-01-301-0/+7
| | | | | | | | | | | | | | | | If `AR.primary_key` is called for a table who has composite primary key, the method returns `nil`. This behavior sometimes generates invalid SQL. The first time developers notice to invalid SQL is when they execute SQL. This commit enables developers to know they are doing something dangerous as soon as possible.
* | Merge pull request #23355 from kamipo/fix_bigint_for_enum_columnsRafael França2016-01-302-1/+6
|\ \ | | | | | | Fix `bigint?` for Enum columns in MySQL
| * | Fix `bigint?` for Enum columns in MySQLRyuta Kamizono2016-01-312-1/+6
| |/ | | | | | | Follow up to #22896.
* / There is no need to define test if a connection does not support primary_keyyui-knk2016-01-311-11/+9
|/
* Reworked ActiveRecord::Relation#last to always use SQLBogdan Gusiev2016-01-281-9/+23
| | | | instead of loading relation
* Merge pull request #18928 from bogdan/unreversable-orderSean Griffin2016-01-271-0/+34
|\ | | | | Raise AR::IrreversibleOrderError when #reverse_order can not do it's job
| * Introduce ActiveRecord::IrreversibleOrderErrorBogdan Gusiev2016-01-271-0/+34
| | | | | | | | | | Raises when #reverse_order can not process SQL order instead of making invalid SQL before this patch
* | Do not use default attributes for STI when instantiating a subclassSean Griffin2016-01-271-0/+4
|/ | | | | | | | | | The commit which originally added this behavior did not consider that doing `Subclass.new` does not actually populate the `type` field in the attributes (though perhaps it should). We simply need to not use the defaults for STI related things unless we are instantiating the base class. Fixes #23285.
* Merge branch '5-0-beta-sec'Aaron Patterson2016-01-251-0/+13
|\ | | | | | | | | | | | | | | | | | | | | * 5-0-beta-sec: bumping version fix version update task to deal with .beta1.1 Eliminate instance level writers for class accessors allow :file to be outside rails root, but anything else must be inside the rails view directory Don't short-circuit reject_if proc stop caching mime types globally use secure string comparisons for basic auth username / password
| * Don't short-circuit reject_if procAndrew White2016-01-221-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+29
|\ \ | | | | | | [close #23009] Limit key length
| * | [close #23009] Limit key lengthschneems2016-01-211-7/+29
| | | | | | | | | | | | | | | | | | | | | 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
* | | 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-245-0/+21
|\ \ \ | | | | | | | | 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-245-0/+21
| | | | | | | | | | | | | | | | Fixes #23209
* | | | Fix AR::Relation#cache_key to remove select scope added by userPrathamesh Sonpatki2016-01-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-244-11/+29
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | Use the database type to deserialize enumSean Griffin2016-01-233-0/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #23080 from ↵Matthew Draper2016-01-221-0/+8
|\ \ \ | |/ / |/| | | | | | | | 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-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | 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-191-0/+75
| | | | | | | | | | | | | | | | | | | | | Closes #21986. This makes it possible to write custom types that define a different mapping for STI columns.
* | | Changed options for find_each and variants to have options start/finish ↵Vipul A M2016-01-181-33/+12
| | | | | | | | | | | | | | | | | | 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-164-24/+54
|\ \ \ | | | | | | | | Add `:expression` option support on the schema default
| * | | Fix extract default with CURRENT_TIMESTUMPRyuta Kamizono2016-01-132-0/+18
| | | |
| * | | Add expression support on the schema defaultRyuta Kamizono2016-01-133-24/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :posts do |t| t.datetime :published_at, default: -> { 'NOW()' } end
* | | | Merge pull request #23067 from ↵Rafael França2016-01-161-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 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-151-2/+2
| | | |
* | | | Fix intermittent test failuresschneems2016-01-141-0/+1
| | | | | | | | | | | | 😳
* | | | Revert "Revert "Set environment even when no migration runs""schneems2016-01-141-1/+28
|/ / / | | | | | | | | | This reverts commit 11e85b91731ca6125ee1db33553f984549a3bc2b.
* | | Revert "Set environment even when no migration runs"Sean Griffin2016-01-141-28/+1
| | |
* | | Revert "Merge pull request #20835 from ↵Kasper Timm Hansen2016-01-143-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-11/+1
|\ \ \ | | | | | | | | `substitute_at` is no longer used
| * | | `substitute_at` is no longer usedRyuta Kamizono2016-01-143-11/+1
| |/ / | | | | | | | | | Arel handles substitution for bind parameters by now.
* | | Properly include the `from` clause when merging relationsSean Griffin2016-01-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #23017 from ↵Richard Schneeman2016-01-141-1/+28
|\ \ \ | |/ / |/| | | | | | | | schneems/schneems/migration-sets-environment-value Set environment even when no migration runs
| * | Set environment even when no migration runsschneems2016-01-111-0/+27
| | | | | | | | | | | | | | | 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-1/+1
| | |
* | | fix regression when loading fixture files with symbol keys.Yves Senn2016-01-132-0/+7
| | | | | | | | | | | | Closes #22584.
* | | Improve error message for #or when it is structurally incompatibleRafael Mendonça França2016-01-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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-15/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
* | | Skip the STI condition when evaluating a default scopeMatthew Draper2016-01-122-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Active scopes apply to child classes, though not parents/siblingsMatthew Draper2016-01-122-5/+20
|/ / | | | | | | | | | | | | While the commit message (and changelog example) in 5e0b555b453ea2ca36986c111512627d806101e7 talked about sibling classes, the added test had a child ignore its parent's scoping, which seems less reasonable.
* | Extract `MySQL::TypeMetadata` class to ↵Ryuta Kamizono2016-01-111-1/+1
| | | | | | | | `connection_adapters/mysql/type_metadata.rb`
* | Extract `MySQL::Column` class to `connection_adapters/mysql/column.rb`Ryuta Kamizono2016-01-111-10/+10
| |
* | Split out token `if` tests to trigger `before_create`.Kasper Timm Hansen2016-01-091-1/+5
| | | | | | | | | | | | | | | | | | When running passing condition assertions in the same test the user had already been saved at that point. Split out so we have a not yet persisted user. Rename condition tests to improve clarity a bit.