Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Parameterized queries: Add e2e tests for parameterized queries#227

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.

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

Already on GitHub?Sign in to your account

Merged
susodapop merged 7 commits intomainfrompeco-1107
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
5 changes: 1 addition & 4 deletionssrc/databricks/sql/thrift_backend.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -613,10 +613,7 @@ def _create_arrow_table(self, t_row_set, lz4_compressed, schema_bytes, descripti
num_rows,
) = convert_column_based_set_to_arrow_table(t_row_set.columns, description)
elif t_row_set.arrowBatches is not None:
(
arrow_table,
num_rows,
) = convert_arrow_based_set_to_arrow_table(
(arrow_table, num_rows,) = convert_arrow_based_set_to_arrow_table(
Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

This is just a formatting change unrelated to the bulk of the PR.

t_row_set.arrowBatches, lz4_compressed, schema_bytes
)
else:
Expand Down
1 change: 1 addition & 0 deletionssrc/databricks/sql/utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -529,6 +529,7 @@ def infer_types(params: list[DbSqlParameter]):
int: DbSqlType.INTEGER,
float: DbSqlType.FLOAT,
datetime.datetime: DbSqlType.TIMESTAMP,
datetime.date: DbSqlType.DATE,
bool: DbSqlType.BOOLEAN,
}
newParams = copy.deepcopy(params)
Expand Down
4 changes: 3 additions & 1 deletionsrc/databricks/sqlalchemy/dialect/requirements.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,11 @@ def __some_example_requirement(self):
import sqlalchemy.testing.exclusions

import logging

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

This is a formatting change unrelated to the rest of this PR.

logger = logging.getLogger(__name__)

logger.warning("requirements.py is not currently employed by Databricks dialect")


class Requirements(sqlalchemy.testing.requirements.SuiteRequirements):
pass
pass
144 changes: 144 additions & 0 deletionstests/e2e/common/parameterized_query_tests.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
import datetime
from decimal import Decimal
from typing import Dict, List, Tuple, Union

import pytz

from databricks.sql.client import Connection
from databricks.sql.utils import DbSqlParameter, DbSqlType


class PySQLParameterizedQueryTestSuiteMixin:
"""Namespace for tests of server-side parameterized queries"""

QUERY = "SELECT :p AS col"

def _get_one_result(self, query: str, parameters: Union[Dict, List[Dict]]) -> Tuple:
with self.connection() as conn:
with conn.cursor() as cursor:
cursor.execute(query, parameters=parameters)
return cursor.fetchone()

def _quantize(self, input: Union[float, int], place_value=2) -> Decimal:

return Decimal(str(input)).quantize(Decimal("0." + "0" * place_value))

def test_primitive_inferred_bool(self):

params = {"p": True}
result = self._get_one_result(self.QUERY, params)
assert result.col == True

def test_primitive_inferred_integer(self):

params = {"p": 1}
result = self._get_one_result(self.QUERY, params)
assert result.col == 1

def test_primitive_inferred_double(self):

params = {"p": 3.14}
result = self._get_one_result(self.QUERY, params)
assert self._quantize(result.col) == self._quantize(3.14)

def test_primitive_inferred_date(self):

# DATE in Databricks is mapped into a datetime.date object in Python
date_value = datetime.date(2023, 9, 6)
params = {"p": date_value}
result = self._get_one_result(self.QUERY, params)
assert result.col == date_value

def test_primitive_inferred_timestamp(self):

# TIMESTAMP in Databricks is mapped into a datetime.datetime object in Python
date_value = datetime.datetime(2023, 9, 6, 3, 14, 27, 843, tzinfo=pytz.UTC)
params = {"p": date_value}
result = self._get_one_result(self.QUERY, params)
assert result.col == date_value

def test_primitive_inferred_string(self):

params = {"p": "Hello"}
result = self._get_one_result(self.QUERY, params)
assert result.col == "Hello"

def test_dbsqlparam_inferred_bool(self):

params = [DbSqlParameter(name="p", value=True, type=None)]
result = self._get_one_result(self.QUERY, params)
assert result.col == True

def test_dbsqlparam_inferred_integer(self):

