aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | Active scopes apply to child classes, though not parents/siblingsMatthew Draper2016-01-121-11/+17
| |/ | | | | | | | | | | | | 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.
* / Allow manually setting environment valueschneems2016-01-112-6/+17
|/ | | | | | | | If for some reason some one is not able to set the environment from a migration this gives us an escape valve to manually set the environment for the database see https://github.com/rails/rails/pull/22967#issuecomment-170251635. We will also fix the migration case, but this will ensure there is always a way to set the environment. cc/ @sgrif
* Extract `MySQL::TypeMetadata` class to ↵Ryuta Kamizono2016-01-112-28/+34
| | | | `connection_adapters/mysql/type_metadata.rb`
* 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 typo
| * [ci skip] fix typoAkshay Vishnoi2016-01-101-1/+1
| |
* | Revert "Switch `has_secure_token` to `before_save`."Kasper Timm Hansen2016-01-091-4/+3
| | | | | | | | | | | | | | Mistakenly interpreted the test case as a sign that we should switch to before_save, when the original pitch use case was intended as before_create. Revert a3ab6ad00872d24d4d87637f93fdae798d0edc79.
* | Switch `has_secure_token` to `before_save`.Kasper Timm Hansen2016-01-091-3/+4
| | | | | | | | | | | | | | | | Adding `if` and `unless` support doesn't bode well if the callback to assign a token only runs on create. Switch to `before_save`, but keep the conditional so that no token already assigned is overriden.
* | Support :if and :unless in has_secure_tokenGriffin Smith2016-01-091-2/+23
|/ | | | | Pass through :if and :unless options from has_secure_token to the generated before_create callback
* Merge pull request #22988 from ↵Richard Schneeman2016-01-091-1/+1
|\ | | | | | | | | y-yagi/match_environment_variable_name_and_error_message match the environment variable name that actually checking and error message
| * match the environment variable name that actually checking and error messageyuuji.yaginuma2016-01-091-1/+1
| | | | | | | | | | | | The error message has become a `DISABLE_DATABASE_ENVIRONMENT_CHECK`, modified to match the error message. ref: https://github.com/rails/rails/blob/master/activerecord/lib/active_record/migration.rb#L161
* | [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 SchemaMigration
| * Get update_attributes working with SchemaMigrationschneems2016-01-081-1/+1
| | | | | | | | 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.
* | Fix the broken buildSean Griffin2016-01-081-0/+2
| | | | | | | | | | | | This is really strange, as it passes on Travis for 2.3, and it passes for me locally on 2.2. But on travis w/ 2.2, passing `Float::INFINITY` in is resulting in an infinite loop. This should resolve it.
* | Refactor tz aware types, add support for PG rangesSean Griffin2016-01-083-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0810-7/+150
|\ \ | |/ |/| Prevent destructive action on production database
| * 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
| | | | | | | | Discussion: https://github.com/rails/rails/pull/22967#discussion_r49137035
| * Add EnvironmentMismatchErrorschneems2016-01-082-4/+25
| | | | | | Raise an error when a destructive action is made on a database where the current environment is different from the environment stored in the database.
| * 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 08:07:46 +0000