Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduced mocking in test suite, fixed minor bug #301

Merged
merged 1 commit into from
Sep 26, 2024
Merged

Reduced mocking in test suite, fixed minor bug #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion locopy/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def to_dataframe(self, df_type="pandas", size=None):
return None

if df_type == "pandas":
return pandas.DataFrame(fetched, columns=columns)
return pandas.DataFrame(fetched, columns=columns or None)
elif df_type == "polars":
return polars.DataFrame(fetched, schema=columns, orient="row")

Expand Down
38 changes: 25 additions & 13 deletions tests/test_database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
import sqlite3
from unittest import mock

import pandas as pd
import pg8000
import polars as pl
import polars.testing as pltest
import psycopg2
import pytest
import snowflake.connector
Expand Down Expand Up @@ -220,37 +223,47 @@ def test_execute_sql_exception(credentials, dbapi):


@pytest.mark.parametrize("dbapi", DBAPIS)
@mock.patch("pandas.DataFrame")
def test_to_dataframe_all(mock_pandas, credentials, dbapi):
def test_to_dataframe_all_pandas(credentials, dbapi):
with mock.patch(dbapi.__name__ + ".connect") as mock_connect:
mock_connect.return_value.cursor.return_value.fetchall.return_value = [
(1, 2),
(2, 3),
(3,),
]
expected_df = pd.DataFrame(
[
(1, 2),
(2, 3),
(3,),
]
)
with Database(dbapi=dbapi, **credentials) as test:
test.execute("SELECT 'hello world' AS fld")
df = test.to_dataframe()

df = test.to_dataframe(df_type="pandas")
pd.testing.assert_frame_equal(df, expected_df)
assert mock_connect.return_value.cursor.return_value.fetchall.called
mock_pandas.assert_called_with(test.cursor.fetchall(), columns=[])


@pytest.mark.parametrize("dbapi", DBAPIS)
@mock.patch("pandas.DataFrame")
def test_to_dataframe_custom_size(mock_pandas, credentials, dbapi):
def test_to_dataframe_custom_size(credentials, dbapi):
with mock.patch(dbapi.__name__ + ".connect") as mock_connect:
mock_connect.return_value.cursor.return_value.fetchmany.return_value = [
(1, 2),
(2, 3),
(3,),
]
expected_df = pd.DataFrame(
[
(1, 2),
(2, 3),
(3,),
]
)
with Database(dbapi=dbapi, **credentials) as test:
test.execute("SELECT 'hello world' AS fld")
df = test.to_dataframe(size=5)

pd.testing.assert_frame_equal(df, expected_df)
mock_connect.return_value.cursor.return_value.fetchmany.assert_called_with(5)
mock_pandas.assert_called_with(test.cursor.fetchmany(), columns=[])


@pytest.mark.parametrize("dbapi", DBAPIS)
Expand All @@ -264,22 +277,21 @@ def test_to_dataframe_none(mock_pandas, credentials, dbapi):
mock_pandas.assert_not_called()


# TODO: remove dataframe mocking
@pytest.mark.parametrize("dbapi", DBAPIS)
@mock.patch("polars.DataFrame")
def test_to_dataframe_all_polars(mock_polars, credentials, dbapi):
def test_to_dataframe_all_polars(credentials, dbapi):
with mock.patch(dbapi.__name__ + ".connect") as mock_connect:
mock_connect.return_value.cursor.return_value.fetchall.return_value = [
(1, 2),
(2, 3),
(3, 4),
]
expected_df = pl.DataFrame([[1, 2, 3], [2, 3, 4]])
with Database(dbapi=dbapi, **credentials) as test:
test.execute("SELECT 'hello world' AS fld")
df = test.to_dataframe(df_type="polars")
pltest.assert_frame_equal(df, expected_df)

assert mock_connect.return_value.cursor.return_value.fetchall.called
mock_polars.assert_called_with(test.cursor.fetchall(), schema=[], orient="row")


@pytest.mark.parametrize("dbapi", DBAPIS)
Expand Down