Merge branch 'BUG20834643' into develop

Author: peeyushgupta

lib/mysql/connector/cursor.py

@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -1215,7 +1215,7 @@ def _row_to_python(self, rowdata, desc=None):
         if hasattr(self._connection, 'converter'):
             row = self._connection.converter.row_to_python(rowdata, desc)
         else:
-            rowdata = row
+            row = rowdata
 
         if row:
             # pylint: disable=W0201
@@ -1243,16 +1243,15 @@ def fetchall(self):
         if self._nextrow[0]:
             rows.insert(0, self._nextrow[0])
 
-        if hasattr(self._connection, 'converter'):
-            row_to_python = self._connection.converter.row_to_python
-            rows = [row_to_python(row, self.description) for row in rows]
+        res = [self._row_to_python(row, self.description)
+               for row in rows]
 
         self._handle_eof(eof)
         rowcount = len(rows)
         if rowcount >= 0 and self._rowcount == -1:
             self._rowcount = 0
         self._rowcount += rowcount
-        return rows
+        return res
 
 
 class MySQLCursorBufferedDict(MySQLCursorDict, MySQLCursorBuffered):

tests/test_bugs.py

@@ -3504,3 +3504,77 @@ def test_set(self):
         for row in cur:
             self.assertEqual(row, dict(zip(('id', 'name', 'dept'), data[i])))
             i += 1
+
+
+class BugOra20834643(tests.MySQLConnectorTests):
+    """BUG#20834643: ATTRIBUTE ERROR NOTICED WHILE TRYING TO PROMOTE SERVERS
+    """
+    def setUp(self):
+        config = tests.get_mysql_config()
+        cnx = connection.MySQLConnection(**config)
+        cur = cnx.cursor()
+
+        self.tbl = 'Bug20834643'
+        cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl))
+
+        create = ("CREATE TABLE {0} (id INT, name VARCHAR(5), dept VARCHAR(5)) "
+                  "DEFAULT CHARSET latin1".format(self.tbl))
+        cur.execute(create)
+        cur.close()
+        cnx.close()
+
+    def tearDown(self):
+        config = tests.get_mysql_config()
+        cnx = connection.MySQLConnection(**config)
+        cur = cnx.cursor()
+        cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl))
+        cur.close()
+        cnx.close()
+
+    @foreach_cnx()
+    def test_set(self):
+        cur = self.cnx.cursor()
+        sql = "INSERT INTO {0} VALUES(%s, %s, %s)".format(self.tbl)
+
+        data = [
+            (1, 'abc', 'cs'),
+            (2, 'def', 'is'),
+            (3, 'ghi', 'cs'),
+            (4, 'jkl', 'it'),
+        ]
+        cur.executemany(sql, data)
+        cur.close()
+
+        cur = self.cnx.cursor(named_tuple=True)
+        cur.execute("SELECT * FROM {0}".format(self.tbl))
+
+        res = cur.fetchone()
+        self.assertEqual(data[0], (res.id, res.name, res.dept))
+        res = cur.fetchall()
+        exp = []
+        for row in res:
+            exp.append((row.id, row.name, row.dept))
+        self.assertEqual(exp, data[1:])
+        cur.close()
+
+        cur = self.cnx.cursor(named_tuple=True, buffered=True)
+        cur.execute("SELECT * FROM {0}".format(self.tbl))
+        res = cur.fetchone()
+        self.assertEqual(data[0], (res.id, res.name, res.dept))
+        res = cur.fetchall()
+        exp = []
+        for row in res:
+            exp.append((row.id, row.name, row.dept))
+        self.assertEqual(exp, data[1:])
+        cur.close()
+
+        cur = self.cnx.cursor(named_tuple=True, buffered=False)
+        cur.execute("SELECT * FROM {0}".format(self.tbl))
+        res = cur.fetchone()
+        self.assertEqual(data[0], (res.id, res.name, res.dept))
+        res = cur.fetchall()
+        exp = []
+        for row in res:
+            exp.append((row.id, row.name, row.dept))
+        self.assertEqual(exp, data[1:])
+        cur.close()