Merge pull request #129 from Pylons/sqla-2.0

Convert sqlalchemy code to 2.0

CHANGES.txt

@@ -12,6 +12,8 @@ unreleased
 
 - Use ``pyproject.toml`` instead of ``setup.py`` for project metadata.
 
+- Use SQLAlchemy 2.0 patterns.
+
 2.0 (2021-02-28)
 ----------------
 

{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/base_views/default.py

@@ -12,17 +12,17 @@ def my_view(request):
 
 {%- elif cookiecutter.backend == 'sqlalchemy' %}
 from pyramid.response import Response
-from sqlalchemy.exc import SQLAlchemyError
+import sqlalchemy as sa
 
 from .. import models
 
 
 @view_config(route_name='home', renderer='{{ cookiecutter.repo_name }}:templates/mytemplate.{{ "pt" if "chameleon" == cookiecutter.template_language else cookiecutter.template_language }}')
 def my_view(request):
     try:
-        query = request.dbsession.query(models.MyModel)
-        one = query.filter(models.MyModel.name == 'one').one()
-    except SQLAlchemyError:
+        query = sa.select(models.MyModel).where(models.MyModel.name == 'one')
+        one = request.dbsession.execute(query).scalar_one()
+    except sa.exc.SQLAlchemyError:
         return Response(db_err_msg, content_type='text/plain', status=500)
     return {'one': one, 'project': '{{ cookiecutter.project_name }}'}
 

{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/sqlalchemy_models/meta.py

@@ -1,4 +1,4 @@
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 from sqlalchemy.schema import MetaData
 
 # Recommended naming convention used by Alembic, as various different database