[ckan-changes] [ckan/ckan] eddc7a: [#2034] sort and limit in subqueries before unions

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: eddc7a735de0e400faf381b1bf9391972c94b403
      https://github.com/ckan/ckan/commit/eddc7a735de0e400faf381b1bf9391972c94b403
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] sort and limit in subqueries before unions


  Commit: 6060ee4fa2c60de7c952f7a5bcaa7063230f0c30
      https://github.com/ckan/ckan/commit/6060ee4fa2c60de7c952f7a5bcaa7063230f0c30
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] real subqueries required for limits inside unions


  Commit: e4fb845c2170e1d4f8510dccbc1723557bad6cfa
      https://github.com/ckan/ckan/commit/e4fb845c2170e1d4f8510dccbc1723557bad6cfa
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] distinct now required before offset+limit


  Commit: 272a428c582bfcefd164bcf147fd03cec9d54d84
      https://github.com/ckan/ckan/commit/272a428c582bfcefd164bcf147fd03cec9d54d84
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/lib/base.py
    R ckan/lib/field_types.py
    M ckan/logic/converters.py
    A ckan/new_tests/lib/test_base.py
    M ckan/public/base/css/main.css
    M ckan/templates/package/snippets/package_basic_fields.html
    R ckan/tests/functional/test_cors.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclineview/theme/public/recline_view.js
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 2034-activity-query-performance-1


  Commit: c04c273c31845a293b8e7b135e89b5d066b6e9f2
      https://github.com/ckan/ckan/commit/c04c273c31845a293b8e7b135e89b5d066b6e9f2
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] apply distinct after union


  Commit: a4de57e5838d649f4ce873187cd148c08973427c
      https://github.com/ckan/ckan/commit/a4de57e5838d649f4ce873187cd148c08973427c
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] select_from now called select_entity_from in sqlalchemy 0.9


  Commit: c3ca36da94d9c8720c6425345e10e748ec874b91
      https://github.com/ckan/ckan/commit/c3ca36da94d9c8720c6425345e10e748ec874b91
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Merge branch '2034-activity-query-performance-1' of https://github.com/wardi/ckan into wardi-2034-activity-query-performance-1


  Commit: 1f923c258a95c452b142344d0c548c68fab52aba
      https://github.com/ckan/ckan/commit/1f923c258a95c452b142344d0c548c68fab52aba
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Merge branch 'wardi-2034-activity-query-performance-1'


Compare: https://github.com/ckan/ckan/compare/0fef8f5802ed...1f923c258a95