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

fix: datatype tracking issue on virtual dataset #20088

Merged
merged 4 commits into from
Jun 1, 2022
Merged

fix: datatype tracking issue on virtual dataset #20088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df70299
Fix datatype tracking issue on virtual dataset
codemaster08240328 May 16, 2022
e6159de
Merge branch 'master' into fix/virtual-dataset-tracking-datatype
codemaster08240328 May 16, 2022
fa4f374
Merge branch 'master' into fix/virtual-dataset-tracking-datatype
codemaster08240328 May 31, 2022
7b22e6b
fix pytest issue on postgresql
codemaster08240328 May 31, 2022
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
9 changes: 9 additions & 0 deletions superset/db_engine_specs/postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from typing import Any, Dict, List, Optional, Pattern, Tuple, TYPE_CHECKING

from flask_babel import gettext as __
from psycopg2.extensions import binary_types, string_types
Copy link
Member

Choose a reason for hiding this comment

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

I think this import should be moved into get_datatype, as psycopg2 isn't a required dependency

Copy link
Member

Choose a reason for hiding this comment

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

Fixed by #20543

from sqlalchemy.dialects.postgresql import ARRAY, DOUBLE_PRECISION, ENUM, JSON
from sqlalchemy.dialects.postgresql.base import PGInspector
from sqlalchemy.types import String
Expand Down Expand Up @@ -287,6 +288,14 @@ def get_column_spec(
native_type, column_type_mappings=column_type_mappings
)

@classmethod
def get_datatype(cls, type_code: Any) -> Optional[str]:
types = binary_types.copy()
types.update(string_types)
if type_code in types:
return types[type_code].name
return None

@classmethod
def get_cancel_query_id(cls, cursor: Any, query: Query) -> Optional[str]:
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/integration_tests/sqla_models_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,10 @@

from .base_tests import SupersetTestCase


VIRTUAL_TABLE_INT_TYPES: Dict[str, Pattern[str]] = {
"hive": re.compile(r"^INT_TYPE$"),
"mysql": re.compile("^LONGLONG$"),
"postgresql": re.compile(r"^INT$"),
"postgresql": re.compile(r"^INTEGER$"),
"presto": re.compile(r"^INTEGER$"),
"sqlite": re.compile(r"^INT$"),
}
Expand Down