1. 18 1月, 2014 1 次提交
  2. 14 1月, 2014 1 次提交
  3. 10 1月, 2014 2 次提交
    • 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
    • A
      Revert "ask the fixture set for the sql statements" · da65fe9e
      Aaron Patterson 提交于
      This reverts commit 026d0555.
      
      Conflicts:
      	activerecord/lib/active_record/fixtures.rb
      
      Fixes #13383
      da65fe9e
  4. 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
  5. 06 1月, 2014 2 次提交
  6. 31 12月, 2013 1 次提交
    • 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
  7. 30 12月, 2013 2 次提交
  8. 24 12月, 2013 6 次提交
  9. 23 12月, 2013 2 次提交
    • S
      Tell how to Create a Database in Error Message · 0ec45cd1
      schneems 提交于
      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.
      0ec45cd1
    • D
      fix quoting non-strings · 1f6a9b50
      Damien Mathieu 提交于
      Closes #13444
      1f6a9b50
  10. 21 12月, 2013 1 次提交
  11. 20 12月, 2013 1 次提交
  12. 19 12月, 2013 1 次提交
  13. 17 12月, 2013 1 次提交
  14. 16 12月, 2013 1 次提交
  15. 14 12月, 2013 1 次提交
  16. 13 12月, 2013 1 次提交
  17. 12 12月, 2013 1 次提交
  18. 10 12月, 2013 1 次提交
  19. 06 12月, 2013 2 次提交
  20. 05 12月, 2013 1 次提交
  21. 04 12月, 2013 1 次提交
  22. 03 12月, 2013 2 次提交
  23. 30 11月, 2013 1 次提交
  24. 29 11月, 2013 5 次提交
  25. 26 11月, 2013 1 次提交
    • Y
      `rename_index`: add the new index before removing the old one. · 6eba8d27
      Yves Senn 提交于
      This prevents the following error when a MySQL index on a foreign key
      column is renamed:
      
      ```
      ActiveRecord::StatementInvalid: Mysql2::Error: Cannot drop index 'index_engines_on_car_id': needed in a foreign key constraint: DROP INDEX `index_engines_on_car_id` ON `engines`
      ```
      
      refs: #13038.
      6eba8d27