aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Add conditional_token to users.Kasper Timm Hansen2016-01-091-0/+1
| | | | | | Fix the NoMethodErrors introduced in 224eddf, when adding conditional token creation. The model declarations but the column wasn't added to the schema.
* Support :if and :unless in has_secure_tokenGriffin Smith2016-01-092-0/+13
| | | | | Pass through :if and :unless options from has_secure_token to the generated before_create callback
* Merge pull request #22976 from schneems/schneems/schema-migration-primary-keySean Griffin2016-01-081-2/+2
|\ | | | | Get update_attributes working with SchemaMigration
| * Get update_attributes working with SchemaMigrationschneems2016-01-081-2/+2
| | | | | | | | You cannot use `update_attributes` on models that do not have a primary key. Since SchemaMigration versions are guaranteed to be unique (they have a unique index on them) we can safely use them as a primary key.
* | Refactor tz aware types, add support for PG rangesSean Griffin2016-01-081-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an alternate implementation to #22875, that generalizes a lot of the logic that type decorators are going to need, in order to have them work with arrays, ranges, etc. The types have the ability to map over a value, with the default implementation being to just yield that given value. Array and Range give more appropriate definitions. This does not automatically make ranges time zone aware, as they need to be added to the `time_zone_aware` types config, but we could certainly make that change if we feel it is appropriate. I do think this would be a breaking change however, and should at least have a deprecation cycle. Closes #22875. /cc @matthewd
* | Merge pull request #22967 from schneems/schneems/generic-metadataSean Griffin2016-01-083-0/+76
|\ \ | |/ |/| Prevent destructive action on production database
| * Fixing tests and re-locating error checking.schneems2016-01-081-4/+4
| |
| * Use hash like syntax for InternalMetadataschneems2016-01-082-3/+3
| | | | | | | | Discussion: https://github.com/rails/rails/pull/22967#discussion_r49137035
| * Prevent destructive action on production databaseschneems2016-01-073-0/+76
| | | | | | | | | | | | | | This PR introduces a key/value type store to Active Record that can be used for storing internal values. It is an alternative implementation to #21237 cc @sgrif @matthewd. It is possible to run your tests against your production database by accident right now. While infrequently, but as an anecdotal data point, Heroku receives a non-trivial number of requests for a database restore due to this happening. In these cases the loss can be large. To prevent against running tests against production we can store the "environment" version that was used when migrating the database in a new internal table. Before executing tests we can see if the database is a listed in `protected_environments` and abort. There is a manual escape valve to force this check from happening with environment variable `DISABLE_DATABASE_ENVIRONMENT_CHECK=1`.
* | fix remove_index for postgresql when running legacy migrationsLachlan Sylvester2016-01-061-0/+16
| |
* | Merge pull request #21688 from kamipo/add_text_and_blob_shorthand_methodsRafael Mendonça França2016-01-061-10/+10
|\ \ | | | | | | | | | Add short-hand methods for text and blob types in MySQL
| * | Add short-hand methods for text and blob types in MySQLRyuta Kamizono2016-01-051-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Pg and Sqlite3, `:text` and `:binary` have variable unlimited length. But in MySQL, these have limited length for each types (ref #21591, #21619). This change adds short-hand methods for each text and blob types. Example: create_table :foos do |t| t.tinyblob :tiny_blob t.mediumblob :medium_blob t.longblob :long_blob t.tinytext :tiny_text t.mediumtext :medium_text t.longtext :long_text end
* | | Merge pull request #22920 from kamipo/fix_connection_createRafael França2016-01-051-3/+12
|\ \ \ | |/ / |/| | Fix `connection#create` in PG adapter
| * | Fix `connection#create` in PG adapterRyuta Kamizono2016-01-051-3/+12
| | | | | | | | | | | | | | | | | | Originally `connection#create` had aliased to `connection#insert` in PG adapter. But it was broken by #7447. Re-alias `create` to `insert` for fixing it.
* | | Merge pull request #22896 from kamipo/fix_unsigned_and_blob_or_text_columnRafael França2016-01-042-2/+13
|\ \ \ | | | | | | | | Fix `unsigned?` and `blob_or_text_column` for Enum columns in MySQL
| * | | Fix `unsigned?` and `blob_or_text_column?` for Enum columns in MySQLRyuta Kamizono2016-01-042-2/+13
| | | |
* | | | Merge pull request #22550 from tamird/record-fetch-warning-allocate-lessSean Griffin2016-01-041-2/+6
|\ \ \ \ | |_|/ / |/| | | activerecord: allocate fewer objects
| * | | activerecord: reuse immutable objectsTamir Duberstein2016-01-041-2/+6
| |/ /
* | | Merge pull request #22821 from shosti/set-null-transactionArthur Nogueira Neves2016-01-041-0/+5
|\ \ \ | |/ / |/| | Allow add_to_transaction with null transaction
| * | Allow add_to_transaction with null transactionEmanuel Evans2015-12-281-0/+5
| | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/22819