Don't pop the FK values

tuomur · Apr 7, 2021 · 38ee446 · 38ee446
1 parent 3a4553b
commit 38ee446
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/odata/connection.py b/odata/connection.py
@@ -131,7 +131,6 @@ def execute_get(self, url, params=None):
                 self.log.info(u'Closed GET response for {0}'.format(url))
 
     def execute_post(self, url, data, params=None):
-        self.log.info(u'DATA: {0}'.format(data))
         try:
             response = None
             headers = {

diff --git a/odata/context.py b/odata/context.py
@@ -103,7 +103,6 @@ def _insert_new(self, entity):
 
         es = entity.__odata__
         insert_data = es.data_for_insert()
-        self.log.info(u'DATA FOR INSERT: {0}'.format(data))
         saved_data = self.connection.execute_post(url, insert_data)
         es.reset()
         es.connection = self.connection

diff --git a/odata/state.py b/odata/state.py
@@ -3,15 +3,18 @@
 from __future__ import print_function
 import os
 import inspect
+import logging
 import re
 from collections import OrderedDict
 
 from odata.property import PropertyBase, NavigationProperty
+import odata
 
 
 class EntityState(object):
 
     def __init__(self, entity):
+        self.log = logging.getLogger('odata.state')
         """:type entity: EntityBase """
         self.entity = entity
         self.dirty = []
@@ -173,6 +176,7 @@ def _clean_new_entity(self, entity):
         insert_data['@odata.type'] = entity.__odata_type__
 
         es = entity.__odata__
+
         for _, prop in es.properties:
             if prop.is_computed_value:
                 continue
@@ -186,8 +190,6 @@ def _clean_new_entity(self, entity):
 
         # Deep insert from nav properties
         for prop_name, prop in es.navigation_properties:
-            if prop.foreign_key:
-                insert_data.pop(prop.foreign_key, None)
 
             value = getattr(entity, prop_name, None)
             """:type : None | odata.entity.EntityBase | list[odata.entity.EntityBase]"""
@@ -213,7 +215,7 @@ def _clean_new_entity(self, entity):
                 else:
                     if value.__odata__.id:
                         insert_data['{0}@odata.bind'.format(prop.name)] = value.__odata__.id
-                    else:
+                    elif isinstance(value, odata.entity.EntityBase):
                         insert_data[prop.name] = self._clean_new_entity(value)
 
         for _, prop in es.properties: