Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[devtools] fix understanding of boundary constraint on db automatic population stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 28 Jan 2011 15:24:19 +0100
branchstable
changeset 6916 3970185a8f8c
parent 6915 99eb71b311e4
child 6917 e080e7465ac4
[devtools] fix understanding of boundary constraint on db automatic population
devtools/fill.py file | annotate | diff | comparison | revisions 
--- a/devtools/fill.py	Fri Jan 28 15:15:14 2011 +0100
+++ b/devtools/fill.py	Fri Jan 28 15:24:19 2011 +0100
@@ -27,7 +27,7 @@
 
 from logilab.common import attrdict
 from yams.constraints import (SizeConstraint, StaticVocabularyConstraint,
-                              IntervalBoundConstraint, BoundConstraint,
+                              IntervalBoundConstraint, BoundaryConstraint,
                               Attribute, actual_value)
 from rql.utils import decompose_b26 as base_decompose_b26
 
@@ -185,10 +185,12 @@
             minvalue = maxvalue - (index * step) # i.e. randint(-index, 0)
         return choice(list(custom_range(minvalue, maxvalue, step)))
 
-    def _actual_boundary(self, entity, boundary):
+    def _actual_boundary(self, entity, attrname, boundary):
         if isinstance(boundary, Attribute):
             # ensure we've a value for this attribute
-            self.generate_attribute_value(entity, boundary.attr)
+            entity[attrname] = None # infinite loop safety belt
+            if not boundary.attr in entity:
+                self.generate_attribute_value(entity, boundary.attr)
             boundary = actual_value(boundary, entity)
         return boundary
 
@@ -196,13 +198,13 @@
         minvalue = maxvalue = None
         for cst in self.eschema.rdef(attrname).constraints:
             if isinstance(cst, IntervalBoundConstraint):
-                minvalue = self._actual_boundary(entity, cst.minvalue)
-                maxvalue = self._actual_boundary(entity, cst.maxvalue)
-            elif isinstance(cst, BoundConstraint):
+                minvalue = self._actual_boundary(entity, attrname, cst.minvalue)
+                maxvalue = self._actual_boundary(entity, attrname, cst.maxvalue)
+            elif isinstance(cst, BoundaryConstraint):
                 if cst.operator[0] == '<':
-                    maxvalue = self._actual_boundary(entity, cst.boundary)
+                    maxvalue = self._actual_boundary(entity, attrname, cst.boundary)
                 else:
-                    minvalue = self._actual_boundary(entity, cst.boundary)
+                    minvalue = self._actual_boundary(entity, attrname, cst.boundary)
         return minvalue, maxvalue
 
     def get_choice(self, entity, attrname):
cubicweb