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

Edit badges #45

Merged
merged 3 commits into from
Oct 4, 2024
Merged

Edit badges #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6ce1ca
u
dbittenbender Aug 12, 2024
53f4685
u
dbittenbender Aug 22, 2024
bb7ac7d
u
dbittenbender Oct 4, 2024
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
6 changes: 4 additions & 2 deletions databuilder/databuilder/extractor/mssql_metadata_extractor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

from pyhocon import ConfigFactory, ConfigTree

from sqlalchemy import create_engine
from sqlalchemy import create_engine, text
from sqlglot import parse_one, exp

from databuilder import Scoped
Expand Down Expand Up @@ -206,7 +206,9 @@ def _get_extract_iter(self) -> Iterator[TableMetadata]:
last_row = row

if key_cols is None:
results = self.connection.execute(self.get_key_sql_statement(schema_name=last_row['schema_name'], table_name=last_row['name']))
results = self.connection.execute(text(self.get_key_sql_statement(schema_name=last_row['schema_name'], table_name=last_row['name'])))
results = [dict(row._mapping) for row in results]

LOGGER.info(f"results={results}")
if results:
key_cols = {}
Expand Down
13 changes: 10 additions & 3 deletions frontend/amundsen_application/static/js/config/config-default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,10 +420,10 @@ const configDefault: AppConfig = {
type: FilterType.INPUT_SELECT,
},
{
categoryId: 'column',
displayName: 'Column',
categoryId: 'cluster',
displayName: 'Cluster',
helpText:
'Enter one or more comma separated values with exact column names or regex wildcard patterns',
'Enter one or more comma separated values with exact cluster names or regex wildcard patterns',
type: FilterType.INPUT_SELECT,
},
{
Expand All @@ -440,6 +440,13 @@ const configDefault: AppConfig = {
'Enter one or more comma separated values with exact table names or regex wildcard patterns',
type: FilterType.INPUT_SELECT,
},
{
categoryId: 'column',
displayName: 'Column',
helpText:
'Enter one or more comma separated values with exact column names or regex wildcard patterns',
type: FilterType.INPUT_SELECT,
},
{
categoryId: 'tag',
displayName: 'Tag',
Expand Down
Loading
Loading