aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | expliticly make STI column a bind valueAaron Patterson2014-01-141-4/+9
| | | | |
* | | | | Merge branch 'master' into set_bindsAaron Patterson2014-01-142-8/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: directly create the ARel AST Updated comment to mention the enum mapping class method [ci skip]
| * | | | directly create the ARel ASTAaron Patterson2014-01-141-6/+4
| | | | | | | | | | | | | | | | | | | | rather than allocating a new Relation, just make the AST directly
| * | | | Updated comment to mention the enum mapping class method [ci skip]Godfrey Chan2014-01-141-2/+3
| | | | |
* | | | | take in to account existing bind parameters when building the bind listAaron Patterson2014-01-141-21/+20
| | | | |
* | | | | comment out the sqlite3 debug code (for now)Aaron Patterson2014-01-141-0/+7
| | | | |
* | | | | fix cache class interfaceAaron Patterson2014-01-141-5/+17
| | | | |
* | | | | unscoping a where should remove bind valuesAaron Patterson2014-01-141-0/+2
| | | | |
* | | | | remove dead codeAaron Patterson2014-01-141-2/+0
| | | | |
* | | | | where needs to bring the bind params when creating a new relationAaron Patterson2014-01-141-0/+3
| | | | |
* | | | | we should not be copying these. fixes ↵Aaron Patterson2014-01-141-4/+0
| | | | | | | | | | | | | | | | | | | | test_find_all_using_where_with_relation_with_bound_values
* | | | | Merge branch 'master' into set_bindsAaron Patterson2014-01-143-16/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: don't establish a new connection when testing with `sqlite3_mem`. sqlite >= 3.8.0 supports partial indexes Don't try to get the subclass if the inheritance column doesn't exist Enum mappings are now exposed via class methods instead of constants. Fix fields_for documentation with index option [ci skip] quick pass through Active Record CHANGELOG. [ci skip] [ci skip] Grammar correction single quotes for controller generated routes [ci skip] Added alias to CSRF Set NameError#name
| * | | | sqlite >= 3.8.0 supports partial indexesCody Cutrer2014-01-141-1/+17
| | | | |
| * | | | Don't try to get the subclass if the inheritance column doesn't existUjjwal Thaakar2014-01-141-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+1
| |\ \ \ \ | | | | | | | | | | | | Set NameError#name
| | * | | | Set NameError#nameChulki Lee2014-01-131-1/+1
| | | | | |
* | | | | | explains for prepared statements should never have binds in SQLite3Aaron Patterson2014-01-131-1/+1
| | | | | |
* | | | | | fixing column alias resolutionAaron Patterson2014-01-131-1/+1
| | | | | |
* | | | | | replace bind values on calls to to_sqlAaron Patterson2014-01-132-4/+8
| | | | | |
* | | | | | do not clear out bind parameters on unscopeAaron Patterson2014-01-131-3/+0
| | | | | |
* | | | | | Merge branch 'master' into set_bindsAaron Patterson2014-01-133-5/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) unscope should remove bind values associated with the where reverse_order_value= is not private, so no need to send avoid more dynamic symbols no need to to_sym recover from test runs that leave the database in a bad state updates screenshot data [ci skip] "serie" => "series" revises a few things in the getting started guide [ci skip] Favor canonical environment variables for secrets removed extra comma [ci skip] Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665. Updated Changelog to reflect removal of :dependent => :restrict standardize on jruby_skip & rbx_skip fix bug in becomes! when changing from base to subclass. Closes #13272. highlight http://localhost:3000 in README.md. Closes #13643. [ci skip] doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip] Skip Spring App Generator tests on JRuby fixes a typo in a CHANGELOG upgrade SDoc fixes the Gemfile generator templates ... Conflicts: activerecord/test/cases/hot_compatibility_test.rb
| * | | | | unscope should remove bind values associated with the whereAaron Patterson2014-01-131-0/+2
| | | | | |
| * | | | | reverse_order_value= is not private, so no need to sendAaron Patterson2014-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It's not public API, but is not private scoped.
| * | | | | avoid more dynamic symbolsAaron Patterson2014-01-131-1/+1
| | | | | |
| * | | | | no need to to_symAaron Patterson2014-01-131-2/+2
| |/ / / /
| * | | | fix bug in becomes! when changing from base to subclass. Closes #13272.Yves Senn2014-01-131-1/+5
| | | | |
| * | | | use enum labels as form values. Achieved by `_before_type_cast`.Yves Senn2014-01-111-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | adding bind values to the manager objectAaron Patterson2014-01-135-9/+11
| | | |
* | | | bubble bind parameters up when building join dependenciesAaron Patterson2014-01-133-9/+19
| | | |
* | | | Merge branch 'master' into set_bindsAaron Patterson2014-01-11124-3226/+4107
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (2794 commits) doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip] Restore DATABASE_URL even if it's nil in connection_handler test [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users Ensure Active Record connection consistency Revert "ask the fixture set for the sql statements" Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 Adding Hash#compact and Hash#compact! methods MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users. clear cache on body close so that cache remains during rendering add a more restricted codepath for templates fixes #13390 refactor generator tests to use block form of Tempfile Fix typo [ci skip] Move finish_template as the last public method in the generator Minor typos fix [ci skip] make `change_column_null` reversible. Closes #13576. create/drop test and development databases only if RAILS_ENV is nil Revert "Speedup String#to" typo fix in test name. [ci skip]. `core_ext/string/access.rb` test what we are documenting. Fix typo in image_tag documentation ... Conflicts: activerecord/lib/active_record/associations/join_dependency/join_association.rb activerecord/lib/active_record/relation/query_methods.rb
| * | | doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]Yves Senn2014-01-101-0/+1
| | | | | | | | | | | | | | | | Refs #13658
| * | | Merge pull request #13582 from schneems/schneems/preserve-connection-behaviorRafael Mendonça França2014-01-095-22/+80
| |\ \ \ | | | | | | | | | | Ensure Active Record connection consistency
| | * | | Ensure Active Record connection consistencyschneems2014-01-095-22/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Revert "ask the fixture set for the sql statements"Aaron Patterson2014-01-092-17/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 026d0555685087845b74dd87a0417b5a164b1c13. Conflicts: activerecord/lib/active_record/fixtures.rb Fixes #13383
| * | | make `change_column_null` reversible. Closes #13576.Yves Senn2014-01-081-1/+6
| | | | | | | | | | | | | | | | Closes #13623.
| * | | create/drop test and development databases only if RAILS_ENV is nilDamien Mathieu2014-01-082-3/+4
| | | | | | | | | | | | | | | | Closes #13625
| * | | Merge pull request #13355 from dylanahsmith/migration-versionRafael Mendonça França2014-01-071-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activerecord: Initialize Migration with version from MigrationProxy. Conflicts: activerecord/CHANGELOG.md
| | * | | activerecord: Initialize Migration with version from MigrationProxy.Dylan Thacker-Smith2014-01-061-1/+1
| | | | |
| * | | | Make change_table use object of current database adapterNishant Modak2014-01-073-14/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | Merge pull request #13593 from oliveiraethales/store_yaml_coderYves Senn2014-01-061-1/+1
| |\ \ \ | | | | | | | | | | Fix: ActiveRecord::Store TypeError conversion when using YAML coder
| | * | | Fix: ActiveRecord::Store TypeError conversion when using YAML coderThales Oliveira2014-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming the test accordingly to its behaviour Adding 'Fixes' statement to changelog Improving tests legibility & changelog Undoing mistakenly removed empty line & further improving changelog
| * | | | Fix AR connection resolver docs to return a hash with string keys [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| | | | |
| * | | | Fix typo [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| |/ / /
| * | | Add deprecation I accidentally missedJon Leighton2014-01-041-1/+1
| | | |
| * | | Merge pull request #13584 from tjschuck/cannot_cannot_be_can_notXavier Noria2014-01-034-6/+6
| |\ \ \ | | | | | | | | | | Change all "can not"s to the correct "cannot"
| | * | | Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-034-6/+6
| | | | |
| * | | | Minor typo fix [ci skip]Robin Dupret2014-01-031-1/+1
| |/ / /
| * | | Merge pull request #10134 from ↵Rafael Mendonça França2014-01-032-5/+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-082-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arguments. This makes the arguments the same as ActiveRecord::QueryMethods::select.