Lee-W commented on code in PR #55928: URL: https://github.com/apache/airflow/pull/55928#discussion_r2368341705
########## providers/vertica/tests/unit/vertica/hooks/test_vertica_sql.py: ########## @@ -0,0 +1,272 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from __future__ import annotations + +import json +from collections import namedtuple +from unittest.mock import MagicMock, PropertyMock, call, patch + +import pytest +from sqlalchemy.engine import Engine + +from airflow.exceptions import AirflowException +from airflow.models import Connection +from airflow.providers.vertica.hooks.vertica import VerticaHook + +DEFAULT_CONN_ID = "vertica_default" +HOST = "vertica.cloud.com" +PORT = 5433 +USER = "user" +PASSWORD = "pass" +DATABASE = "test_db" + +SerializableRow = namedtuple("SerializableRow", ["id", "value"]) + + +def get_cursor_descriptions(fields: list[str]) -> list[tuple[str]]: + """Convert field names into cursor.description tuples.""" + return [(field,) for field in fields] + + +@pytest.fixture(autouse=True) +def create_connection(create_connection_without_db): + """Create a mocked Airflow connection for Vertica.""" + create_connection_without_db( + Connection( + conn_id=DEFAULT_CONN_ID, + conn_type="vertica", + host=HOST, + login=USER, + password=PASSWORD, + schema=DATABASE, + ) + ) + + +@pytest.fixture +def vertica_hook(): + return VerticaHook(vertica_conn_id=DEFAULT_CONN_ID) + + +@pytest.fixture +def mock_get_conn(): + with patch("airflow.providers.vertica.hooks.vertica.VerticaHook.get_conn") as mock_conn: + yield mock_conn + + +@pytest.fixture +def mock_cursor(mock_get_conn): + cursor = MagicMock() + type(cursor).rowcount = PropertyMock(return_value=1) + cursor.fetchall.return_value = [("1", "row1")] + cursor.description = get_cursor_descriptions(["id", "value"]) + cursor.nextset.side_effect = [False] + mock_get_conn.return_value.cursor.return_value = cursor + return cursor + + +def test_sqlalchemy_url_property(vertica_hook): + url = vertica_hook.sqlalchemy_url.render_as_string(hide_password=False) + expected_url = f"vertica-python://{USER}:{PASSWORD}@{HOST}:{PORT}/{DATABASE}" + assert url.startswith(expected_url) + + +@pytest.mark.parametrize( + "return_last, split_statements, sql, expected_calls, cursor_results, expected_result", + [ + pytest.param( + True, + False, + "SELECT * FROM table", + ["SELECT * FROM table"], + [("1", "row1"), ("2", "row2")], + [SerializableRow("1", "row1"), SerializableRow("2", "row2")], + id="Single query, return_last=True", + ), + pytest.param( + False, + False, + "SELECT * FROM table", + ["SELECT * FROM table"], + [("1", "row1"), ("2", "row2")], + [SerializableRow("1", "row1"), SerializableRow("2", "row2")], + id="Single query, return_last=False", + ), + pytest.param( + True, + True, + "SELECT * FROM table1; SELECT * FROM table2;", + ["SELECT * FROM table1;", "SELECT * FROM table2;"], + [[("1", "row1"), ("2", "row2")], [("3", "row3"), ("4", "row4")]], + [SerializableRow("3", "row3"), SerializableRow("4", "row4")], + id="Multiple queries, split_statements=True, return_last=True", + ), + pytest.param( + True, + False, + "SELECT * FROM table1; SELECT * FROM table2;", + ["SELECT * FROM table1; SELECT * FROM table2;"], + [("1", "row1"), ("2", "row2")], + [SerializableRow("1", "row1"), SerializableRow("2", "row2")], + id="Multiple queries, split_statements=False", + ), + pytest.param( + True, + False, + "SELECT * FROM empty", + ["SELECT * FROM empty"], + [], + [], + id="Empty result", + ), + ], +) +def test_vertica_run_queries( + vertica_hook, + mock_cursor, + return_last, + split_statements, + sql, + expected_calls, + cursor_results, + expected_result, +): + if split_statements: + mock_cursor.fetchall.side_effect = cursor_results + mock_cursor.nextset.side_effect = [True] * (len(cursor_results) - 1) + [False] + else: + mock_cursor.fetchall.return_value = cursor_results + mock_cursor.nextset.side_effect = lambda: False + + result = vertica_hook.run( + sql, + handler=lambda cur: cur.fetchall(), + split_statements=split_statements, + return_last=return_last, + ) + + actual_calls = [call.args[0] for call in mock_cursor.execute.call_args_list] + assert actual_calls == expected_calls + assert [SerializableRow(*row) for row in result] == expected_result + + +def test_run_with_multiple_statements(vertica_hook, mock_cursor): + mock_cursor.fetchall.side_effect = [[(1,)], [(2,)]] + + mock_cursor.nextset.side_effect = [True, False] + + sql = "SELECT 1; SELECT 2;" + + results = vertica_hook.run(sql, handler=lambda cur: cur.fetchall(), split_statements=True) + + mock_cursor.execute.assert_has_calls( + [ + call("SELECT 1;"), + call("SELECT 2;"), + ] + ) Review Comment: same here ########## providers/vertica/tests/unit/vertica/hooks/test_vertica_sql.py: ########## @@ -0,0 +1,272 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from __future__ import annotations + +import json +from collections import namedtuple +from unittest.mock import MagicMock, PropertyMock, call, patch + +import pytest +from sqlalchemy.engine import Engine + +from airflow.exceptions import AirflowException +from airflow.models import Connection +from airflow.providers.vertica.hooks.vertica import VerticaHook + +DEFAULT_CONN_ID = "vertica_default" +HOST = "vertica.cloud.com" +PORT = 5433 +USER = "user" +PASSWORD = "pass" +DATABASE = "test_db" + +SerializableRow = namedtuple("SerializableRow", ["id", "value"]) + + +def get_cursor_descriptions(fields: list[str]) -> list[tuple[str]]: + """Convert field names into cursor.description tuples.""" + return [(field,) for field in fields] + + +@pytest.fixture(autouse=True) +def create_connection(create_connection_without_db): + """Create a mocked Airflow connection for Vertica.""" + create_connection_without_db( + Connection( + conn_id=DEFAULT_CONN_ID, + conn_type="vertica", + host=HOST, + login=USER, + password=PASSWORD, + schema=DATABASE, + ) + ) + + +@pytest.fixture +def vertica_hook(): + return VerticaHook(vertica_conn_id=DEFAULT_CONN_ID) + + +@pytest.fixture +def mock_get_conn(): + with patch("airflow.providers.vertica.hooks.vertica.VerticaHook.get_conn") as mock_conn: + yield mock_conn + + +@pytest.fixture +def mock_cursor(mock_get_conn): + cursor = MagicMock() + type(cursor).rowcount = PropertyMock(return_value=1) + cursor.fetchall.return_value = [("1", "row1")] + cursor.description = get_cursor_descriptions(["id", "value"]) + cursor.nextset.side_effect = [False] + mock_get_conn.return_value.cursor.return_value = cursor + return cursor + + +def test_sqlalchemy_url_property(vertica_hook): + url = vertica_hook.sqlalchemy_url.render_as_string(hide_password=False) + expected_url = f"vertica-python://{USER}:{PASSWORD}@{HOST}:{PORT}/{DATABASE}" + assert url.startswith(expected_url) + + +@pytest.mark.parametrize( + "return_last, split_statements, sql, expected_calls, cursor_results, expected_result", + [ + pytest.param( + True, + False, + "SELECT * FROM table", + ["SELECT * FROM table"], + [("1", "row1"), ("2", "row2")], + [SerializableRow("1", "row1"), SerializableRow("2", "row2")], + id="Single query, return_last=True", + ), + pytest.param( + False, + False, + "SELECT * FROM table", + ["SELECT * FROM table"], + [("1", "row1"), ("2", "row2")], + [SerializableRow("1", "row1"), SerializableRow("2", "row2")], + id="Single query, return_last=False", + ), + pytest.param( + True, + True, + "SELECT * FROM table1; SELECT * FROM table2;", + ["SELECT * FROM table1;", "SELECT * FROM table2;"], + [[("1", "row1"), ("2", "row2")], [("3", "row3"), ("4", "row4")]], + [SerializableRow("3", "row3"), SerializableRow("4", "row4")], + id="Multiple queries, split_statements=True, return_last=True", + ), + pytest.param( + True, + False, + "SELECT * FROM table1; SELECT * FROM table2;", + ["SELECT * FROM table1; SELECT * FROM table2;"], + [("1", "row1"), ("2", "row2")], + [SerializableRow("1", "row1"), SerializableRow("2", "row2")], + id="Multiple queries, split_statements=False", + ), + pytest.param( + True, + False, + "SELECT * FROM empty", + ["SELECT * FROM empty"], + [], + [], + id="Empty result", + ), + ], +) +def test_vertica_run_queries( + vertica_hook, + mock_cursor, + return_last, + split_statements, + sql, + expected_calls, + cursor_results, + expected_result, +): + if split_statements: + mock_cursor.fetchall.side_effect = cursor_results + mock_cursor.nextset.side_effect = [True] * (len(cursor_results) - 1) + [False] + else: + mock_cursor.fetchall.return_value = cursor_results + mock_cursor.nextset.side_effect = lambda: False + + result = vertica_hook.run( + sql, + handler=lambda cur: cur.fetchall(), + split_statements=split_statements, + return_last=return_last, + ) + + actual_calls = [call.args[0] for call in mock_cursor.execute.call_args_list] + assert actual_calls == expected_calls + assert [SerializableRow(*row) for row in result] == expected_result + + +def test_run_with_multiple_statements(vertica_hook, mock_cursor): + mock_cursor.fetchall.side_effect = [[(1,)], [(2,)]] + + mock_cursor.nextset.side_effect = [True, False] + + sql = "SELECT 1; SELECT 2;" + + results = vertica_hook.run(sql, handler=lambda cur: cur.fetchall(), split_statements=True) + + mock_cursor.execute.assert_has_calls( + [ + call("SELECT 1;"), + call("SELECT 2;"), + ] + ) + + assert results == [(2,)] + + +def test_get_uri(vertica_hook): + """ + Test that the get_uri() method returns the correct connection string. + """ + + expected_uri = "vertica-python://user:p...@vertica.cloud.com:5433/test_db" + + actual_uri = vertica_hook.get_uri() + + assert actual_uri == expected_uri Review Comment: ```suggestion assert vertica_hook.get_uri() == "vertica-python://user:p...@vertica.cloud.com:5433/test_db" ``` i think it's easier to read this way ########## providers/vertica/tests/unit/vertica/hooks/test_vertica_sql.py: ########## @@ -0,0 +1,272 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from __future__ import annotations + +import json +from collections import namedtuple +from unittest.mock import MagicMock, PropertyMock, call, patch + +import pytest +from sqlalchemy.engine import Engine + +from airflow.exceptions import AirflowException +from airflow.models import Connection +from airflow.providers.vertica.hooks.vertica import VerticaHook + +DEFAULT_CONN_ID = "vertica_default" +HOST = "vertica.cloud.com" +PORT = 5433 +USER = "user" +PASSWORD = "pass" +DATABASE = "test_db" + +SerializableRow = namedtuple("SerializableRow", ["id", "value"]) + + +def get_cursor_descriptions(fields: list[str]) -> list[tuple[str]]: + """Convert field names into cursor.description tuples.""" + return [(field,) for field in fields] + + +@pytest.fixture(autouse=True) +def create_connection(create_connection_without_db): + """Create a mocked Airflow connection for Vertica.""" + create_connection_without_db( + Connection( + conn_id=DEFAULT_CONN_ID, + conn_type="vertica", + host=HOST, + login=USER, + password=PASSWORD, + schema=DATABASE, + ) + ) + + +@pytest.fixture +def vertica_hook(): + return VerticaHook(vertica_conn_id=DEFAULT_CONN_ID) + + +@pytest.fixture +def mock_get_conn(): + with patch("airflow.providers.vertica.hooks.vertica.VerticaHook.get_conn") as mock_conn: + yield mock_conn + + +@pytest.fixture +def mock_cursor(mock_get_conn): + cursor = MagicMock() + type(cursor).rowcount = PropertyMock(return_value=1) + cursor.fetchall.return_value = [("1", "row1")] + cursor.description = get_cursor_descriptions(["id", "value"]) + cursor.nextset.side_effect = [False] + mock_get_conn.return_value.cursor.return_value = cursor + return cursor + + +def test_sqlalchemy_url_property(vertica_hook): + url = vertica_hook.sqlalchemy_url.render_as_string(hide_password=False) + expected_url = f"vertica-python://{USER}:{PASSWORD}@{HOST}:{PORT}/{DATABASE}" + assert url.startswith(expected_url) + + +@pytest.mark.parametrize( + "return_last, split_statements, sql, expected_calls, cursor_results, expected_result", + [ + pytest.param( + True, + False, + "SELECT * FROM table", + ["SELECT * FROM table"], + [("1", "row1"), ("2", "row2")], + [SerializableRow("1", "row1"), SerializableRow("2", "row2")], + id="Single query, return_last=True", + ), + pytest.param( + False, + False, + "SELECT * FROM table", + ["SELECT * FROM table"], + [("1", "row1"), ("2", "row2")], + [SerializableRow("1", "row1"), SerializableRow("2", "row2")], + id="Single query, return_last=False", + ), + pytest.param( + True, + True, + "SELECT * FROM table1; SELECT * FROM table2;", + ["SELECT * FROM table1;", "SELECT * FROM table2;"], + [[("1", "row1"), ("2", "row2")], [("3", "row3"), ("4", "row4")]], + [SerializableRow("3", "row3"), SerializableRow("4", "row4")], + id="Multiple queries, split_statements=True, return_last=True", + ), + pytest.param( + True, + False, + "SELECT * FROM table1; SELECT * FROM table2;", + ["SELECT * FROM table1; SELECT * FROM table2;"], + [("1", "row1"), ("2", "row2")], + [SerializableRow("1", "row1"), SerializableRow("2", "row2")], + id="Multiple queries, split_statements=False", + ), + pytest.param( + True, + False, + "SELECT * FROM empty", + ["SELECT * FROM empty"], + [], + [], + id="Empty result", + ), + ], +) +def test_vertica_run_queries( + vertica_hook, + mock_cursor, + return_last, + split_statements, + sql, + expected_calls, + cursor_results, + expected_result, +): + if split_statements: + mock_cursor.fetchall.side_effect = cursor_results + mock_cursor.nextset.side_effect = [True] * (len(cursor_results) - 1) + [False] + else: + mock_cursor.fetchall.return_value = cursor_results + mock_cursor.nextset.side_effect = lambda: False + + result = vertica_hook.run( + sql, + handler=lambda cur: cur.fetchall(), + split_statements=split_statements, + return_last=return_last, + ) + + actual_calls = [call.args[0] for call in mock_cursor.execute.call_args_list] Review Comment: We're now preferring syntax like ```python [mock.call(...), ...] ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@airflow.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
