aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Move mysql2 test for when adapter will be loadedschneems2013-12-242-7/+7
| |/ / | | | | | | | | | | | | | | | When run with only the Mysql adapter, we get this failure: https://travis-ci.org/rails/rails/jobs/15937907#L2416 Porting the test over to only run when mysql2 is loaded
* / / using symbol instead of string in establish_connectionKuldeep Aggarwal2013-12-251-1/+1
|/ /
* | Raise NoDatabaseError when db does not existschneems2013-12-242-0/+21
| | | | | | Building on the work of #13427 this PR adds a helpful error message to the adapters: mysql, mysql2, and sqlite3
* | Deprecate use of string in establish_connection as connection lookupJosé Valim2013-12-244-6/+6
| |
* | Only build a ConnectionSpecification if requiredJosé Valim2013-12-241-28/+26
| |
* | Merge pull request #13463 from josevalim/jv-envJosé Valim2013-12-231-2/+10
|\ \ | | | | | | Do not store production information in .yml files
| * | Guarantee the connection resolver handles string valuesJosé Valim2013-12-231-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also cleans up the rake tasks that were checking for DATABASE_URL in different places. In fact, it would be nice to deprecate DATABASE_URL usage in the long term, considering the direction we are moving of allowing those in .yml files.
* | | Tidy up fix for PG extensions quotingCarlos Antonio da Silva2013-12-233-6/+18
| | | | | | | | | | | | | | | Always pass in the column for quote_bound_value and quote using it in case it exists there.
* | | Serialize postgres' hstore, json and array types correctly in AR update methods.Tadas Tamosauskas2013-12-233-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12261. Closes #12395. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/adapters/postgresql/array_test.rb activerecord/test/cases/adapters/postgresql/json_test.rb
* | | Do not consider PG array columns as number or text columnsCarlos Antonio da Silva2013-12-231-2/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code uses these checks in several places to know what to do with a particular column, for instance AR attribute query methods has a branch like this: if column.number? !value.zero? end This should never be true for array columns, since it would be the same as running [].zero?, which results in a NoMethodError exception. Fixing this by ensuring that array columns in PostgreSQL never return true for number?/text? checks. Since most of the array support was based on the postgres_ext lib, it's worth noting it does the same thing for numeric array columns too: https://github.com/dockyard/postgres_ext/blob/v1.0.0/lib/postgres_ext/active_record/connection_adapters/postgres_adapter.rb#L72 This extended the same logic for text columns to ensure consistency.
* | Tell how to Create a Database in Error Messageschneems2013-12-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if you attempt to use a database that does not exist you get an error: ``` PG::ConnectionBad FATAL: database "db_error" does not exist ``` The solution is easy, create and migrate your database however new developers may not know these commands by memory. Instead of requiring the developer to search for a solution, tell them how to fix the problem in the error message: ``` ActiveRecord::NoDatabase: FATAL: database "db_error" does not exist Run `$ bin/rake db:create db:migrate` to create your database ``` Active Record should not know about `rake db:migrate` so this additional information needs to come from the railtie. Potential alternative implementation suggestions are welcome.
* | On destroying do not touch destroyed belongs to association.Paul Nikitochkin2013-12-231-0/+8
| | | | | | | | Fixes: #13445
* | Merge pull request #13446 from kuldeepaggarwal/resolver-test-casesYves Senn2013-12-231-0/+10
|\ \ | | | | | | Resolver test cases
| * | added test cases for Resolver#connection_url_to_hashKuldeep Aggarwal2013-12-231-0/+10
| | |
* | | fix quoting non-stringsDamien Mathieu2013-12-221-0/+6
|/ / | | | | | | Closes #13444
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 15:19:41 +0000