Merge pull request #139 from Szczepanov/feature/138-with-statement-pep-343

Support 'with' statement

jaydebeapi/__init__.py

@@ -451,6 +451,12 @@ class Connection(object):
     def cursor(self):
         return Cursor(self, self._converters)
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()
+
 # DB-API 2.0 Cursor Object
 class Cursor(object):
 
@@ -604,6 +610,12 @@ class Cursor(object):
     def setoutputsize(self, size, column=None):
         pass
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()
+
 def _unknownSqlTypeConverter(rs, col):
     return rs.getObject(col)
 

test/test_integration.py

@@ -207,6 +207,17 @@ class IntegrationTestBase(object):
         cursor.execute("select * from ACCOUNT")
         self.assertEqual(cursor.rowcount, -1)
 
+    def test_connection_with_statement(self):
+        with self.connect() as conn:
+            self.assertEqual(conn._closed, False)
+        self.assertEqual(conn._closed, True)
+
+    def test_cursor_with_statement(self):
+        with self.conn.cursor() as cursor:
+            cursor.execute("select 1 from ACCOUNT")
+            self.assertIsNotNone(cursor._connection)
+        self.assertIsNone(cursor._connection)
+
 class SqliteTestBase(IntegrationTestBase):
 
     def setUpSql(self):