mirror of
https://github.com/hanzo-ds/connect.git
synced 2026-10-30 20:31:24 +00:00
Arpit JainandGitHub
b773483423
QueryResult.first_item and QueryResult.first_row indexed element [0] without checking the row count, so they raised IndexError when a query returned no rows. Both properties now short-circuit on an empty result and return None in row-oriented and column-oriented mode. Closes #824 Signed-off-by: Arpit Jain <[email protected]>
131 lines
4.4 KiB
Python
131 lines
4.4 KiB
Python
from ipaddress import IPv4Address
|
|
from uuid import UUID
|
|
|
|
from clickhouse_connect.datatypes import registry
|
|
from clickhouse_connect.driver.insert import InsertContext
|
|
from clickhouse_connect.driver.query import QueryContext, QueryResult
|
|
from clickhouse_connect.driver.transform import NativeTransform
|
|
from tests.helpers import bytes_source
|
|
from tests.unit_tests.test_driver.binary import NESTED_BINARY
|
|
|
|
UINT16_NULLS = """
|
|
0104 0969 6e74 5f76 616c 7565 104e 756c
|
|
6c61 626c 6528 5549 6e74 3136 2901 0001
|
|
0000 0014 0000 0028 00
|
|
"""
|
|
|
|
LOW_CARDINALITY = """
|
|
0102 026c 6316 4c6f 7743 6172 6469 6e61
|
|
6c69 7479 2853 7472 696e 6729 0100 0000
|
|
0000 0000 0006 0000 0000 0000 0300 0000
|
|
0000 0000 0004 4344 4d41 0347 534d 0200
|
|
0000 0000 0000 0102 0101 026c 6316 4c6f
|
|
7743 6172 6469 6e61 6c69 7479 2853 7472
|
|
696e 6729 0100 0000 0000 0000 0006 0000
|
|
0000 0000 0200 0000 0000 0000 0004 554d
|
|
5453 0100 0000 0000 0000 01
|
|
"""
|
|
|
|
LOW_CARD_ARRAY = """
|
|
0102 066c 6162 656c 731d 4172 7261 7928
|
|
4c6f 7743 6172 6469 6e61 6c69 7479 2853
|
|
7472 696e 6729 2901 0000 0000 0000 0000
|
|
0000 0000 0000 0000 0000 0000 0000 00
|
|
"""
|
|
|
|
SIMPLE_MAP = """
|
|
0101 066e 6e5f 6d61 7013 4d61 7028 5374
|
|
7269 6e67 2c20 5374 7269 6e67 2902 0000
|
|
0000 0000 0004 6b65 7931 046b 6579 3206
|
|
7661 6c75 6531 0676 616c 7565 32
|
|
"""
|
|
|
|
LOW_CARD_MAP = """
|
|
0102 086d 6170 5f6e 756c 6c2b 4d61 7028
|
|
4c6f 7743 6172 6469 6e61 6c69 7479 2853
|
|
7472 696e 6729 2c20 4e75 6c6c 6162 6c65
|
|
2855 5549 4429 2901 0000 0000 0000 0002
|
|
0000 0000 0000 0004 0000 0000 0000 0000
|
|
0600 0000 0000 0003 0000 0000 0000 0000
|
|
0469 676f 7206 6765 6f72 6765 0400 0000
|
|
0000 0000 0102 0102 0100 0000 0000 0000
|
|
0000 0000 0000 0000 0000 0000 235f 7dc5
|
|
799f 431d a9e1 93ca ccff c652 235f 7dc5
|
|
799f 437f a9e1 93ca ccff 0052 235f 7dc5
|
|
799f 431d a9e1 93ca ccff c652
|
|
"""
|
|
|
|
|
|
parse_response = NativeTransform().parse_response
|
|
|
|
|
|
def check_result(result, expected, row_num=0, col_num=0):
|
|
result_set = result.result_set
|
|
row = result_set[row_num]
|
|
value = row[col_num]
|
|
assert value == expected
|
|
|
|
|
|
def test_uint16_nulls():
|
|
result = parse_response(bytes_source(UINT16_NULLS))
|
|
assert result.result_set == [(None,), (20,), (None,), (40,)]
|
|
|
|
|
|
def test_low_cardinality():
|
|
result = parse_response(bytes_source(LOW_CARDINALITY))
|
|
assert result.result_set == [("CDMA",), ("GSM",), ("UMTS",)]
|
|
|
|
|
|
def test_low_card_array():
|
|
result = parse_response(bytes_source(LOW_CARD_ARRAY))
|
|
assert result.first_row == ([],), ([],)
|
|
|
|
|
|
def test_map():
|
|
result = parse_response(bytes_source(SIMPLE_MAP))
|
|
check_result(result, {"key1": "value1", "key2": "value2"})
|
|
result = parse_response(bytes_source(LOW_CARD_MAP))
|
|
check_result(result, {"george": UUID("1d439f79-c57d-5f23-52c6-ffccca93e1a9"), "igor": None})
|
|
|
|
|
|
def test_ip():
|
|
ips = ["192.168.5.3", "202.44.8.25", "0.0.2.2"]
|
|
ipv4_type = registry.get_from_name("IPv4")
|
|
dest = bytearray()
|
|
ipv4_type.write_column(ips, dest, InsertContext("", [], []))
|
|
python = ipv4_type.read_column_data(bytes_source(bytes(dest)), 3, QueryContext(), None)
|
|
assert tuple(python) == tuple(IPv4Address(ip) for ip in ips)
|
|
|
|
|
|
def test_point():
|
|
points = ((3.22, 3.22), (5.22, 5.22), (4.22, 4.22))
|
|
point_type = registry.get_from_name("Point")
|
|
dest = bytearray()
|
|
point_type.write_column(points, dest, InsertContext("", [], []))
|
|
python = point_type.read_column_data(bytes_source(bytes(dest)), 3, QueryContext(), [None, None])
|
|
assert tuple(python) == tuple(point for point in points)
|
|
|
|
|
|
def test_nested():
|
|
result = parse_response(bytes_source(NESTED_BINARY))
|
|
check_result(result, [{"str1": "one", "int32": 5}, {"str1": "two", "int32": 55}], 2, 0)
|
|
|
|
|
|
def test_first_item_first_row_empty_result():
|
|
# An empty result set should return None rather than raising IndexError (#824).
|
|
columns = ("id", "name")
|
|
row_oriented = QueryResult([], column_names=columns, column_oriented=False)
|
|
assert row_oriented.first_item is None
|
|
assert row_oriented.first_row is None
|
|
|
|
col_oriented = QueryResult([[], []], column_names=columns, column_oriented=True)
|
|
assert col_oriented.first_item is None
|
|
assert col_oriented.first_row is None
|
|
|
|
|
|
def test_first_item_first_row_non_empty_result():
|
|
columns = ("id", "name")
|
|
row_oriented = QueryResult([[1, "a"], [2, "b"]], column_names=columns, column_oriented=False)
|
|
assert row_oriented.first_item == {"id": 1, "name": "a"}
|
|
assert row_oriented.first_row == [1, "a"]
|