SA RemovedIn20Warning

Author: lbesson

c2corg_api/models/user.py

@@ -70,7 +70,7 @@ class User(Base):
         primary_key=True)
     profile = relationship(
         UserProfile, primaryjoin=id == UserProfile.document_id, uselist=False,
-        backref=backref('user', uselist=False))
+        backref=backref('user', uselist=False, cascade_backrefs=False))
 
     username = Column(String(200), nullable=False, unique=True)
     name = Column(String(200), nullable=False)

c2corg_api/tests/views/test_document_schema.py

@@ -5,8 +5,13 @@
 
 class TestGetDocumentsConfig(BaseTestRest):
 
+    @staticmethod
+    def _field_names(fields):
+        return [f.key for f in fields]
+
     def test_get_load_only_fields_routes(self):
-        fields = route_documents_config.get_load_only_fields()
+        fields = self._field_names(
+            route_documents_config.get_load_only_fields())
         self.assertIn('elevation_max', fields)
         self.assertIn('ski_rating', fields)
         self.assertIn('rock_free_rating', fields)
@@ -20,32 +25,37 @@ def test_get_load_only_fields_routes(self):
         self.assertNotIn('title', fields)
 
     def test_get_load_only_fields_locales_routes(self):
-        fields = route_documents_config.get_load_only_fields_locales()
+        fields = self._field_names(
+            route_documents_config.get_load_only_fields_locales())
         self.assertIn('title', fields)
         self.assertIn('title_prefix', fields)
         self.assertIn('summary', fields)
         self.assertNotIn('description', fields)
         self.assertNotIn('gear', fields)
 
     def test_get_load_only_fields_geometry_routes(self):
-        fields = route_documents_config.get_load_only_fields_geometry()
+        fields = self._field_names(
+            route_documents_config.get_load_only_fields_geometry())
         self.assertIn('geom', fields)
         self.assertNotIn('geom_detail', fields)
 
     def test_get_load_only_fields_topo_map(self):
-        fields = topo_map_documents_config.get_load_only_fields()
+        fields = self._field_names(
+            topo_map_documents_config.get_load_only_fields())
         self.assertIn('code', fields)
         self.assertIn('editor', fields)
         self.assertNotIn('scale', fields)
         self.assertNotIn('lift_access', fields)
 
     def test_get_load_only_fields_locales_topo_map(self):
-        fields = topo_map_documents_config.get_load_only_fields_locales()
+        fields = self._field_names(
+            topo_map_documents_config.get_load_only_fields_locales())
         self.assertIn('title', fields)
         self.assertNotIn('summary', fields)
         self.assertNotIn('description', fields)
 
     def test_get_load_only_fields_geometry_topo_map(self):
-        fields = topo_map_documents_config.get_load_only_fields_geometry()
+        fields = self._field_names(
+            topo_map_documents_config.get_load_only_fields_geometry())
         self.assertNotIn('geom', fields)
         self.assertNotIn('geom_detail', fields)

c2corg_api/views/document_associations.py

@@ -302,4 +302,4 @@ def get_linked_xreports(document, lang):
 
 
 def get_first_column(rows):
-    return [r for (r, ) in rows]
+    return [r[0] for r in rows]

c2corg_api/views/document_schemas.py

@@ -30,6 +30,7 @@
 from c2corg_api.models.common.fields_topo_map import fields_topo_map
 from c2corg_api.models.common.fields_user_profile import fields_user_profile
 from c2corg_api.models.common.fields_coverage import fields_coverage
+from c2corg_api.models.document import DocumentLocale, DocumentGeometry
 from functools import lru_cache
 
 
@@ -78,22 +79,26 @@ def _collect_listing_fields(self, fields):
         return listing_fields
 
     def get_load_only_fields(self):
-        """ Return the fields for a document type that are needed to query
-        documents for the listing views.
+        """ Return SQLAlchemy class-bound attributes for document fields that
+        are needed to query documents for the listing views. These attributes
+        can be used directly with SQLAlchemy's load_only() option.
         """
-        return self.fields_document
+        return [getattr(self.clazz, f) for f in self.fields_document]
 
     def get_load_only_fields_locales(self):
-        """ Return the locales fields for a document type that are needed to
-        query documents for the listing views.
+        """ Return SQLAlchemy class-bound attributes for locale fields that
+        are needed to query documents for the listing views. These attributes
+        can be used directly with SQLAlchemy's load_only() option.
         """
-        return self.fields_locales
+        locale_clazz = self.clazz_locale or DocumentLocale
+        return [getattr(locale_clazz, f) for f in self.fields_locales]
 
     def get_load_only_fields_geometry(self):
-        """ Return the geometry fields for a document type that are needed to
-        query documents for the listing views.
+        """ Return SQLAlchemy class-bound attributes for geometry fields
+        that are needed to query documents for the listing views. These
+        attributes can be used directly with SQLAlchemy's load_only() option.
         """
-        return self.fields_geometry
+        return [getattr(DocumentGeometry, f) for f in self.fields_geometry]
 
 
 def make_schema_adaptor(adapt_schema_for_type, type_field, field_list_type):

c2corg_api/views/feed.py

@@ -162,8 +162,8 @@ def get_changes_of_personal_feed(
         user_id, token_id, token_time, limit, ignore_admin_changes_filter):
     user = DBSession.query(User). \
         filter(User.id == user_id). \
-        options(undefer('has_area_filter')). \
-        options(undefer('is_following_users')). \
+        options(undefer(User.has_area_filter)). \
+        options(undefer(User.is_following_users)). \
         first()
 
     if has_no_custom_filter(user):

c2corg_api/views/route.py

@@ -148,7 +148,7 @@ def set_recent_outings(route, lang):
         """Set last 10 outings on the given route.
         """
         recent_outing_ids = get_first_column(
-            DBSession.query(Outing.document_id).
+            DBSession.query(Outing.document_id, Outing.date_end).
             filter(Outing.redirects_to.is_(None)).
             join(
                 Association,

c2corg_api/views/waypoint.py

@@ -266,7 +266,7 @@ def set_recent_outings(waypoint, lang):
     with_query_waypoints = _get_select_children(waypoint)
 
     recent_outing_ids = get_first_column(
-        DBSession.query(Outing.document_id).
+        DBSession.query(Outing.document_id, Outing.date_end).
         filter(Outing.redirects_to.is_(None)).
         join(
             t_outing_route,

pytest.ini

@@ -2,6 +2,7 @@
 addopts = --cov=c2corg_api
 filterwarnings =
     default
+    ignore::DeprecationWarning:pkg_resources
     ignore:pkg_resources is deprecated:DeprecationWarning
     ignore:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning
-    ignore:HTTPResponse.getheaders\(\) is deprecated:DeprecationWarning
+    ignore:HTTPResponse.getheaders:DeprecationWarning:elasticsearch