Exceptions raised by the columns iterator propagated.

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/test_copy.py b/tests/test_copy.py
index 87a999f..19fabe1 100644
--- a/tests/test_copy.py
+++ b/tests/test_copy.py
@@ -71,6 +71,20 @@ class CopyTests(unittest.TestCase):
         curs.execute("select * from tcopy order by id")
         self.assertEqual([(i, None) for i in range(10)], curs.fetchall())
 
+    def test_copy_from_cols_err(self):
+        curs = self.conn.cursor()
+        f = StringIO()
+        for i in xrange(10):
+            f.write("%s\n" % (i,))
+
+        f.seek(0)
+        def cols():
+            raise ZeroDivisionError()
+            yield 'id'
+
+        self.assertRaises(ZeroDivisionError,
+            curs.copy_from, MinimalRead(f), "tcopy", columns=cols())
+
     def test_copy_to(self):
         curs = self.conn.cursor()
         try: