1. 27 3月, 2018 1 次提交
    • R
      Bring back private class methods accessibility in named scope · b9be64cc
      Ryuta Kamizono 提交于
      The receiver in a scope was changed from `klass` to `relation` itself
      for all scopes (named scope, default_scope, and association scope)
      behaves consistently.
      
      In addition. Before 5.2, if both an AR model class and a Relation
      instance have same named methods (e.g. `arel_attribute`,
      `predicate_builder`, etc), named scope doesn't respect relation instance
      information.
      
      For example:
      
      ```ruby
      class Post < ActiveRecord::Base
        has_many :comments1, class_name: "RecentComment1"
        has_many :comments2, class_name: "RecentComment2"
      end
      
      class RecentComment1 < ActiveRecord::Base
        self.table_name = "comments"
        default_scope { where(arel_attribute(:created_at).gteq(2.weeks.ago)) }
      end
      
      class RecentComment2 < ActiveRecord::Base
        self.table_name = "comments"
        default_scope { recent_updated }
        scope :recent_updated, -> { where(arel_attribute(:updated_at).gteq(2.weeks.ago)) }
      end
      ```
      
      If eager loading `Post.eager_load(:comments1, :comments2).to_a`,
      `:comments1` (default_scope) respects aliased table name, but
      `:comments2` (using named scope) may not work correctly since named
      scope doesn't respect relation instance information. See also 801ccab2.
      
      But this is a breaking change between releases without deprecation.
      I decided to bring back private class methods accessibility in named
      scope.
      
      Fixes #31740.
      Fixes #32331.
      b9be64cc
  2. 23 3月, 2018 2 次提交
  3. 22 3月, 2018 5 次提交
    • E
      Refactor configs_for and friends · 4e663c1e
      eileencodes 提交于
      Moves the configs_for and DatabaseConfig struct into it's own file. I
      was considering doing this in a future refactoring but our set up forced
      me to move it now. You see there are `mattr_accessor`'s on the Core
      module that have default settings. For example the `schema_format`
      defaults to Ruby. So if I call `configs_for` or any methods in the Core
      module it will reset the `schema_format` to `:ruby`. By moving it to
      it's own class we can keep the logic contained and avoid this
      unfortunate issue.
      
      The second change here does a double loop over the yaml files. Bear with
      me...
      
      Our tests dictate that we need to load an environment before our rake
      tasks because we could have something in an environment that the
      database.yml depends on. There are side-effects to this and I think
      there's a deeper bug that needs to be fixed but that's for another
      issue. The gist of the problem is when I was creating the dynamic rake
      tasks if the yaml that that rake task is calling evaluates code (like
      erb) that calls the environment configs the code will blow up because
      the environment is not loaded yet.
      
      To avoid this issue we added a new method that simply loads the yaml and
      does not evaluate the erb or anything in it. We then use that yaml to
      create the task name. Inside the task name we can then call
      `load_config` and load the real config to actually call the code
      internal to the task. I admit, this is gross, but refactoring can't all
      be pretty all the time and I'm working hard with `@tenderlove` to
      refactor much more of this code to get to a better place re connection
      management and rake tasks.
      4e663c1e
    • E
      Update schema/structure dump tasks for multi db · 0f0aa6a2
      eileencodes 提交于
      Adds the ability to dump the schema or structure files for mulitple
      databases. Loops through the configs for a given env and sets a filename
      based on the format, then establishes a connection for that config and
      dumps into the file.
      0f0aa6a2
    • E
      Add ability to create/drop/migrate all dbs for a given env · 5eb4488d
      eileencodes 提交于
      `each_current_configuration` is used by create, drop, and other methods
      to find the configs for a given environment and returning those to the
      method calling them.
      
      The change here allows for the database commands to operate on all the
      configs in the environment. Previously we couldn't slice the hashes and
      iterate over them becasue they could be two tier or could be three
      tier. By using the database config structs we don't need to care whether
      we're dealing with a three tier or two tier, we can just parse all the
      configs based on the environment.
      
      This makes it possible for us to run `bin/rails db:create` and it will
      create all the configs for the dev and test environment ust like it does
      for a two tier - it creates the db for dev and test. Now `db:create`
      will create `primary` for dev and test, and `animals` for dev and test
      if our database.yml looks like:
      
      ```
      development:
        primary:
          etc
        animals:
          etc
      
      test:
        primary:
          etc
        animals:
          etc
      ```
      
      This means that `bin/rails db:create`, `bin/rails db:drop`, and
      `bin/rails db:migrate` will operate on the dev and test env for both
      primary and animals ds.
      5eb4488d
    • E
      Add create/drop/migrate db tasks for each database in the environment · d79d6867
      eileencodes 提交于
      If we have a three-tier yaml file like this:
      
      ```
      development:
        primary:
          database: "development"
        animals:
          database: "development_animals"
          migrations_paths: "db/animals_migrate"
      ```
      
      This will add db create/drop/and migrate tasks for each level of the
      config under that environment.
      
      ```
      bin/rails db:drop:primary
      bin/rails db:drop:animals
      
      bin/rails db:create:primary
      bin/rails db:create:animals
      
      bin/rails db:migrate:primary
      bin/rails db:migrate:animals
      ```
      d79d6867
    • E
      Add DatabaseConfig Struct and associated methods · 1756094b
      eileencodes 提交于
      Passing around and parsing hashes is easy if you know that it's a two
      tier config and each key will be named after the environment and each
      value will be the config for that environment key.
      
      This falls apart pretty quickly with three-tier configs. We have no idea
      what the second tier will be named (we know the first is primary but we
      don't know the second), we have no easy way of figuring out
      how deep a hash we have without iterating over it, and we'd have to do
      this a lot throughout the code since it breaks all of Active Record's
      assumptions regarding configurations.
      
      These methods allow us to pass around objects instead. This will allow
      us to more easily parse the configs for the rake tasks. Evenually I'd
      like to replace the Active Record connection management that passes
      around config hashes to use these methods as well but that's much
      farther down the road.
      
      `walk_configs` takes an environment, specification name, and a config
      and turns them into DatabaseConfig struct objects so we can ask the
      configs questions like:
      
      ```
      db_config.spec_name
      => animals
      
      db_config.env_name
      => development
      
      db_config.config
      { :adapter => mysql etc }
      ```
      
      `db_configs` loops through all given configurations and returns an array
      of DatabaseConfig structs for each config in the yaml file.
      
      and lastly `configs_for` takes an environment and either returns the
      spec name and config if a block is given or returns an array of
      DatabaseConfig structs just for the given environment.
      1756094b
  4. 21 3月, 2018 1 次提交
  5. 18 3月, 2018 1 次提交
  6. 17 3月, 2018 1 次提交
    • E
      Fix connection handling with three-tier config · 03929463
      eileencodes 提交于
      If you had a three-tier config, the `establish_connection` that's called
      in the Railtie on load can't figure out how to access the default
      configuration.
      
      This is because Rails assumes that the config is the first value in the
      hash and always associated with the key from the environment. With a
      three tier config however we need to go one level deeper.
      
      This commit includes 2 changes. 1) removes a line from `resolve_all`
      which was parsing out the the environment from the config so instead of
      getting
      
      ```
      {
        :development => {
          :primary => {
            :database => "whatever"
          }
        },
          :animals => {
            :database => "whatever-animals"
          }
        },
        etc with test / prod
      }
      ```
      
      We'd instead end up with a config that had no attachment to it's
      envioronment.
      
      ```
      {
        :primary => {
          :database => "whatever"
        }
        :animals => {
          :database => "whatever-animals"
        }
        etc - without test and prod
      }
      ```
      
      Not only did this mean that Active Record didn't know how to establish a
      connection, it didn't have the other necessary configs along with it in
      the configs list.
      
      So fix this I removed the line that deletes these configs.
      
      The second thing this commit changes is adding this line to
      `establish_connection`
      
      ```
      spec = spec[spec_name.to_sym] if spec[spec_name.to_sym]
      ```
      
      When you have a three-tier config and don't pass any hash/symbol/env etc
      to `establish_connection` the resolver will automatically return both
      the primary and secondary (in this case animals db) configurations.
      We'll get an `database configuration does not specify adapter` error
      because AR will try to establish a connection on the `primary` key
      rather than the `primary` key's config. It assumes that the
      `development` or default env automatically will return a config hash,
      but with a three-tier config we actually get a key and config `primary
      => config`.
      
      This fix is a bit of a bandaid because it's not the "correct" way to
      handle this situation, but it does solve our immediate problem. The new
      code here is saying "if the config returned from the resolver (I know
      it's called spec in here but we interchange our meanings a LOT and what
      is returned is a three-tier config) has a key matching the "primary"
      spec name, grab the config from the spec and pass that to the
      estalbish_connection method".
      
      This works because if we pass `:animals` or a hash, or `:primary` we'll
      already have the correct configuration to connect with.
      
      This fixes the case where we want Rail to connect with the default
      connection.
      
      Coming soon is a refactoring that should eliminate the need to do this
      but I need this fix in order to write the multi-db rake tasks that I
      promised in my RailsConf submission. `@tenderlove` and I are working on
      the refactoring of the internals for connection management but it won't
      be ready for a few weeks and this issue has been blocking progress.
      03929463
  7. 16 3月, 2018 2 次提交
  8. 12 3月, 2018 3 次提交
    • D
      Use PredicateBuilder for bind params in Batches · da3492fd
      Daniel Colson 提交于
      Using the PredicateBuilder to build the bind
      attributes allows Batch to drop its dependency on
      Relation::QueryAttribute and Arel::Nodes::BindParam
      da3492fd
    • A
      Ensure that leading date is stripped by quoted_time · 7c479cbf
      Andrew White 提交于
      In #24542, quoted_time was introduced to strip the leading date
      component for time columns because it was having a significant
      effect in mariadb. However, it assumed that the date component
      was always 2000-01-01 which isn't the case, especially if the
      source wasn't another time column.
      7c479cbf
    • A
      Normalize date component when writing to time columns · 3f95054f
      Andrew White 提交于
      For legacy reasons Rails stores time columns on sqlite as full
      timestamp strings. However because the date component wasn't being
      normalized this meant that when they were read back they were being
      prefixed with 2001-01-01 by ActiveModel::Type::Time. This had a
      twofold result - first it meant that the fast code path wasn't being
      used because the string was invalid and second it was corrupting the
      second fractional component being read by the Date._parse code path.
      
      Fix this by a combination of normalizing the timestamps on writing
      and also changing Active Model to be more lenient when detecting
      whether a string starts with a date component before creating the
      dummy time value for parsing.
      3f95054f
  9. 09 3月, 2018 1 次提交
  10. 07 3月, 2018 1 次提交
  11. 06 3月, 2018 5 次提交
  12. 05 3月, 2018 5 次提交
  13. 04 3月, 2018 3 次提交
  14. 03 3月, 2018 1 次提交
  15. 02 3月, 2018 5 次提交
  16. 28 2月, 2018 2 次提交
  17. 27 2月, 2018 1 次提交