1. 13 1月, 2014 1 次提交
  2. 11 1月, 2014 1 次提交
    • Y
      use enum labels as form values. Achieved by `_before_type_cast`. · 792c66f8
      Yves Senn 提交于
      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.
      792c66f8
  3. 10 1月, 2014 2 次提交
    • P
      Restore DATABASE_URL even if it's nil in connection_handler test · e633cdb3
      Prathamesh Sonpatki 提交于
      - We have to restore DATABASE_URL to its previous state irrespective of
        previous value is nil or not
      e633cdb3
    • S
      Ensure Active Record connection consistency · 6cc03675
      schneems 提交于
      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.
      6cc03675
  4. 08 1月, 2014 2 次提交
  5. 07 1月, 2014 1 次提交
    • N
      Make change_table use object of current database adapter · eb589fed
      Nishant Modak 提交于
        - 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
      eb589fed
  6. 06 1月, 2014 4 次提交
    • D
    • M
      Remove warnings in test suite · 2a0fdde3
      Matthias Zirnstein 提交于
      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
      2a0fdde3
    • T
      Fix: ActiveRecord::Store TypeError conversion when using YAML coder · 901a0c8b
      Thales Oliveira 提交于
      Renaming the test accordingly to its behaviour
      
      Adding 'Fixes' statement to changelog
      
      Improving tests legibility & changelog
      
      Undoing mistakenly removed empty line & further improving changelog
      901a0c8b
    • M
      Remove method redefined warnings for test suite · bf556880
      Matthias Zirnstein 提交于
      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
      bf556880
  7. 04 1月, 2014 2 次提交
    • T
      Change all "can not"s to the correct "cannot". · 72bb3fc2
      T.J. Schuck 提交于
      72bb3fc2
    • G
      Building new records with enum scopes now works as expected · 788bb40e
      Godfrey Chan 提交于
      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.
      788bb40e
  8. 02 1月, 2014 3 次提交
  9. 01 1月, 2014 4 次提交
  10. 31 12月, 2013 3 次提交
    • W
      Make outer joins on proper parent · 8e1f26c6
      Washington Luiz 提交于
      Outer joins were being built on the root relation klass rather than the
      one specified in the join dependency root
      8e1f26c6
    • V
      https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5a8... · bb17c3b2
      Vipul A M 提交于
      https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5a8 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
      bb17c3b2
    • S
      Allow "url" sub key in database.yml configuration · 5b96027e
      schneems 提交于
      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
      5b96027e
  11. 30 12月, 2013 1 次提交
  12. 29 12月, 2013 1 次提交
  13. 27 12月, 2013 1 次提交
  14. 26 12月, 2013 1 次提交
  15. 25 12月, 2013 2 次提交
  16. 24 12月, 2013 7 次提交
  17. 23 12月, 2013 4 次提交