Merge lp:~jamesh/storm/bug-136806 into lp:storm

[James Henstridge]

[James Henstridge (jamesh)]

ListVariable.get(to_db=True) did not correctly handle converting its items into Variable objects. This bug was masked by the test using a type with the same representation on the Python and database sides (an integer).

I've switched the test to use a use a list of enumeration variables to highlight the problem (as reported in bug 136806), and fixed the underlying problem.

[lp:~jamesh/storm/bug-136806]

285. By James Henstridge on 2008-11-26

Add a test to show that lists of enumerations are handled correctly at
the store level.

[Thomas Herve (therve)]

Great, +1.

review: Approve

[lp:~jamesh/storm/bug-136806]

286. By James Henstridge on 2009-03-04

merge from trunk, fixing conflicts

[Jamu Kakar (jkakar)]

+1!

review: Approve

=== modified file 'storm/variables.py'
--- storm/variables.py	2009-02-25 08:40:31 +0000
+++ storm/variables.py	2009-03-04 17:20:14 +0000
@@ -622,8 +622,7 @@
     def parse_get(self, value, to_db):
         if to_db:
             item_factory = self._item_factory
-            # XXX This from_db=to_db is dubious. What to do here?
-            return [item_factory(value=val, from_db=to_db) for val in value]
+            return [item_factory(value=val, from_db=False) for val in value]
         else:
             return value
 

=== modified file 'tests/store/postgres.py'
--- tests/store/postgres.py	2009-02-25 08:40:31 +0000
+++ tests/store/postgres.py	2009-03-04 17:20:14 +0000
@@ -22,7 +22,7 @@
 import gc
 
 from storm.database import create_database
-from storm.properties import Int, List
+from storm.properties import Enum, Int, List
 from storm.info import get_obj_info
 
 from tests.store.base import StoreTest, EmptyResultSetTest, Foo
@@ -34,6 +34,11 @@
     id = Int(primary=True)
     ints = List(type=Int())
 
+class LstEnum(object):
+    __storm_table__ = "lst1"
+    id = Int(primary=True)
+    ints = List(type=Enum(map={"one": 1, "two": 2, "three": 3}))
+
 class Lst2(object):
     __storm_table__ = "lst2"
     id = Int(primary=True)
@@ -119,6 +124,27 @@
         result = self.store.execute("SELECT ints FROM lst1 WHERE id=1")
         self.assertEquals(result.get_one(), ([1,2,3,4,5],))
 
+    def test_list_enum_variable(self):
+
+        lst = LstEnum()
+        lst.id = 1
+        lst.ints = ["one", "two"]
+        self.store.add(lst)
+
+        result = self.store.execute("SELECT ints FROM lst1 WHERE id=1")
+        self.assertEquals(result.get_one(), ([1,2],))
+
+        del lst
+        gc.collect()
+
+        lst = self.store.find(LstEnum, LstEnum.ints == ["one", "two"]).one()
+        self.assertTrue(lst)
+
+        lst.ints.append("three")
+
+        result = self.store.execute("SELECT ints FROM lst1 WHERE id=1")
+        self.assertEquals(result.get_one(), ([1,2,3],))
+
     def test_list_variable_nested(self):
 
         lst = Lst2()

=== modified file 'tests/variables.py'
--- tests/variables.py	2009-02-20 01:54:08 +0000
+++ tests/variables.py	2009-03-04 17:20:14 +0000
@@ -887,20 +887,26 @@
 class ListVariableTest(TestHelper):
 
     def test_get_set(self):
-        l = [1, 2]
+        # Enumeration variables are used as items so that database
+        # side and python side values can be distinguished.
+        get_map = {1: "a", 2: "b", 3: "c"}
+        set_map = {"a": 1, "b": 2, "c": 3}
+        item_factory = VariableFactory(
+            EnumVariable, get_map=get_map, set_map=set_map)
+
+        l = ["a", "b"]
         l_dump = pickle.dumps(l, -1)
+        l_vars = [item_factory(value=x) for x in l]
 
-        variable = ListVariable(IntVariable)
+        variable = ListVariable(item_factory)
 
         variable.set(l)
         self.assertEquals(variable.get(), l)
-        self.assertVariablesEqual(variable.get(to_db=True),
-                                  [IntVariable(1), IntVariable(2)])
+        self.assertVariablesEqual(variable.get(to_db=True), l_vars)
 
-        variable.set([1.1, 2.2], from_db=True)
+        variable.set([1, 2], from_db=True)
         self.assertEquals(variable.get(), l)
-        self.assertVariablesEqual(variable.get(to_db=True),
-                                  [IntVariable(1), IntVariable(2)])
+        self.assertVariablesEqual(variable.get(to_db=True), l_vars)
 
         self.assertEquals(variable.get_state(), (Undef, l_dump))
 
@@ -908,8 +914,8 @@
         variable.set_state((Undef, l_dump))
         self.assertEquals(variable.get(), l)
 
-        variable.get().append(3)
-        self.assertEquals(variable.get(), [1, 2, 3])
+        variable.get().append("c")
+        self.assertEquals(variable.get(), ["a", "b", "c"])
 
     def test_list_events(self):
         event = EventSystem(marker)