aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Improve error message for #or when it is structurally incompatibleRafael Mendonça França2016-01-132-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-122-25/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-122-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
* | | | | | | | add migration versioning example to the changelog. [ci skip]Yves Senn2016-01-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23021.
* | | | | | | | Merge pull request #23004 from matthewd/default-scope-stiMatthew Draper2016-01-127-19/+61
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make default scopes + STI happy again
| * | | | | | | | Skip the STI condition when evaluating a default scopeMatthew Draper2016-01-124-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-123-16/+37
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-113-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `connection_adapters/mysql/type_metadata.rb`
* | | | | | | Extract `MySQL::Column` class to `connection_adapters/mysql/column.rb`Ryuta Kamizono2016-01-113-56/+62
| | | | | | |
* | | | | | | 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
| | | | | | | |
* | | | | | | | 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.
* | | | | | | | 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.
* | | | | | | | 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-094-2/+40
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge pull request #22986 from yui-knk/fix_automatic_inverse_of_commentप्रथमेश Sonpatki2016-01-091-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | [ci skip] `automatic_inverse_of` returns `false` not `nil` (document …
| * | | | | | | [ci skip] `automatic_inverse_of` returns `false` not `nil` (document fix)yui-knk2016-01-091-1/+1
| | | | | | | |
* | | | | | | | Added missing CHANGELOG entry for https://github.com/rails/rails/pull/22976Prathamesh Sonpatki2016-01-091-0/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #22976 from schneems/schneems/schema-migration-primary-keySean Griffin2016-01-082-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Get update_attributes working with SchemaMigration
| * | | | | | | Get update_attributes working with SchemaMigrationschneems2016-01-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-084-8/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0813-7/+226
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Prevent destructive action on production database
| * | | | | | | Fixing tests and re-locating error checking.schneems2016-01-083-13/+14
| | | | | | | |
| * | | | | | | Fix kwarg to not have circular dependencyschneems2016-01-081-1/+1
| | | | | | | |
| * | | | | | | Use hash like syntax for InternalMetadataschneems2016-01-086-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | |
| * | | | | | | Prevent destructive action on production databaseschneems2016-01-0712-7/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
* | | | | | | | Merge pull request #22973 from kamipo/fix_select_values_method_signatureRafael França2016-01-082-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix `select_values` method signature for consistency
| * | | | | | | | 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
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Simply `{update|delete}_sql` aliases to `{update|delete}`.
* | | | | | | | Ensure `config.active_record.time_zone_aware_types` is always setSean Griffin2016-01-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the option on `ActiveRecord::Base` is always around, we need to explicitly set it on the config object. Otherwise the recommended configuration change results in an error. Fixes #22839
* | | | | | | | Remove `delete_sql` in sqlite3 adapterRyuta Kamizono2016-01-071-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sql += " WHERE 1=1"` was introduced in 69cb942. But it is not needed. ref https://www.sqlite.org/lang_delete.html
* | | | | | | | Refactor `connection.insert_sql`Ryuta Kamizono2016-01-074-35/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `connection.insert_sql` is almost the same as `connection.insert`.
* | | | | | | | Merge pull request #22933 from schneems/schneems/fix-broadcastRichard Schneeman2016-01-061-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [close #22917] Don't output to `STDOUT` twice
| * | | | | | | | [close #22917] Don't output to `STDOUT` twiceschneems2016-01-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `rails console` or `rails server` are used along with a logger set to output to `STDOUT` then the contents will show up twice. This happens because the logger is extended with `ActiveSupportLogger.broadcast` with a destination of STDOUT even if it is already outputting to `STDOUT`. Previously PR #22592 attempted to fix this issue, but it ended up causing NoMethodErrors. A better approach than relying on adding a method and flow control is to inspect the log destination directly. For this `ActiveSupport::Logger.logger_outputs_to?` was introduced ```ruby logger = Logger.new(STDOUT) ActiveSupport::Logger.logger_outputs_to?(logger, STDOUT) # => true ``` To accomplish this we must look inside of an instance variable of standard lib's Logger `@logdev`. There is a related Ruby proposal to expose this method in a standard way: https://bugs.ruby-lang.org/issues/11955
* | | | | | | | | fix remove_index for postgresql when running legacy migrationsLachlan Sylvester2016-01-062-2/+19
| | | | | | | | |
* | | | | | | | | Merge pull request #22921 from prathamesh-sonpatki/fix-add-referenceRafael França2016-01-061-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Autoload ReferenceDefinition class in abstract adapter so that it can be used by #add_reference in schema_statements
| * | | | | | | | | Autoload ReferenceDefinition class in abstract adapter so that it can be ↵Prathamesh Sonpatki2016-01-051-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used by #add_reference in schema_statements - Fixes #22916.
* | | | | | | | | Merge pull request #21688 from kamipo/add_text_and_blob_shorthand_methodsRafael Mendonça França2016-01-063-10/+53
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add short-hand methods for text and blob types in MySQL
| * | | | | | | | | Add short-hand methods for text and blob types in MySQLRyuta Kamizono2016-01-053-10/+53
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Move CHANGELOG entry to Active RecordRafael Mendonça França2016-01-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the type definition is in Active Model the change of behavior will be only user facing in Active Record so better to put the entry in its changelog. [ci skip]
* | | | | | | | | Merge pull request #22920 from kamipo/fix_connection_createRafael França2016-01-055-9/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix `connection#create` in PG adapter
| * | | | | | | | Fix `connection#create` in PG adapterRyuta Kamizono2016-01-055-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:45:14 +0000