[ckan-changes] [ckan/ckan] ba77fb: Supress SQLA warnings by wrapping textual statemen...

[GitHub]

  Branch: refs/heads/upgrade-sqlalchemy-to-1.1
  Home:   https://github.com/ckan/ckan
  Commit: ba77fbf82a38138120df2a5931ca3e0bed2ca0fa
      https://github.com/ckan/ckan/commit/ba77fbf82a38138120df2a5931ca3e0bed2ca0fa
  Author: amercader <amercadero at gmail.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M ckan/model/activity.py
    M ckan/model/group.py
    M ckan/model/tracking.py

  Log Message:
  -----------
  Supress SQLA warnings by wrapping textual statements with text()

See
http://docs.sqlalchemy.org/en/latest/changelog/migration_10.html#warnings-emitted-when-coercing-full-sql-fragments-into-text


  Commit: a85b684820d27cb2d6f086444be37be130c9e02e
      https://github.com/ckan/ckan/commit/a85b684820d27cb2d6f086444be37be130c9e02e
  Author: amercader <amercadero at gmail.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M ckanext/datastore/backend/postgres.py

  Log Message:
  -----------
  Improve already existing trigger function check

The exception raised when a trigger function already exists by
SQLAlchemy has changed from:

    (ProgrammingError) function "test_redefined" already exists
    with same argument types

to

    (psycopg2.ProgrammingError) function "test_redefined" already exists
    with same argument types

Updated the check to not rely on the exception type but rather on the
actual message.


Compare: https://github.com/ckan/ckan/compare/26dd7ada5c96...a85b684820d2