aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18109 from k0kubun/unscoped-joinsSean Griffin2016-02-111-6/+12
|\ | | | | | | | | | | Allow `joins` to be unscoped Fixes #13775
| * Allow `joins` to be unscopedTakashi Kokubun2016-01-311-6/+12
| |
* | Merge pull request #23581 from diego-silva/uniqueness-validator-pk-fixSean Griffin2016-02-111-1/+1
|\ \ | | | | | | UniquenessValidator exclude itself when PK changed
| * | UniquenessValidator exclude itself when PK changedDiego Silva2016-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | When changing the PK for a record which has a uniqueness validation on some other attribute, Active Record should exclude itself from the validation based on the PK value stored on the DB (id_was) instead of its new value (id).
* | | Ensure prepared statement caching still occurs with Adequate RecordSean Griffin2016-02-114-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5, we're much more restrictive about when we do or don't cache a prepared statement. In particular, we never cache when we are sending an IN statement or a SQL string literal However, in the case of Adequate Record, we are *always* sending a raw SQL string, and we *always* want to cache the result. Fixes #23507 /cc @tgxworld
* | | Merge pull request #23605 from y-yagi/remove_warnings_in_finder_methodsKasper Timm Hansen2016-02-111-4/+4
|\ \ \ | | | | | | | | remove warnings from FinderMethods
| * | | remove warnings from FinderMethodsyuuji.yaginuma2016-02-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warnings. ``` activerecord/lib/active_record/relation/finder_methods.rb:252: warning: ambiguous first argument; put parentheses or a space even after `-' operator activerecord/lib/active_record/relation/finder_methods.rb:258: warning: ambiguous first argument; put parentheses or a space even after `-' operator activerecord/lib/active_record/relation/finder_methods.rb:268: warning: ambiguous first argument; put parentheses or a space even after `-' operator activerecord/lib/active_record/relation/finder_methods.rb:274: warning: ambiguous first argument; put parentheses or a space even after `-' operator ```
* | | | Merge pull request #23395 from PareshGupta/remove-unused-constantSantiago Pastorino2016-02-103-54/+5
|\ \ \ \ | |/ / / |/| | | Remove unused ReaderMethodCache and WriterMethodCache constants from ActiveRecord
| * | | Remove unused class AttributeMethodCachePareshGupta2016-02-022-25/+0
| | | |
| * | | remove unused constants from activerecordPareshGupta2016-02-012-30/+6
| | | |
* | | | build scope chain functionally and remove cachingAaron Patterson2016-02-101-14/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit walks the reflection tree and builds the scope chain functionally. It also removes the chain cache since the cache doesn't seem to have any impact on performance (I'd prefer to only cache at proven bottlenecks)
* | | | rename to 'second_to_last' and 'third_to_last'Brian Christian2016-02-104-21/+21
| | | |
* | | | allow Array.penultimate and Array.antepenultiate access methodsBrian Christian2016-02-094-1/+51
| |/ / |/| |
* | | Add numeric type in the doc [ci skip]Ryuta Kamizono2016-02-081-3/+3
| | | | | | | | | | | | Follow up to #23508.
* | | Merge pull request #23547 from kamipo/schema_type_returns_symbolSean Griffin2016-02-073-8/+8
|\ \ \ | | | | | | | | `schema_type` returns symbol rather than string
| * | | `schema_type` returns symbol rather than stringRyuta Kamizono2016-02-083-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A return value of `schema_type` is used by: 1. primary key type: using as `symbol.inspect` 2. normal column type: using as `symbol.to_s` It is better to return symbol.
* | | | Merge pull request #23508 from meinac/add_numeric_type_into_migrationsSean Griffin2016-02-071-0/+2
|\ \ \ \ | | | | | | | | | | Added numeric helper into `SchemaStatements` for MySQL and PostgreSQL
| * | | | Added numeric helper into migrations.Mehmet Emin İNAÇ2016-02-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this addition, you can add a column into the table like: ``` create_table(:numeric_types) do |t| t.numeric :foo, precision: 10, scale: 2, default: 2.0 end ``` The result of the migration above is same with: ``` create_table(:numeric_types) do |t| t.decimal :foo, precision: 10, scale: 2, default: 2.0 end ```
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-02-071-10/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix indentationVijay Dev2016-02-071-1/+1
| | | | |
| * | | | [ci skip] Update internal documents about ActiveRecord's Reflectionyui-knk2016-01-301-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord's Reflection was refactored by f8d2899d12d59360f29c5eb6a1b1a8fe4ec82ca0 . Top of ancestors chain was changed to `AbstractReflection` from `MacroReflection`, and new Reflections were added.
* | | | | Merge pull request #23519 from kamipo/mariadb_does_not_support_json_typeSean Griffin2016-02-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | MariaDB does not support JSON type
| * | | | | MariaDB does not support JSON typeRyuta Kamizono2016-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #22980.
* | | | | | Remove duplicated `require 'arel'`Ryuta Kamizono2016-02-061-1/+0
|/ / / / / | | | | | | | | | | | | | | | It appears first in `lib/active_record.rb`.
* | / / / Revert "Dump indexes in `create_table` instead of `add_index`"Sean Griffin2016-02-051-4/+6
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 99801c6a7b69eb4b006a55de17ada78f3a0fa4c1. Ultimately it doesn't matter whether `add_index` or `t.index` are used in the schema dumper in any meaningful way. There are gems out there which hook into the old behavior for things like indexing materialized views. Since the reverted commit doesn't seem to add much benefit, there's no reason for us to break these gems.
* | | | Remove the assumption of schema in DATABASE_URLJeremy Baker2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you set the DATABASE_URL environment variable to `mydatabase` by accident, you end up getting a series of errors that are hard to trace. For example: ``` warning: already initialized constant ActiveRecord::Base::OrmAdapter ``` Turns out the cascade of errors is due to the error raised by `.tr` being called on `nil`. This commit makes sure that `scheme` is set before calling `.tr` on it. My previous iteration used `@uri.scheme.try(:tr, '-', '_')` but using the `&&` logical operator is a fair bit faster: http://stackoverflow.com/questions/26655032/try-vs-performance With this change, the error message becomes much more understandable: ``` FATAL: database "mydatabase" does not exist (ActiveRecord::NoDatabaseError) ```
* | | | Merge pull request #23460 from ↵Sean Griffin2016-02-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/innodb_supports_fulltext_and_spatial_indexes InnoDB supports FULLTEXT and Spatial Indexes [ci skip]
| * | | | InnoDB supports FULLTEXT and Spatial Indexes [ci skip]Ryuta Kamizono2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | https://dev.mysql.com/doc/refman/5.7/en/innodb-fulltext-index.html https://dev.mysql.com/doc/refman/5.7/en/creating-spatial-indexes.html
* | | | | Merge pull request #23458 from kamipo/activerecord_supports_mysql_5.0_and_upSean Griffin2016-02-031-10/+7
|\ \ \ \ \ | | | | | | | | | | | | Active Record supports MySQL >= 5.0
| * | | | | Active Record supports MySQL >= 5.0Ryuta Kamizono2016-02-041-10/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | Currently some features uses `information_schema` (e.g. foreign key support). `information_schema` introduced since MySQL 5.0.
* | | | | SQLite 2 support has been dropped [ci skip]Ryuta Kamizono2016-02-042-3/+0
| | | | |
* | | | | Merge pull request #23457 from matthewd/arel-attributeMatthew Draper2016-02-0411-31/+34
|\ \ \ \ \ | |/ / / / |/| | | | Defer Arel attribute lookup to the model class
| * | | | Extract a Relation#arel_attributeMatthew Draper2016-02-047-16/+20
| | | | |
| * | | | Defer Arel attribute lookup to the model classMatthew Draper2016-02-0411-31/+30
| | | | | | | | | | | | | | | | | | | | | | | | | This still isn't as separated as I'd like, but it at least moves most of the burden of alias mapping in one place.
* | | | | Merge pull request #23442 from ↵Rafael França2016-02-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/improve-pg-version-old-error-message Improve pg version old error message and mention this change in release notes.
| * | | | | Mention supported PG version in the error message.Prathamesh Sonpatki2016-02-031-1/+1
| | | | | |
* | | | | | Merge pull request #20997 from himesh-r/issue-20995Arthur Neves2016-02-021-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Changed id-writer to save join table records based on association primary key #20995.
| * | | | | Changed id-writer to save join table records based on association primary ↵Himesh2016-02-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key #20995 Changed id-writer to save join table records based on association primary key
* | | | | | The minimum supported version of PostgreSQL is now >= 9.1Remo Mueller2016-02-021-3/+2
| | | | | |
* | | | | | 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-021-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-0/+10
|\ \ \ \ \ | | | | | | | | | | | | Warn if a named scope is overwriting an existing scope or method
| * | | | | Revert "Remove valid_scope_name? check - use ruby"Akira Matsuda2016-01-281-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-011-1/+1
| | | | | |
* | | | | | Merge pull request #23407 from jeremy/corrupt-before-commitJeremy Daer2016-02-011-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix corrupt transaction state caused by `before_commit` exceptions
| * | | | | | Fix corrupt transaction state caused by `before_commit` exceptionsJeremy Daer2016-02-011-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-17/+22
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | for those who already migrated to Rails 5.0.0 beta
* | | | | | Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadataYasuo Honda2016-02-011-2/+2
| |_|_|/ / |/| | | | | | | | | | | | | | to support Oracle database which only supports 30 byte identifier length