aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
...
* | use `teardown` for cleanup, not `setup`.Yves Senn2014-01-161-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | This solves order dependent issues where the last test leaked the query cache state. This resulted in the following error: ``` QueryCacheExpiryTest#test_cache_is_expired_by_habtm_delete [test/cases/query_cache_test.rb:275]: not all expectations were satisfied unsatisfied expectations: - expected exactly twice, invoked once: #<ActiveRecord::ConnectionAdapters::SQLite3Adapter:0x7f93e0c65838>.clear_query_cache(any_parameters) ```
* | tests without transactional fixtures need to cleanup afterwards.Yves Senn2014-01-161-0/+7
| | | | | | | | This fixes test order issues.
* | no need to `return skip` in tests. `skip` is enough.Yves Senn2014-01-164-4/+4
| |
* | rm dup codeAaron Patterson2014-01-141-13/+0
| | | | | | | | https://github.com/rails/rails/blob/e64a83cdbd3ce836f3339c600c1006b20c23d8fd/activerecord/test/cases/relation/merging_test.rb#L80-91
* | "string" isn't a valid column type for ActiveRecordAaron Patterson2014-01-141-1/+1
| | | | | | | | | | Conflicts: activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
* | don't establish a new connection when testing with `sqlite3_mem`.Yves Senn2014-01-141-15/+21
| | | | | | | | | | | | | | This fixes broken `rake test_sqlite3_mem` suite for Active Record. The problem is that that the old database with the schema is lost when establishing a new connection. Upon reconnting we are left with a blank database and tests down the line start failing.
* | sqlite >= 3.8.0 supports partial indexesCody Cutrer2014-01-141-0/+2
| |
* | Don't try to get the subclass if the inheritance column doesn't existUjjwal Thaakar2014-01-143-1/+18
| | | | | | | | | | | | | | The `subclass_from_attrs` method is called even if the column specified by the `inheritance_column` setting doesn't exist. This prevents setting associations via the attributes hash if the association name clashes with the value of the setting, typically `:type`. This worked previously in Rails 3.2.
* | Enum mappings are now exposed via class methods instead of constants.Godfrey Chan2014-01-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: class Conversation < ActiveRecord::Base enum status: [ :active, :archived ] end Before: Conversation::STATUS # => { "active" => 0, "archived" => 1 } After: Conversation.statuses # => { "active" => 0, "archived" => 1 }
* | Merge pull request #13669 from chulkilee/name-error-nameYves Senn2014-01-141-1/+3
|\ \ | | | | | | Set NameError#name
| * | Set NameError#nameChulki Lee2014-01-131-1/+3
| | |
* | | unscope should remove bind values associated with the whereAaron Patterson2014-01-131-0/+9
| | |
* | | recover from test runs that leave the database in a bad stateAaron Patterson2014-01-131-1/+1
|/ /
* | fix bug in becomes! when changing from base to subclass. Closes #13272.Yves Senn2014-01-131-0/+11
| |
* | use enum labels as form values. Achieved by `_before_type_cast`.Yves Senn2014-01-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13650, #13672 This is an alternate implementation to solve #13650. Currently form fields contain the enum value (eg. "1"). This breaks because the setter `enum=` expects the label (eg. "active"). ActiveRecord::Enum allows you to use labels in your application but store numbers. We should make sure that all parts after AR are dealing with labels and not the underlying mapping to a number. This patch defines `_before_type_cast` on every enum column to return the label. This method is later used to fetch the value to display in form fields. I deliberately copied the implementation of the enum getter instead of delegating to it. This allows you to overwrite the getter and for example return a `Value Object` but have it still work for form fields.
* | Restore DATABASE_URL even if it's nil in connection_handler testPrathamesh Sonpatki2014-01-101-1/+1
| | | | | | | | | | - We have to restore DATABASE_URL to its previous state irrespective of previous value is nil or not
* | Ensure Active Record connection consistencyschneems2014-01-091-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Active Record can be configured via the environment variable `DATABASE_URL` or by manually injecting a hash of values which is what Rails does, reading in `database.yml` and setting Active Record appropriately. Active Record expects to be able to use `DATABASE_URL` without the use of Rails, and we cannot rip out this functionality without deprecating. This presents a problem though when both config is set, and a `DATABASE_URL` is present. Currently the `DATABASE_URL` should "win" and none of the values in `database.yml` are used. This is somewhat unexpected to me if I were to set values such as `pool` in the `production:` group of `database.yml` they are ignored. There are many ways that active record initiates a connection today: - Stand Alone (without rails) - `rake db:<tasks>` - ActiveRecord.establish_connection - With Rails - `rake db:<tasks>` - `rails <server> | <console>` - `rails dbconsole` We should make all of these behave exactly the same way. The best way to do this is to put all of this logic in one place so it is guaranteed to be used. Here is my prosed matrix of how this behavior should work: ``` No database.yml No DATABASE_URL => Error ``` ``` database.yml present No DATABASE_URL => Use database.yml configuration ``` ``` No database.yml DATABASE_URL present => use DATABASE_URL configuration ``` ``` database.yml present DATABASE_URL present => Merged into `url` sub key. If both specify `url` sub key, the `database.yml` `url` sub key "wins". If other paramaters `adapter` or `database` are specified in YAML, they are discarded as the `url` sub key "wins". ``` ### Implementation Current implementation uses `ActiveRecord::Base.configurations` to resolve and merge all connection information before returning. This is achieved through a utility class: `ActiveRecord::ConnectionHandling::MergeAndResolveDefaultUrlConfig`. To understand the exact behavior of this class, it is best to review the behavior in activerecord/test/cases/connection_adapters/connection_handler_test.rb though it should match the above proposal.
* | make `change_column_null` reversible. Closes #13576.Yves Senn2014-01-081-0/+16
| | | | | | | | Closes #13623.
* | create/drop test and development databases only if RAILS_ENV is nilDamien Mathieu2014-01-081-2/+24
| | | | | | | | Closes #13625
* | Merge pull request #13355 from dylanahsmith/migration-versionRafael Mendonça França2014-01-072-0/+12
|\ \ | | | | | | | | | | | | | | | | | | activerecord: Initialize Migration with version from MigrationProxy. Conflicts: activerecord/CHANGELOG.md
| * | activerecord: Initialize Migration with version from MigrationProxy.Dylan Thacker-Smith2014-01-062-0/+12
| | |
* | | Make change_table use object of current database adapterNishant Modak2014-01-072-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Earlier, change_table was creating database-agnostic object. - After this change, it will create correct object based on current database adapter. - This will ensure that create_table and change_table will get same objects. - This makes update_table_definition method public and nodoc. - Fixes #13577 and #13503
* | | Remove warnings in test suiteMatthias Zirnstein2014-01-061-1/+1
|/ / | | | | | | | | | | | | lib/active_record/store.rb:79: warning: method redefined; discarding old color= lib/active_record/store.rb:79: warning: previous definition of color= was here lib/active_record/store.rb:83: warning: method redefined; discarding old color lib/active_record/store.rb:83: warning: previous definition of color was here
* | Fix: ActiveRecord::Store TypeError conversion when using YAML coderThales Oliveira2014-01-063-0/+6
| | | | | | | | | | | | | | | | | | | | Renaming the test accordingly to its behaviour Adding 'Fixes' statement to changelog Improving tests legibility & changelog Undoing mistakenly removed empty line & further improving changelog
* | Remove method redefined warnings for test suiteMatthias Zirnstein2014-01-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has_many definitions with "name" as singular and as plural e.g. has_many :welcome_posts_with_comment has_many :welcome_posts_with_comments Ruby mentions it with: lib/active_record/associations/builder/collection_association.rb:65: warning: method redefined; discarding old welcome_posts_with_comment_ids lib/active_record/associations/builder/collection_association.rb:65: warning: previous definition of welcome_posts_with_comment_ids was here lib/active_record/associations/builder/collection_association.rb:75: warning: method redefined; discarding old welcome_posts_with_comment_ids= lib/active_record/associations/builder/collection_association.rb:75: warning: previous definition of welcome_posts_with_comment_ids= was here
* | Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-031-2/+2
| |
* | Merge pull request #10134 from ↵Rafael Mendonça França2014-01-031-1/+5
|\ \ | | | | | | | | | | | | derikson/collection_proxy_select_with_multiple_args Change CollectionProxy#select to take the same arguments as ActiveRecord::select
| * | Changed ActiveRecord::Associations::CollectionProxy#select to take multiple ↵Dan Erikson2013-04-081-1/+5
| | | | | | | | | | | | | | | | | | arguments. This makes the arguments the same as ActiveRecord::QueryMethods::select.
* | | Building new records with enum scopes now works as expectedGodfrey Chan2014-01-032-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this would give an `ArgumentError`: class Issue < ActiveRecord::Base enum :status, [:open, :finished] end Issue.open.build # => ArgumentError: '0' is not a valid status Issue.open.create # => ArgumentError: '0' is not a valid status PR #13542 muted the error, but the issue remains. This commit fixes the issue by allowing the enum value to be written directly via the setter: Issue.new.status = 0 # This now sets status to :open Assigning a value directly via the setter like this is not part of the documented public API, so users should not rely on this behavior. Closes #13530.
* | | Merge pull request #13542 from robin850/issue-13530Rafael Mendonça França2014-01-012-1/+14
|\ \ \ | | | | | | | | | | | | Fix enum writers when using integers
| * | | Fix the enums writer methodsRobin Dupret2014-01-012-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the writer methods would simply check whether the passed argument was the symbol representing the integer value of an enum field. Therefore, it was not possible to specify the numeric value itself but the dynamically defined scopes generate where clauses relying on this kind of values so a chained call to a method like `find_or_initialize_by` would trigger an `ArgumentError`. Reference #13530
* | | | Add CHANGELOG entry for #13557 [ci skip]Rafael Mendonça França2014-01-011-1/+0
| | | |
* | | | Merge pull request #13557 from gmarik/patch-1Rafael Mendonça França2014-01-011-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | Use `Array#wrap` instead `Array()`
| * | | | add test casegmarik2013-12-311-0/+17
| | | | |
* | | | | Improve the tests to not call assert_nothing_raisedRafael Mendonça França2014-01-011-4/+1
| | | | |
* | | | | Merge pull request #13550 from vipulnsward/13437-fixRafael Mendonça França2014-01-011-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for #13437 Conflicts: activerecord/CHANGELOG.md
| * | | | | https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5 ↵Vipul A M2013-12-311-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8 introduced a regression in includes/preloades by calling `read_attribute` on an association when preloading takes places, instead of using loaded records in `association.target`. tl;dr Records are not made properly available via `read_attribute` when preloding in simultaneous, but value of `@loaded` is already set true, and records concatenated in `association.target` on an association object. When `@loaded` is true we return an object of `AlreadyLoaded` in preload_for. In `AlreadyLoaded` to return preloaded records we make wrong use of `read_attribute`, instead of `target` records. The regression is fixed by making use of the loaded records in `association.target` when the preloading takes place. Fixes #13437
* | | | | | Merge pull request #13556 from yahonda/update_mysql_grantRafael Mendonça França2014-01-012-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Update grant statement to address #13549
| * | | | | Change the inexistent database name to inexistent_activerecord_unittestYasuo Honda2014-01-012-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | to make this grant statement described in the document works GRANT ALL PRIVILEGES ON inexistent_activerecord_unittest.* to 'rails'@'localhost';
* | | | | Add the ability to nullify the `enum` columnAmr Tamimi2014-01-011-0/+15
| | | | |
* | | | | Improve tests to use only public APIRafael Mendonça França2013-12-311-3/+2
| | | | |
* | | | | Make outer joins on proper parentWashington Luiz2013-12-311-1/+11
|/ / / / | | | | | | | | | | | | | | | | Outer joins were being built on the root relation klass rather than the one specified in the join dependency root
* | | | Allow "url" sub key in database.yml configurationschneems2013-12-301-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently a developer can pass in a YAML configuration that fully specifies connection information: ``` production: database: triage_production adapter: password pool: 5 ``` They can also pass in a string that specifies a connection URL directly to an environment key: ``` production: postgresql://localhost/foo ``` This PR allows the use of both a connection url and specifying connection attributes via YAML through the use of the "url" sub key: ``` production: url: postgresql://localhost/foo pool: 3 ``` This will allow developers to inherit Active Record options such as `pool` from `&defaults` and still use a secure connection url such as `<%= ENV['DATABASE_URL'] %>`. The URL is expanded into a hash and then merged back into the YAML hash. If there are any conflicts, the values from the connection URL are preferred. Talked this over with @josevalim
* | | | Merge pull request #13527 from kuldeepaggarwal/f-independent-specsJosé Valim2013-12-293-3/+6
|\ \ \ \ | | | | | | | | | | Use user-defined configurations in mysql tests
| * | | | used user-defined configurations for running tests that might depend on ↵Kuldeep Aggarwal2013-12-293-3/+6
| |/ / / | | | | | | | | | | | | user's system configuration
* / / / raise `ArgumentError` exception if `Model.where.not` is called with `nil` ↵Kuldeep Aggarwal2013-12-301-0/+6
|/ / / | | | | | | | | | argument
* | | Merge pull request #13474 from jdelStrother/becomesYves Senn2013-12-271-0/+14
|\ \ \ | | | | | | | | Copy changed_attributes across to newly become'd records
| * | | Copy changed_attributes across to newly become'd recordsJonathan del Strother2013-12-271-0/+14
| | | | | | | | | | | | Without this, the original record's values won't get saved, since the partial insertions support (https://github.com/rails/rails/commit/144e8691cbfb8bba77f18cfe68d5e7fd48887f5e) checks for changed values and thinks there are none.
* | | | Fix failure introduced from #13488schneems2013-12-251-1/+1
| | | |
* | | | Merge pull request #13478 from schneems/schneems/fix-mysqlGuillermo Iguaran2013-12-252-7/+7
|\ \ \ \ | | | | | | | | | | Move mysql2 test for when adapter will be loaded