Skip to content

fix(ingest): quote table names in hive #2801

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

Merged
shirshanka merged 2 commits into from
Jun 30, 2021
Merged

fix(ingest): quote table names in hive #2801

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f944af
fix(ingest): handle case when view definition handler is not implemented
hsheth2 Jun 29, 2021
7ebaffa
fix(ingest): quote table names in hive
hsheth2 Jun 29, 2021
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
Next Next commit
fix(ingest): handle case when view definition handler is not implemented
  • Loading branch information
@hsheth2
hsheth2 committed Jun 29, 2021
commit 3f944af62740b0e7751d5cb1b3949d779ec9126c
20 changes: 14 additions & 6 deletions metadata-ingestion/src/datahub/ingestion/source/sql_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Type

from sqlalchemy import create_engine, inspect
from sqlalchemy.engine.reflection import Inspector
from sqlalchemy.sql import sqltypes as types

from datahub.configuration.common import AllowDenyPattern, ConfigModel
Expand Down Expand Up @@ -240,7 +241,7 @@ def get_workunits(self) -> Iterable[SqlWorkUnit]:

def loop_tables(
self,
inspector: Any,
inspector: Inspector,
schema: str,
sql_config: SQLAlchemyConfig,
) -> Iterable[SqlWorkUnit]:
Expand All @@ -255,7 +256,9 @@ def loop_tables(

columns = inspector.get_columns(table, schema)
try:
table_info: dict = inspector.get_table_comment(table, schema)
# SQLALchemy stubs are incomplete and missing this method.
# PR: https://github.com/dropbox/sqlalchemy-stubs/pull/223.
table_info: dict = inspector.get_table_comment(table, schema) # type: ignore
except NotImplementedError:
description: Optional[str] = None
properties: Dict[str, str] = {}
Expand Down Expand Up @@ -291,7 +294,7 @@ def loop_tables(

def loop_views(
self,
inspector: Any,
inspector: Inspector,
schema: str,
sql_config: SQLAlchemyConfig,
) -> Iterable[SqlWorkUnit]:
Expand All @@ -306,7 +309,9 @@ def loop_views(

columns = inspector.get_columns(view, schema)
try:
view_info: dict = inspector.get_table_comment(view, schema)
# SQLALchemy stubs are incomplete and missing this method.
# PR: https://github.com/dropbox/sqlalchemy-stubs/pull/223.
view_info: dict = inspector.get_table_comment(view, schema) # type: ignore
except NotImplementedError:
description: Optional[str] = None
properties: Dict[str, str] = {}
Expand All @@ -316,8 +321,11 @@ def loop_views(
# The "properties" field is a non-standard addition to SQLAlchemy's interface.
properties = view_info.get("properties", {})

view_definition = inspector.get_view_definition(view)
if view_definition is None:
try:
view_definition = inspector.get_view_definition(view, schema)
if view_definition is None:
view_definition = ""
except NotImplementedError:
view_definition = ""
properties["view_definition"] = view_definition
properties["is_view"] = "True"
Expand Down