aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Ensure tz aware attributes continue to work with arraysSean Griffin2016-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | There was a typo in the variable name leading to infinite recursion
* | | | | | Avoid infinite recursion when bad values are passed to tz aware fieldsSean Griffin2016-02-022-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had previously updated this to attempt to map over whatever was passed in, so that additional types like range and array could benefit from this behavior without the time zone converter having to deal with every known type. However, the default behavior of a type is to just yield the given value to `map`, which means that if we don't actually know how to handle a value, we'll just recurse infinitely. Since both uses of `map` in this case occur in cases where we know receiving the same object will recurse, we can just break on reference equality. Fixes #23241.
* | | | | | Remove unnecessary overriding of `#initialize`yui-knk2016-02-021-12/+0
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | `#initialize` of `HasManyReflection`, `HasOneReflection` and `BelongsToReflection` only pass all arguments to `super` by passed order. These overriding can be removed.
* | | | | Merge pull request #23331 from amatsuda/valid_scope_nameRafael França2016-02-022-0/+29
|\ \ \ \ \ | | | | | | | | | | | | Warn if a named scope is overwriting an existing scope or method
| * | | | | Suppress :warning:sAkira Matsuda2016-01-281-1/+1
| | | | | |
| * | | | | scope needs the second argumentAkira Matsuda2016-01-281-1/+1
| | | | | |
| * | | | | Revert "Remove valid_scope_name? check - use ruby"Akira Matsuda2016-01-282-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f6db31ec16e42ee7713029f7120f0b011d1ddc6c. Reason: Scope names can very easily conflict, particularly when sharing Concerns within the team, or using multiple gems that extend AR models. It is true that Ruby has the ability to detect this with the -w option, but the reality is that we are depending on too many gems that do not care about Ruby warnings, therefore it might not be a realistic solution to turn this switch on in our real-world apps.
* | | | | | Add some Action Cable CHANGELOG entriesRafael Mendonça França2016-02-011-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And improve changelongs. [ci skip]
* | | | | | Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-012-1/+6
| | | | | |
* | | | | | Merge pull request #23407 from jeremy/corrupt-before-commitJeremy Daer2016-02-012-2/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix corrupt transaction state caused by `before_commit` exceptions
| * | | | | | Fix corrupt transaction state caused by `before_commit` exceptionsJeremy Daer2016-02-012-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a `before_commit` callback raises, the database is rolled back but AR's record of the current transaction is not, leaving the connection in a perpetually broken state that affects all future users of the connection: subsequent requests, jobs, etc. They'll think a transaction is active when none is, so they won't BEGIN on their own. This manifests as missing `after_commit` callbacks and broken ROLLBACKs. This happens because `before_commit` callbacks fire before the current transaction is popped from the stack, but the exception-handling path they hit assumes that the current transaction was already popped. So the database ROLLBACK is issued, but the transaction stack is left intact. Common cause: deadlocked `#touch`, which is now implemented with `before_commit` callbacks. What's next: * We shouldn't allow active transaction state when checking in or out from the connection pool. Verify that conns are clean. * Closer review of txn manager sad paths. Are we missing other spots where we'd end up with incorrect txn state? What's the worst that can happen if txn state drifts? How can we guarantee it doesn't and contain the fallout if it does? Thanks for @tomafro for expert diagnosis!
* | | | | | | Revert "Merge pull request #16400 from bogdan/last-with-sql"Sean Griffin2016-02-013-60/+31
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9f3730a516f30beb0050caea9539f8d6b808e58a, reversing changes made to 2637fb75d82e1c69333855abd58c2470994995d3. There are additional issues with this commit that need to be addressed before this change is ready (see #23377). This is a temporary revert in order for us to have more time to address the issues with that PR, without blocking the release of beta2.
* | | | | | Rename `active_record_internal_metadatas` to `ar_internal_metadata`Yasuo Honda2016-02-012-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | for those who already migrated to Rails 5.0.0 beta
* | | | | | Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadataYasuo Honda2016-02-013-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | to support Oracle database which only supports 30 byte identifier length
* | | | | | tabenai (typo)Akira Matsuda2016-02-011-6/+6
| |_|_|/ / |/| | | |
* | | | | Merge pull request #23391 from erullmann/join_table_indexesRafael França2016-02-011-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Added references option to join tables
| * | | | | Added references option to join tablesErnst Rullmann2016-01-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue #22960 When creating join tables with the command rails g migration CreateJoinTableShowroomUser showroom:references user:references The migration will use references to create the joins and output: class CreateJoinTableShowroomUser < ActiveRecord::Migration def change create_join_table :showrooms, :users do |t| t.references :showroom, index: true, foreign_key: true t.references :user, index: true, foreign_key: true end end end This allows for proper refrences with indexes and foreign keys to be easily used when adding join tables. Without `:refrences` the normal output is generated: class CreateJoinTableShowroomUser < ActiveRecord::Migration[5.0] def change create_join_table :showrooms, :users do |t| # t.index [:showroom_id, :user_id] # t.index [:user_id, :showroom_id] end end end
* | | | | | Avoid extra `show variables` in migrationRyuta Kamizono2016-02-015-21/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `initialize_schema_migrations_table` is called in every migrations. https://github.com/rails/rails/blob/v5.0.0.beta1/activerecord/lib/active_record/migration.rb#L1080 https://github.com/rails/rails/blob/v5.0.0.beta1/activerecord/lib/active_record/schema.rb#L51 This means that extra `show variables` is called regardless of the existence of `schema_migrations` table. This change is to avoid extra `show variables` if `schema_migrations` table exists.
* | | | | Merge pull request #23359 from kamipo/make_to_primary_keyRafael França2016-02-014-40/+5
|\ \ \ \ \ | | | | | | | | | | | | Make to primary key instead of an unique index for internal tables
| * | | | | Make to primary key instead of an unique index for internal tablesRyuta Kamizono2016-01-314-40/+5
| | | | | |
* | | | | | Merge pull request #23373 from ↵Rafael França2016-02-013-17/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_duplicated_composite_primary_key_tests Remove duplicated composite primary key tests
| * | | | | | Remove duplicated composite primary key testsRyuta Kamizono2016-02-013-17/+1
| | | | | | |
* | | | | | | Extract `ExplainPrettyPrinter` to appropriate filesRyuta Kamizono2016-02-017-119/+137
|/ / / / / /
* | | | | | Merge pull request #23372 from kamipo/use_index_in_create_in_test_schemaRafael França2016-02-012-11/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use `t.index` in `create_table` instead of `add_index` in test schema
| * | | | | | Use `t.index` in `create_table` instead of `add_index` in test schemaRyuta Kamizono2016-01-312-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For reduce bootstrap queries in tests.
* | | | | | | Merge pull request #23374 from prathamesh-sonpatki/migration-compatiblity-testsRafael França2016-01-311-0/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added test for backward compatibility of null constraints on timestamp columns
| * | | | | | | Added test for backward compatibility of null constraints on timestamp columnsPrathamesh Sonpatki2016-01-311-0/+30
| |/ / / / / /
* | | | | | | :speak_no_evil: :warning:Akira Matsuda2016-02-012-2/+6
| | | | | | |
* | | | | | | Merge pull request #23360 from kamipo/oid_money_precision_is_unusedRafael França2016-01-312-8/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | `OID::Money.precision` is unused since #15239
| * | | | | | | `OID::Money.precision` is unused since #15239Ryuta Kamizono2016-01-312-8/+0
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | p PostgreSQLAdapter::OID::Money.precision # => 19 p PostgreSQLAdapter::OID::Money.new.precision # => nil
* | | | | | | Remove `case macro` from `calculate_constructable`yui-knk2016-02-011-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails has abstract Reflection classes (`MacroReflection`, `AssociationReflection` etc.) and concrete Reflection classes (e.g. `HasManyReflection`, `HasOneReflection` etc.). In many case `calculate_constructable` returns `true`, so change `calculate_constructable` to always return `true` and override this method if necessary.
* | | | | | | Merge pull request #23387 from mcfiredrill/clarify-touching-callbacksKasper Timm Hansen2016-01-311-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | clarify the touch true option does not trigger after_save/update [ci skip]
| * | | | | | | clarify the touch true option does not trigger after_save/update [ci skip]Tony Miller2016-02-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've gotten tripped up more than a few times on this, thinking that using `belongs_to` with `touch: true` would trigger my after_save or after_update callbacks. The same text is in the documentation for the touch method itself, but I think its helpful to repeat it again here. It might save people some time.
* | | | | | | | Merge pull request #23169 from y-yagi/rake_proxy_in_engineKasper Timm Hansen2016-01-311-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | make rake proxy work in rails engines
| * | | | | | | | make rake proxy work in rails enginesyuuji.yaginuma2016-01-311-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #23379 from ↵Kasper Timm Hansen2016-01-311-22/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yui-knk/define_association_class_on_each_concrete_class Each concrete classes have responsibility to return `association_class`
| * | | | | | | | Each concrete classes have responsibility to return `association_class`yui-knk2016-01-311-22/+25
| |/ / / / / / /
* / / / / / / / Wrangle the asset build into something that sounds more generalMatthew Draper2016-02-011-0/+3
|/ / / / / / /
* | | | | | | Merge pull request #23362 from vipulnsward/20821-save-doc-updateJon Moss2016-01-301-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | - Updated persistence documentation to make it clear that save and sa…
| * | | | | | - Updated persistence documentation to make it clear that save and save! ↵Vipul A M2016-01-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | won't update a record if validation fails. - Also fixed `update` method's documention to be uniform about this statement. Fixes #20821 [ci skip] [Vipul A M & pseidemann ]
* | | | | | | Revert "Merge pull request #23346 from kamipo/refactor_oid_money_precision"Rafael Mendonça França2016-01-302-5/+9
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ff835f90800a3e4122d64606cb328908c2e0e071, reversing changes made to c4d85dfbc71043e2a746acd310e32f4f04db801a. Reason: This broke the tests. We will add back after investigated.
* | | | | | Merge pull request #23345 from ↵Rafael França2016-01-302-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #23349 from kamipo/refactor_column_existsRafael França2016-01-301-7/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor `column_exists?` in `SchemaStatements`
| * | | | | | | Refactor `column_exists?` in `SchemaStatements`Ryuta Kamizono2016-01-301-7/+8
| |/ / / / / /
* | | | | | | Merge pull request #23355 from kamipo/fix_bigint_for_enum_columnsRafael França2016-01-303-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix `bigint?` for Enum columns in MySQL
| * | | | | | | Fix `bigint?` for Enum columns in MySQLRyuta Kamizono2016-01-313-2/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Follow up to #22896.
* | | | | | | Merge pull request #23350 from kamipo/refactor_schema_migration_drop_tableRafael França2016-01-301-4/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make `SchemaMigration.drop_table` to one SQL
| * | | | | | | Make `SchemaMigration.drop_table` to one SQLRyuta Kamizono2016-01-301-4/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | `SchemaMigration.drop_table` is only used in tests. Simply we can use `drop_table if_exists: true`.
* | | | | | | Merge pull request #23352 from yui-knk/move_test_conditionsRafael França2016-01-301-11/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | There is no need to define test if a connection does not support prim…