refs pandas-dev#21199. Fix code for SQLiteTable and unit-tests.

Author: schettino72

pandas/io/sql.py

@@ -574,7 +574,7 @@ def create(self):
         else:
             self._execute_create()
 
-    def _exec_insert(self, conn, keys, data_iter):
+    def _execute_insert(self, conn, keys, data_iter):
         """Execute SQL statement inserting data
 
         Parameters
@@ -585,7 +585,7 @@ def _exec_insert(self, conn, keys, data_iter):
         data = [{k: v for k, v in zip(keys, row)} for row in data_iter]
         conn.execute(self.table.insert(), data)
 
-    def _exec_insert_multi(self, conn, keys, data_iter):
+    def _execute_insert_multi(self, conn, keys, data_iter):
         """Alternative to _exec_insert for DBs that support multivalue INSERT.
 
         Note: multi-value insert is usually faster for a few columns
@@ -594,7 +594,7 @@ def _exec_insert_multi(self, conn, keys, data_iter):
         data = [{k: v for k, v in zip(keys, row)} for row in data_iter]
         conn.execute(self.table.insert(data))
 
-    def _exec_insert_copy(self, conn, keys, data_iter):
+    def _execute_insert_copy(self, conn, keys, data_iter):
         """Alternative to _exec_insert for DBs that support COPY FROM
         """
         # gets a DBAPI connection that can provide a cursor
@@ -615,7 +615,6 @@ def _exec_insert_copy(self, conn, keys, data_iter):
                 table_name, columns)
             cur.copy_expert(sql=sql, file=s_buf)
 
-
     def insert_data(self):
         if self.index is not None:
             temp = self.frame.copy()
@@ -652,16 +651,15 @@ def insert_data(self):
 
         return column_names, data_list
 
-
     def insert(self, chunksize=None, method=None):
 
         # set insert method
         if method in (None, 'default'):
-            exec_insert = self._exec_insert
+            exec_insert = self._execute_insert
         elif method == 'multi':
-            exec_insert = self._exec_insert_multi
+            exec_insert = self._execute_insert_multi
         elif method == 'copy':
-            exec_insert = self._exec_insert_copy
+            exec_insert = self._execute_insert_copy
         else:
             # TODO: support callables?
             raise ValueError('Invalid parameter `method`: {}'.format(method))
@@ -690,8 +688,6 @@ def insert(self, chunksize=None, method=None):
                 chunk_iter = zip(*[arr[start_i:end_i] for arr in data_list])
                 exec_insert(conn, keys, chunk_iter)
 
-
-
     def _query_iterator(self, result, chunksize, columns, coerce_float=True,
                         parse_dates=None):
         """Return generator through chunked result set."""
@@ -1487,7 +1483,8 @@ def _fetchall_as_list(self, cur):
         return result
 
     def to_sql(self, frame, name, if_exists='fail', index=True,
-               index_label=None, schema=None, chunksize=None, dtype=None):
+               index_label=None, schema=None, chunksize=None, dtype=None,
+               method=None):
         """
         Write records stored in a DataFrame to a SQL database.
 
@@ -1531,7 +1528,7 @@ def to_sql(self, frame, name, if_exists='fail', index=True,
                             if_exists=if_exists, index_label=index_label,
                             dtype=dtype)
         table.create()
-        table.insert(chunksize)
+        table.insert(chunksize, method)
 
     def has_table(self, name, schema=None):
         # TODO(wesm): unused?

pandas/tests/io/test_sql.py

@@ -372,12 +372,16 @@ def _read_sql_iris_named_parameter(self):
         iris_frame = self.pandasSQL.read_query(query, params=params)
         self._check_iris_loaded_frame(iris_frame)
 
-    def _to_sql(self):
+    def _to_sql(self, method=None):
         self.drop_table('test_frame1')
 
-        self.pandasSQL.to_sql(self.test_frame1, 'test_frame1')
+        self.pandasSQL.to_sql(self.test_frame1, 'test_frame1', method=method)
         assert self.pandasSQL.has_table('test_frame1')
 
+        num_entries = len(self.test_frame1)
+        num_rows = self._count_rows('test_frame1')
+        assert num_rows == num_entries
+
         # Nuke table
         self.drop_table('test_frame1')
 
@@ -1180,7 +1184,7 @@ def setup_connect(self):
             pytest.skip(
                 "Can't connect to {0} server".format(self.flavor))
 
-    def test_aread_sql(self):
+    def test_read_sql(self):
         self._read_sql_iris()
 
     def test_read_sql_parameter(self):
@@ -1204,6 +1208,9 @@ def test_to_sql_replace(self):
     def test_to_sql_append(self):
         self._to_sql_append()
 
+    def test_to_sql_method_multi(self):
+        self._to_sql(method='multi')
+
     def test_create_table(self):
         temp_conn = self.connect()
         temp_frame = DataFrame(
@@ -1665,29 +1672,6 @@ class Temporary(Base):
 
         tm.assert_frame_equal(df, expected)
 
-    def test_insert_multivalues(self):
-        # issues addressed
-        # https://github.com/pandas-dev/pandas/issues/14315
-        # https://github.com/pandas-dev/pandas/issues/8953
-
-        db = sql.SQLDatabase(self.conn)
-        df = DataFrame({'A': [1, 0, 0], 'B': [1.1, 0.2, 4.3]})
-        table = sql.SQLTable("test_table", db, frame=df)
-        data = [
-            {'A': 1, 'B': 0.46},
-            {'A': 0, 'B': -2.06}
-        ]
-        statement = table.insert_statement(data, conn=self.conn)[0]
-
-        if self.supports_multivalues_insert:
-            assert statement.parameters == data, (
-                'insert statement should be multivalues'
-            )
-        else:
-            assert statement.parameters is None, (
-                'insert statement should not be multivalues'
-            )
-
 
 class _TestSQLAlchemyConn(_EngineToConnMixin, _TestSQLAlchemy):