dal.py: Table class: validate_and_update_or_insert method created, and minor changes in validate_and_update

gluon/dal.py

@@ -9205,7 +9205,11 @@ class Table(object):
 
         if record:
             response = self.validate_and_update(_key, **fields)
-            response.id = {'id': self(**fields).id}
+            # Now primary key must be returned
+            primary_keys = {}
+            for key in self._primarykey:
+                primary_keys[key] = getattr(record, key)
+            response.id = primary_keys
         else:
             response = self.validate_and_insert(**fields)
         return response