Merge pull request #18 from danpoland/improve-expandables

Improve expandables
danpoland · Feb 1, 2018 · a4ecf2a · a4ecf2a
2 parents cfee611 + 552c82c
commit a4ecf2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pyramid_restful/expandables.py b/pyramid_restful/expandables.py
@@ -100,7 +100,7 @@ def get_query(self):
                     if name in available_expands:
                         field = self.expandable_fields[name]
 
-                        innerjoin = fild.get('join')
+                        innerjoin = field.get('join')
                         outerjoin = field.get('outerjoin')
 
                         if innerjoin:

diff --git a/tests/test_expandables.py b/tests/test_expandables.py
@@ -35,7 +35,7 @@ def get_query(self):
 class ExpandableAccountView(ExpandableViewMixin, AccountView):
     schema_class = AccountSchema
     expandable_fields = {'owner': {
-        'column': 'owner_id'
+        'join': 'owner_id'
     }}
 
 
@@ -82,8 +82,7 @@ def test_expandable_view_mixin_outer_join(self):
         request.params = {'expand': 'owner'}
         view = ExpandableAccountView()
         view.expandable_fields = {'owner': {
-            'column': 'owner_id',
-            'outerjoin': True
+            'outerjoin': 'owner_id',
         }}
         view.request = request
         query = view.get_query()
@@ -94,7 +93,7 @@ def test_expandable_view_mixin_options(self):
         request.params = {'expand': 'owner'}
         view = ExpandableAccountView()
         view.expandable_fields = {'owner': {
-            'column': 'owner_id',
+            'join': 'owner_id',
             'options': {'preselect': True}
         }}
         view.request = request