Merge pull request #6613 from jorisvandenbossche/sql-mysql2

TST: enable MySQL tests

Author: jorisvandenbossche

ci/requirements-2.7.txt

@@ -18,4 +18,5 @@ beautifulsoup4==4.2.1
 statsmodels==0.5.0
 bigquery==2.0.17
 sqlalchemy==0.8.1
+pymysql==0.6.1
 psycopg2==2.5.2

ci/requirements-3.3.txt

@@ -16,4 +16,5 @@ scipy==0.12.0
 beautifulsoup4==4.2.1
 statsmodels==0.4.3
 sqlalchemy==0.9.1
+pymysql==0.6.1
 psycopg2==2.5.2

pandas/io/sql.py

@@ -668,7 +668,7 @@ def read_table(self, table_name, index_col=None, coerce_float=True,
                    parse_dates=None, columns=None):
 
         table = PandasSQLTable(table_name, self, index=index_col)
-        return table.read(coerce_float=parse_dates,
+        return table.read(coerce_float=coerce_float,
                           parse_dates=parse_dates, columns=columns)
 
     def drop_table(self, table_name):

pandas/io/tests/test_sql.py

@@ -495,7 +495,7 @@ def test_read_table_absent(self):
         self.assertRaises(
             ValueError, sql.read_table, "this_doesnt_exist", con=self.conn)
 
-    def test_default_type_convertion(self):
+    def test_default_type_conversion(self):
         df = sql.read_table("types_test_data", self.conn)
 
         self.assertTrue(issubclass(df.FloatCol.dtype.type, np.floating),
@@ -589,7 +589,7 @@ def setUp(self):
 
         self._load_test1_data()
 
-    def test_default_type_convertion(self):
+    def test_default_type_conversion(self):
         df = sql.read_table("types_test_data", self.conn)
 
         self.assertTrue(issubclass(df.FloatCol.dtype.type, np.floating),
@@ -755,6 +755,24 @@ def tearDown(self):
             for table in c.fetchall():
                 self.conn.execute('DROP TABLE %s' % table[0])
 
+        def test_default_type_conversion(self):
+            df = sql.read_table("types_test_data", self.conn)
+    
+            self.assertTrue(issubclass(df.FloatCol.dtype.type, np.floating),
+                            "FloatCol loaded with incorrect type")
+            self.assertTrue(issubclass(df.IntCol.dtype.type, np.integer),
+                            "IntCol loaded with incorrect type")
+            # MySQL has no real BOOL type (it's an alias for TINYINT) 
+            self.assertTrue(issubclass(df.BoolCol.dtype.type, np.integer),
+                            "BoolCol loaded with incorrect type")
+    
+            # Int column with NA values stays as float
+            self.assertTrue(issubclass(df.IntColWithNull.dtype.type, np.floating),
+                            "IntColWithNull loaded with incorrect type")
+            # Bool column with NA = int column with NA values => becomes float
+            self.assertTrue(issubclass(df.BoolColWithNull.dtype.type, np.floating), 
+                            "BoolColWithNull loaded with incorrect type")
+
 
 class TestPostgreSQLAlchemy(_TestSQLAlchemy):
     flavor = 'postgresql'