Skip to content

Commit 541e0e7

Browse files
DEPR: removal of deprecated pd.io.sql.read_frame/frame_query functions
1 parent 6a32f10 commit 541e0e7

File tree

3 files changed

+11
-34
lines changed

3 files changed

+11
-34
lines changed

doc/source/whatsnew/v0.18.0.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,8 @@ Removal of prior version deprecations/changes
487487
- Removal of ``expanding_corr_pairwise`` in favor of ``.expanding().corr(pairwise=True)`` (:issue:`4950`)
488488
- Removal of ``DataMatrix`` module. This was not imported into the pandas namespace in any event (:issue:`12111`)
489489
- Removal of ``cols`` keyword in favor of ``subset`` in ``DataFrame.duplicated()`` and ``DataFrame.drop_duplicates()`` (:issue:`6680`)
490-
490+
- Removal of the ``read_frame`` and ``frame_query`` (both aliases for ``pd.read_sql``)
491+
functions in the ``pd.io.sql`` namespace, deprecated since 0.14.0 (:issue:`6292`).
491492

492493
.. _whatsnew_0180.performance:
493494

pandas/io/sql.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1708,24 +1708,6 @@ def get_schema(frame, name, flavor='sqlite', keys=None, con=None, dtype=None):
17081708

17091709
# legacy names, with depreciation warnings and copied docs
17101710

1711-
@Appender(read_sql.__doc__, join='\n')
1712-
def read_frame(*args, **kwargs):
1713-
"""DEPRECATED - use read_sql
1714-
"""
1715-
warnings.warn("read_frame is deprecated, use read_sql", FutureWarning,
1716-
stacklevel=2)
1717-
return read_sql(*args, **kwargs)
1718-
1719-
1720-
@Appender(read_sql.__doc__, join='\n')
1721-
def frame_query(*args, **kwargs):
1722-
"""DEPRECATED - use read_sql
1723-
"""
1724-
warnings.warn("frame_query is deprecated, use read_sql", FutureWarning,
1725-
stacklevel=2)
1726-
return read_sql(*args, **kwargs)
1727-
1728-
17291711
def write_frame(frame, name, con, flavor='sqlite', if_exists='fail', **kwargs):
17301712
"""DEPRECATED - use to_sql
17311713

pandas/io/tests/test_sql.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -524,12 +524,6 @@ def test_read_sql_view(self):
524524
"SELECT * FROM iris_view", self.conn)
525525
self._check_iris_loaded_frame(iris_frame)
526526

527-
def test_legacy_read_frame(self):
528-
with tm.assert_produces_warning(FutureWarning):
529-
iris_frame = sql.read_frame(
530-
"SELECT * FROM iris", self.conn)
531-
self._check_iris_loaded_frame(iris_frame)
532-
533527
def test_to_sql(self):
534528
sql.to_sql(self.test_frame1, 'test_frame1', self.conn, flavor='sqlite')
535529
self.assertTrue(
@@ -2239,7 +2233,7 @@ def test_write_row_by_row(self):
22392233

22402234
self.conn.commit()
22412235

2242-
result = sql.read_frame("select * from test", con=self.conn)
2236+
result = sql.read_sql("select * from test", con=self.conn)
22432237
result.index = frame.index
22442238
tm.assert_frame_equal(result, frame)
22452239

@@ -2254,7 +2248,7 @@ def test_execute(self):
22542248
sql.execute(ins, self.conn, params=tuple(row))
22552249
self.conn.commit()
22562250

2257-
result = sql.read_frame("select * from test", self.conn)
2251+
result = sql.read_sql("select * from test", self.conn)
22582252
result.index = frame.index[:1]
22592253
tm.assert_frame_equal(result, frame[:1])
22602254

@@ -2328,7 +2322,7 @@ def test_na_roundtrip(self):
23282322

23292323
def _check_roundtrip(self, frame):
23302324
sql.write_frame(frame, name='test_table', con=self.conn)
2331-
result = sql.read_frame("select * from test_table", self.conn)
2325+
result = sql.read_sql("select * from test_table", self.conn)
23322326

23332327
# HACK! Change this once indexes are handled properly.
23342328
result.index = frame.index
@@ -2340,7 +2334,7 @@ def _check_roundtrip(self, frame):
23402334
frame2 = frame.copy()
23412335
frame2['Idx'] = Index(lrange(len(frame2))) + 10
23422336
sql.write_frame(frame2, name='test_table2', con=self.conn)
2343-
result = sql.read_frame("select * from test_table2", self.conn,
2337+
result = sql.read_sql("select * from test_table2", self.conn,
23442338
index_col='Idx')
23452339
expected = frame.copy()
23462340
expected.index = Index(lrange(len(frame2))) + 10
@@ -2402,7 +2396,7 @@ def test_onecolumn_of_integer(self):
24022396
# it should not fail, and gives 3 ( Issue #3628 )
24032397
self.assertEqual(the_sum, 3)
24042398

2405-
result = sql.read_frame("select * from mono_df", con_x)
2399+
result = sql.read_sql("select * from mono_df", con_x)
24062400
tm.assert_frame_equal(result, mono_df)
24072401

24082402
def test_if_exists(self):
@@ -2542,7 +2536,7 @@ def test_write_row_by_row(self):
25422536

25432537
self.conn.commit()
25442538

2545-
result = sql.read_frame("select * from test", con=self.conn)
2539+
result = sql.read_sql("select * from test", con=self.conn)
25462540
result.index = frame.index
25472541
tm.assert_frame_equal(result, frame)
25482542

@@ -2577,7 +2571,7 @@ def test_execute(self):
25772571
sql.execute(ins, self.conn, params=tuple(row))
25782572
self.conn.commit()
25792573

2580-
result = sql.read_frame("select * from test", self.conn)
2574+
result = sql.read_sql("select * from test", self.conn)
25812575
result.index = frame.index[:1]
25822576
tm.assert_frame_equal(result, frame[:1])
25832577

@@ -2668,7 +2662,7 @@ def _check_roundtrip(self, frame):
26682662
cur.execute(drop_sql)
26692663
sql.write_frame(frame, name='test_table',
26702664
con=self.conn, flavor='mysql')
2671-
result = sql.read_frame("select * from test_table", self.conn)
2665+
result = sql.read_sql("select * from test_table", self.conn)
26722666

26732667
# HACK! Change this once indexes are handled properly.
26742668
result.index = frame.index
@@ -2688,7 +2682,7 @@ def _check_roundtrip(self, frame):
26882682
cur.execute(drop_sql)
26892683
sql.write_frame(frame2, name='test_table2',
26902684
con=self.conn, flavor='mysql')
2691-
result = sql.read_frame("select * from test_table2", self.conn,
2685+
result = sql.read_sql("select * from test_table2", self.conn,
26922686
index_col='Idx')
26932687
expected = frame.copy()
26942688

0 commit comments

Comments
 (0)