params = [DbSqlParameter(name="p", value=1, type=None)]
result = self._get_one_result(self.QUERY, params)
assert result.col == 1

def test_dbsqlparam_inferred_double(self):

params = [DbSqlParameter(name="p", value=3.14, type=None)]
result = self._get_one_result(self.QUERY, params)
assert self._quantize(result.col) == self._quantize(3.14)

def test_dbsqlparam_inferred_date(self):

# DATE in Databricks is mapped into a datetime.date object in Python
date_value = datetime.date(2023, 9, 6)
params = [DbSqlParameter(name="p", value=date_value, type=None)]
result = self._get_one_result(self.QUERY, params)
assert result.col == date_value

def test_dbsqlparam_inferred_timestamp(self):

# TIMESTAMP in Databricks is mapped into a datetime.datetime object in Python
date_value = datetime.datetime(2023, 9, 6, 3, 14, 27, 843, tzinfo=pytz.UTC)
params = [DbSqlParameter(name="p", value=date_value, type=None)]
result = self._get_one_result(self.QUERY, params)
assert result.col == date_value

def test_dbsqlparam_inferred_string(self):

params = [DbSqlParameter(name="p", value="Hello", type=None)]
result = self._get_one_result(self.QUERY, params)
assert result.col == "Hello"

def test_dbsqlparam_explicit_bool(self):

params = [DbSqlParameter(name="p", value=True, type=DbSqlType.BOOLEAN)]
result = self._get_one_result(self.QUERY, params)
assert result.col == True

def test_dbsqlparam_explicit_integer(self):

params = [DbSqlParameter(name="p", value=1, type=DbSqlType.INTEGER)]
result = self._get_one_result(self.QUERY, params)
assert result.col == 1

def test_dbsqlparam_explicit_double(self):

params = [DbSqlParameter(name="p", value=3.14, type=DbSqlType.FLOAT)]
result = self._get_one_result(self.QUERY, params)
assert self._quantize(result.col) == self._quantize(3.14)

def test_dbsqlparam_explicit_date(self):

# DATE in Databricks is mapped into a datetime.date object in Python
date_value = datetime.date(2023, 9, 6)
params = [DbSqlParameter(name="p", value=date_value, type=DbSqlType.DATE)]
result = self._get_one_result(self.QUERY, params)
assert result.col == date_value

def test_dbsqlparam_explicit_timestamp(self):

# TIMESTAMP in Databricks is mapped into a datetime.datetime object in Python
date_value = datetime.datetime(2023, 9, 6, 3, 14, 27, 843, tzinfo=pytz.UTC)
params = [DbSqlParameter(name="p", value=date_value, type=DbSqlType.TIMESTAMP)]
result = self._get_one_result(self.QUERY, params)
assert result.col == date_value

def test_dbsqlparam_explicit_string(self):

params = [DbSqlParameter(name="p", value="Hello", type=DbSqlType.STRING)]
result = self._get_one_result(self.QUERY, params)
assert result.col == "Hello"
3 changes: 2 additions & 1 deletiontests/e2e/test_driver.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
from tests.e2e.common.retry_test_mixins import Client429ResponseMixin, Client503ResponseMixin
from tests.e2e.common.staging_ingestion_tests import PySQLStagingIngestionTestSuiteMixin
from tests.e2e.common.retry_test_mixins import PySQLRetryTestsMixin
from tests.e2e.common.parameterized_query_tests import PySQLParameterizedQueryTestSuiteMixin

log = logging.getLogger(__name__)

Expand DownExpand Up@@ -142,7 +143,7 @@ def test_cloud_fetch(self):
# Exclude Retry tests because they require specific setups, and LargeQueries too slow for core
# tests
class PySQLCoreTestSuite(SmokeTestMixin, CoreTestMixin, DecimalTestsMixin, TimestampTestsMixin,
PySQLTestCase, PySQLStagingIngestionTestSuiteMixin, PySQLRetryTestsMixin):
PySQLTestCase, PySQLStagingIngestionTestSuiteMixin, PySQLRetryTestsMixin, PySQLParameterizedQueryTestSuiteMixin):
validate_row_value_type = True
validate_result = True

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp