aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Merge pull request #22896 from kamipo/fix_unsigned_and_blob_or_text_columnRafael França2016-01-043-5/+16
|\ \ \ | | | | | | | | 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-043-5/+16
| | | |
* | | | Merge pull request #22550 from tamird/record-fetch-warning-allocate-lessSean Griffin2016-01-045-20/+24
|\ \ \ \ | |_|/ / |/| | | activerecord: allocate fewer objects
| * | | activerecord: reuse immutable objectsTamir Duberstein2016-01-044-14/+20
| | | |
| * | | activerecord: allocate fewer arrays in `RecordFetchWarning`Tamir Duberstein2016-01-041-6/+4
| |/ /
* | | Merge pull request #22915 from kamipo/fix_user_name_in_docEileen M. Uchitelle2016-01-041-1/+1
|\ \ \ | | | | | | | | Fix user name in doc [ci skip]
| * | | Fix user name in doc [ci skip]Ryuta Kamizono2015-12-311-1/+1
| | | |
* | | | Merge pull request #22821 from shosti/set-null-transactionArthur Nogueira Neves2016-01-042-0/+6
|\ \ \ \ | |_|/ / |/| | | Allow add_to_transaction with null transaction
| * | | Allow add_to_transaction with null transactionEmanuel Evans2015-12-282-0/+6
| | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/22819
* | | | Merge pull request #22889 from kamipo/remove_fixme_commentsClaudio B2016-01-021-3/+0
|\ \ \ \ | | | | | | | | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]
| * | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]Ryuta Kamizono2016-01-031-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The `Arel::Nodes::Quoted` was removed already. Follow up to f916aa247bddba0c58c50822886bc29e8556df76.
* | | | | correctly presence check of `application_record.rb` in pluginyuuji.yaginuma2016-01-021-1/+7
|/ / / /
* | | | Merge pull request #22877 from kamipo/refactor_case_sensitive_comparisonRafael França2016-01-014-20/+17
|\ \ \ \ | | | | | | | | | | Refactor `case_{sensitive|insensitive}_comparison`
| * | | | Refactor `case_{sensitive|insensitive}_comparison`Ryuta Kamizono2016-01-014-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ``` SELECT 1 AS one FROM "topics" WHERE "topics"."title" = 'abc' LIMIT $1 [["LIMIT", 1]] ``` After: ``` SELECT 1 AS one FROM "topics" WHERE "topics"."title" = $1 LIMIT $2 [["title", "abc"], ["LIMIT", 1]] ```