@@ -524,12 +524,6 @@ def test_read_sql_view(self):
524
524
"SELECT * FROM iris_view" , self .conn )
525
525
self ._check_iris_loaded_frame (iris_frame )
526
526
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
-
533
527
def test_to_sql (self ):
534
528
sql .to_sql (self .test_frame1 , 'test_frame1' , self .conn , flavor = 'sqlite' )
535
529
self .assertTrue (
@@ -2239,7 +2233,7 @@ def test_write_row_by_row(self):
2239
2233
2240
2234
self .conn .commit ()
2241
2235
2242
- result = sql .read_frame ("select * from test" , con = self .conn )
2236
+ result = sql .read_sql ("select * from test" , con = self .conn )
2243
2237
result .index = frame .index
2244
2238
tm .assert_frame_equal (result , frame )
2245
2239
@@ -2254,7 +2248,7 @@ def test_execute(self):
2254
2248
sql .execute (ins , self .conn , params = tuple (row ))
2255
2249
self .conn .commit ()
2256
2250
2257
- result = sql .read_frame ("select * from test" , self .conn )
2251
+ result = sql .read_sql ("select * from test" , self .conn )
2258
2252
result .index = frame .index [:1 ]
2259
2253
tm .assert_frame_equal (result , frame [:1 ])
2260
2254
@@ -2328,7 +2322,7 @@ def test_na_roundtrip(self):
2328
2322
2329
2323
def _check_roundtrip (self , frame ):
2330
2324
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 )
2332
2326
2333
2327
# HACK! Change this once indexes are handled properly.
2334
2328
result .index = frame .index
@@ -2340,7 +2334,7 @@ def _check_roundtrip(self, frame):
2340
2334
frame2 = frame .copy ()
2341
2335
frame2 ['Idx' ] = Index (lrange (len (frame2 ))) + 10
2342
2336
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 ,
2344
2338
index_col = 'Idx' )
2345
2339
expected = frame .copy ()
2346
2340
expected .index = Index (lrange (len (frame2 ))) + 10
@@ -2402,7 +2396,7 @@ def test_onecolumn_of_integer(self):
2402
2396
# it should not fail, and gives 3 ( Issue #3628 )
2403
2397
self .assertEqual (the_sum , 3 )
2404
2398
2405
- result = sql .read_frame ("select * from mono_df" , con_x )
2399
+ result = sql .read_sql ("select * from mono_df" , con_x )
2406
2400
tm .assert_frame_equal (result , mono_df )
2407
2401
2408
2402
def test_if_exists (self ):
@@ -2542,7 +2536,7 @@ def test_write_row_by_row(self):
2542
2536
2543
2537
self .conn .commit ()
2544
2538
2545
- result = sql .read_frame ("select * from test" , con = self .conn )
2539
+ result = sql .read_sql ("select * from test" , con = self .conn )
2546
2540
result .index = frame .index
2547
2541
tm .assert_frame_equal (result , frame )
2548
2542
@@ -2577,7 +2571,7 @@ def test_execute(self):
2577
2571
sql .execute (ins , self .conn , params = tuple (row ))
2578
2572
self .conn .commit ()
2579
2573
2580
- result = sql .read_frame ("select * from test" , self .conn )
2574
+ result = sql .read_sql ("select * from test" , self .conn )
2581
2575
result .index = frame .index [:1 ]
2582
2576
tm .assert_frame_equal (result , frame [:1 ])
2583
2577
@@ -2668,7 +2662,7 @@ def _check_roundtrip(self, frame):
2668
2662
cur .execute (drop_sql )
2669
2663
sql .write_frame (frame , name = 'test_table' ,
2670
2664
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 )
2672
2666
2673
2667
# HACK! Change this once indexes are handled properly.
2674
2668
result .index = frame .index
@@ -2688,7 +2682,7 @@ def _check_roundtrip(self, frame):
2688
2682
cur .execute (drop_sql )
2689
2683
sql .write_frame (frame2 , name = 'test_table2' ,
2690
2684
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 ,
2692
2686
index_col = 'Idx' )
2693
2687
expected = frame .copy ()
2694
2688
0 commit comments