Changeset 3437

Timestamp:

08/10/07 10:55:12 (1 year ago)

Author:

pobrien

Message:

Improved the way we resolve entity references from one database to another.

Files:

• trunk/Schevo/schevo/transaction.py (modified) (2 diffs)

trunk/Schevo/schevo/transaction.py

@@ -186 +186 @@
-
-
+def _resolve(db, value, error_msg):
+    """Support function for Create transactions to resolve entity
+    references originating in a different database."""
+    if isinstance(value, base.Entity) and value._db is not db:
+        entity = value
+        if entity._default_key is not None:
+            extent_name = entity.sys.extent.name
+            if hasattr(db, extent_name):
+                extent = getattr(db, extent_name)
+                criteria = dict(
+                    [(name, _resolve(db, getattr(entity, name), error_msg))
+                     for name in entity._default_key])
+                value = extent.findone(**criteria)
+                if value is not None:
+                    return value
+        raise DatabaseMismatch(error_msg)
+    else:
+        return value
+
+
-_Create_Standard = 0
-_Create_If_Necessary = 1
@@ -239 +259 @@
-        msg = '"%s" field of "%s" cannot be resolved to the current database'
-        for field_name, field in field_map.iteritems():
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        # Before execute callback.
-        self._before_execute(db)