1. 16 8月, 2016 1 次提交
    • M
      Fix count which would sometimes force a DISTINCT · 0aae7806
      Maxime Lapointe 提交于
      The current behaviour of checking if there is a LEFT OUTER JOIN arel
      node to detect if we are doing eager_loading is wrong. This problem
      wasn't frequent before as only some pretty specific cases would add
      a LEFT OUTER JOIN arel node. However, the recent new feature
      left_outer_joins also add this node and made this problem happen
      frequently.
      
      Since in the perform_calculation function, we don't have access to
      eager_loading information, I had to extract the logic for the distinct
      out to the calculate method.
      
      As I was in the file for left_outer_join tests, I fixed a few that had
      bugs and I replaced some that were really weak with something that
      will catch more issues.
      
      In relation tests, the first test I changed would have failed if it
      had validated the hash returned by count instead of just checking how
      many pairs were in it. This is because this merge of join currently
      transforms the join node into an outer join node, which then made
      count do a distinct. So before this change, the return was
      {1=>1, 4=>1, 5=>1}.
      0aae7806
  2. 07 8月, 2016 3 次提交
  3. 11 7月, 2016 1 次提交
    • S
      Always prefer class types to query types when casting `group` · a45363a2
      Sean Griffin 提交于
      When `group` is used in combination with any calculation method, the
      resulting hash uses the grouping expression as the key. Currently we're
      incorrectly always favoring the type reported by the query, instead of
      the type known by the class. This causes differing behavior depending on
      whether the adaptor actually gives proper types with the query or not.
      After this change, the behavior will be the same on all adaptors -- we
      see if we know the type from the class, fall back to the type from the
      query, and finally fall back to the identity type.
      
      Fixes #25595
      a45363a2
  4. 19 5月, 2016 1 次提交
  5. 20 3月, 2016 1 次提交
  6. 04 2月, 2016 2 次提交
  7. 22 10月, 2015 2 次提交
    • R
      Refactor Calculations#execute_grouped_calculation and clean AR test case · 4f21d42f
      Rafael Sales 提交于
      * When tried to use `Company#accounts` test/models/company.rb I got:
      
      ```
      ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column:
      accounts.company_id: SELECT COUNT(*) AS count_all, "companies"."firm_id"
      AS companies_firm_id FROM "companies" INNER JOIN "accounts" ON
      "accounts"."company_id" = "companies"."id" GROUP BY "companies"."firm_id"
      ```
      
      * The refactor on Calculations class was just to simplify the code
      4f21d42f
    • R
      Fix generated projection fields in group by query · c2d33c4a
      Rafael Sales 提交于
      Closes #21922
      
      Let `Book(id, author_id)`, `Photo(id, book_id, author_id)` and `Author(id)`
      
      Running `Book.group(:author_id).joins(:photos).count` will produce:
      
      * Rails 4.2 - conflicts `author_id` in both projection and group by:
      ```sql
      SELECT COUNT(*) AS count_all, author_id AS author_id
        FROM "books" INNER JOIN "photos" ON "photos"."book_id" = "books"."id"
       GROUP BY author_id
      ```
      
      * Master (9d02a25d) - conflicts `author_id` only in projection:
      ```sql
      SELECT COUNT(*) AS count_all, author_id AS author_id
        FROM "books" INNER JOIN "photos" ON "photos"."book_id" = "books"."id"
       GROUP BY "books"."author_id"
      ```
      
      * With this fix:
      ```sql
      SELECT COUNT(*) AS count_all, "books"."author_id" AS books_author_id
        FROM "books" INNER JOIN "photos" ON "photos"."book_id" = "books"."id"
       GROUP BY "books"."author_id"
      ```
      c2d33c4a
  8. 21 10月, 2015 1 次提交
  9. 14 10月, 2015 1 次提交
    • Y
      applies new doc guidelines to Active Record. · 428d47ad
      Yves Senn 提交于
      The focus of this change is to make the API more accessible.
      References to method and classes should be linked to make it easy to
      navigate around.
      
      This patch makes exzessiv use of `rdoc-ref:` to provide more readable
      docs. This makes it possible to document `ActiveRecord::Base#save` even
      though the method is within a separate module
      `ActiveRecord::Persistence`. The goal here is to bring the API closer to
      the actual code that you would write.
      
      This commit only deals with Active Record. The other gems will be
      updated accordingly but in different commits. The pass through Active
      Record is not completely finished yet. A follow up commit will change
      the spots I haven't yet had the time to update.
      
      /cc @fxn
      428d47ad
  10. 13 10月, 2015 1 次提交
  11. 26 9月, 2015 1 次提交
  12. 23 9月, 2015 2 次提交
    • Y
      remove warning from Calculations#sum · 908d6871
      yuuji.yaginuma 提交于
      This removes the following warning.
      ```
      activerecord/lib/active_record/relation/calculations.rb:74: warning: `&' interpreted as argument prefix
      ```
      908d6871
    • Y
      Fix arguments of `AR::Calculations#sum` · 0f6d47d8
      yui-knk 提交于
      Arguments of `#sum` does not match with other shortcuts methods
      (count, average, minimum, and maximum).
      This commit fix these two points:
      
      * call `super` with only block arguments
        First argument of `super` method, `Enumerable#sum`, is `identity`
        and first argument of `AR::Calculations#sum` is `column_name`.
        `Enumerable#sum` does not expect `column_name` to be passed.
      * Change first argument of `sum` from array arguemnt to single
        argument to match other shortcuts methods. When `sum` accept
        array arguemnt, user can pass multi arguments and an exception is
        raised from `calculate`.
      0f6d47d8
  13. 03 7月, 2015 1 次提交
    • J
      [skip ci] #distinct instead of #uniq · 64401610
      Jon Atack 提交于
      as #uniq will be removed from Rails 5.0 as per the Active Support
      exception raised:
      
      ActiveSupport::DeprecationException: DEPRECATION WARNING: uniq is
      deprecated and will be removed from Rails 5.0 (use distinct instead).
      64401610
  14. 01 7月, 2015 1 次提交
    • R
      Allow select with Arel and count as well as calculations with Arel · b220c9f9
      Roque Pinel 提交于
      It allows a query like `User.select(:name).count` to be written
      using Arel as `User.select(User.arel_table[:name]).count`.
      
      It exposes the calculations API to accept Arel nodes:
      `User.count(User.arel_table[:name])`, `User.sum(User.arel_table[:id])`,
      `Account.average(Account.arel_table[:credit_limit])`,
      `Account.maximum(Account.arel_table[:credit_limit])` and
      `Account.minimum(Account.arel_table[:credit_limit])`.
      b220c9f9
  15. 27 6月, 2015 1 次提交
  16. 20 6月, 2015 2 次提交
    • S
      Include `Enumerable` in `ActiveRecord::Relation` · b644964b
      Sean Griffin 提交于
      After discussing, we've decided it makes more sense to include it. We're
      already forwarding every conflicting method to `to_a`, and there's no
      conflation of concerns. `Enumerable` has no mutating methods, and it
      just allows us to simplify the code. No existing methods will have a
      change in behavior. Un-overridden Enumerable methods will simply
      delegate to `each`.
      
      [Sean Griffin & bogdan]
      b644964b
    • S
      Use `Enumerable#sum` on `ActiveRecord::Relation` when a block is given · 7d14bd3f
      Sean Griffin 提交于
      This matches our behavior in other cases where useful enumerable methods
      might have a different definition in `Relation`. Wanting to actually
      enumerate over the records in this case is completely reasonable, and
      wanting `.sum` is reasonable for the same reason it is on `Enumerable`
      in the first place.
      7d14bd3f
  17. 29 5月, 2015 1 次提交
    • K
      Allow Enumerable#pluck to take a splat. · 777fa257
      Kevin Deisz 提交于
      This allows easier integration with ActiveRecord, such that
      AR#pluck will now use Enumerable#pluck if the relation is loaded,
      without needing to hit the database.
      777fa257
  18. 13 4月, 2015 1 次提交
  19. 17 3月, 2015 1 次提交
  20. 28 2月, 2015 1 次提交
  21. 18 2月, 2015 1 次提交
  22. 01 2月, 2015 1 次提交
    • S
      Attribute assignment and type casting has nothing to do with columns · 70ac0729
      Sean Griffin 提交于
      It's finally finished!!!!!!! The reason the Attributes API was kept
      private in 4.2 was due to some publicly visible implementation details.
      It was previously implemented by overloading `columns` and
      `columns_hash`, to make them return column objects which were modified
      with the attribute information.
      
      This meant that those methods LIED! We didn't change the database
      schema. We changed the attribute information on the class. That is
      wrong! It should be the other way around, where schema loading just
      calls the attributes API for you. And now it does!
      
      Yes, this means that there is nothing that happens in automatic schema
      loading that you couldn't manually do yourself. (There's still some
      funky cases where we hit the connection adapter that I need to handle,
      before we can turn off automatic schema detection entirely.)
      
      There were a few weird test failures caused by this that had to be
      fixed. The main source came from the fact that the attribute methods are
      now defined in terms of `attribute_names`, which has a clause like
      `return [] unless table_exists?`. I don't *think* this is an issue,
      since the only place this caused failures were in a fake adapter which
      didn't override `table_exists?`.
      
      Additionally, there were a few cases where tests were failing because a
      migration was run, but the model was not reloaded. I'm not sure why
      these started failing from this change, I might need to clear an
      additional cache in `reload_schema_from_cache`. Again, since this is not
      normal usage, and it's expected that `reset_column_information` will be
      called after the table is modified, I don't think it's a problem.
      
      Still, test failures that were unrelated to the change are worrying, and
      I need to dig into them further.
      
      Finally, I spent a lot of time debugging issues with the mutex used in
      `define_attribute_methods`. I think we can just remove that method
      entirely, and define the attribute methods *manually* in the call to
      `define_attribute`, which would simplify the code *tremendously*.
      
      Ok. now to make this damn thing public, and work on moving it up to
      Active Model.
      70ac0729
  23. 29 1月, 2015 1 次提交
  24. 28 1月, 2015 2 次提交
    • S
      Remove Relation#bind_params · b06f64c3
      Sean Griffin 提交于
      `bound_attributes` is now used universally across the board, removing
      the need for the conversion layer. These changes are mostly mechanical,
      with the exception of the log subscriber. Additional, we had to
      implement `hash` on the attribute objects, so they could be used as a
      key for query caching.
      b06f64c3
    • S
      Unify access to bind values on Relation · 16ce2eec
      Sean Griffin 提交于
      The bind values can come from four places. `having`, `where`, `joins`,
      and `from` when selecting from a subquery that contains binds. These
      need to be kept in a specific order, since the clauses will always
      appear in that order. Up until recently, they were not.
      
      Additionally, `joins` actually did keep its bind values in a separate
      location (presumably because it's the only case that people noticed was
      broken). However, this meant that anything accessing just `bind_values`
      was broken (which most places were). This is no longer possible, there
      is only a single way to access the bind values, and it includes joins in
      the proper location. The setter was removed yesterday, so breaking `+=`
      cases is not possible.
      
      I'm still not happy that `joins` is putting it's bind values on the
      Arel AST, and I'm planning on refactoring it further, but this removes a
      ton of bug cases.
      16ce2eec
  25. 27 1月, 2015 1 次提交
    • S
      Change `having_values` to use the `WhereClause` class · 39f2c3b3
      Sean Griffin 提交于
      This fixed an issue where `having` can only be called after the last
      call to `where`, because it messes with the same `bind_values` array.
      With this change, the two can be called as many times as needed, in any
      order, and the final query will be correct. However, once something
      assigns `bind_values`, that stops. This is because we have to move all
      of the bind values from the having clause over to the where clause since
      we can't differentiate the two, and assignment was likely in the form
      of:
      
      `relation.bind_values += other.bind_values`
      
      This will go away once we remove all places that are assigning
      `bind_values`, which is next on the list.
      
      While this fixes a bug that was present in at least 4.2 (more likely
      present going back as far as 3.0, becoming more likely in 4.1 and later
      as we switched to prepared statements in more cases), I don't think this
      can be easily backported. The internal changes to `Relation` are
      non-trivial, anything that involves modifying the `bind_values` array
      would need to change, and I'm not confident that we have sufficient test
      coverage of all of those locations (when `having` was called with a hash
      that could generate bind values).
      
      [Sean Griffin & anthonynavarre]
      39f2c3b3
  26. 02 1月, 2015 1 次提交
  27. 11 12月, 2014 1 次提交
  28. 02 11月, 2014 1 次提交
  29. 31 10月, 2014 1 次提交
    • S
      Don't require calculations to be aliased to a column · 53ec0bc0
      Sean Griffin 提交于
      Arel has changed so that `.sum` no longer aliases `SUM(the_column)` to
      `sum_id`. This means the type returned by the adapter will be at the key
      `"SUM(the_column)"`. Longer term, we should eventually be able to retain
      type information from the AR::Base subclasses used in joined queries
      53ec0bc0
  30. 20 9月, 2014 1 次提交
  31. 03 7月, 2014 1 次提交
  32. 22 6月, 2014 1 次提交
  33. 18 6月, 2014 1 次提交