first implementation of csv load function. Failing

lsbardel · lsbardel · commit e8e04fbaa27b · 2012-03-29T07:57:33.000+01:00
diff --git a/runtests.py b/runtests.py
@@ -31,6 +31,9 @@ def start():
         sys.argv.pop(1)
     
     if pulsar:
+        from pulsar.apps.test import TestSuite
+        from pulsar.apps.test.plugins import bench
+        
         os.environ['stdnet_test_suite'] = 'pulsar'
         suite = TestSuite(
                 description = 'Stdnet Asynchronous test suite',
diff --git a/stdnet/orm/utils.py b/stdnet/orm/utils.py
@@ -1,6 +1,6 @@
 import json
 import sys
-from csv import DictWriter
+from csv import DictWriter, DictReader
 from inspect import isclass
 
 from stdnet.utils import StringIO
@@ -83,7 +83,8 @@ def serialize(self, qs):
     def write(self, stream = None):
         raise NotImplementedError()
     
-    def load(self, stream):
+    def load(self, stream, model = None):
+        '''Load a stream of data into the database.'''
         raise NotImplementedError()
     
     
@@ -108,7 +109,7 @@ def write(self, stream = None):
         stream.write(line)
         return stream
 
-    def load(self, stream):
+    def load(self, stream, model = None):
         data = json.loads(stream, **self.options)
         for model_data in data:
             model = get_model_from_hash(model_data['hash'])
@@ -152,6 +153,14 @@ def write(self, stream = None):
                 for row in data:
                     w.writerow(row)
         return stream
+    
+    def load(self, stream, model = None):
+        if not model:
+            raise ValueError('Model is required when loading from csv file')
+        r = DictReader(stream, **self.options)
+        with model.objects.transaction() as t:
+            for item_data in r:
+                t.add(model.from_base64_data(**item_data))
             
 
 register_serializer('json', JsonSerializer)
diff --git a/stdnet/test.py b/stdnet/test.py
@@ -95,7 +95,7 @@ def __call__(self, result=None):
 ################################################################################
 try:
     import pulsar    
-    from pulsar.apps.test import TestSuite, TestOptionPlugin
+    from pulsar.apps.test import TestOptionPlugin
     from pulsar.apps.test.plugins import bench
 
     
diff --git a/tests/regression/serialize/base.py b/tests/regression/serialize/base.py
@@ -30,9 +30,12 @@ def testWrite(self):
         
     def testLoad(self):
         s = self.testDump()
+        qs = self.model.objects.query().sort_by('id').all()
         data = s.write().getvalue()
         self.model.objects.flush()
-        s.load(data)
+        s.load(data, self.model)
+        qs2 = self.model.objects.query().sort_by('id').all()
+        self.assertEqual(qs,qs2)
 
 
 class DummySerializer(orm.Serializer):
