Skip to content

Commit 151598a

Browse files
author
ci bot
committed
Merge branch 'aarthy/qa-fixes' into 'enterprise'
fix: miscellaneous qa fixes See merge request dkinternal/testgen/dataops-testgen!330
2 parents 360d473 + af22198 commit 151598a

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

testgen/commands/run_profiling_bridge.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
set_target_db_params,
2424
write_to_app_db,
2525
)
26-
from testgen.common.database.database_service import empty_cache
26+
from testgen.common.database.database_service import empty_cache, get_flavor_service
2727
from testgen.common.mixpanel_service import MixpanelService
2828
from testgen.common.models import with_database_session
2929
from testgen.common.models.connection import Connection
@@ -279,12 +279,15 @@ def run_profiling_queries(table_group_id: str, username: str | None = None, spin
279279
column_count = len(lstResult)
280280

281281
if lstResult:
282+
flavor_service = get_flavor_service(connection.sql_flavor)
283+
quote = flavor_service.quote_character
284+
282285
# Get distinct tables
283286
distinct_tables = set()
284287
for item in lstResult:
285288
schema_name = item["table_schema"]
286289
table_name = item["table_name"]
287-
distinct_tables.add(f"{schema_name}.{table_name}")
290+
distinct_tables.add(f"{quote}{schema_name}{quote}.{quote}{table_name}{quote}")
288291

289292
# Convert the set to a list
290293
distinct_tables_list = list(distinct_tables)
@@ -326,16 +329,11 @@ def run_profiling_queries(table_group_id: str, username: str | None = None, spin
326329
clsProfiling.parm_do_sample = "N"
327330

328331
if clsProfiling.profile_use_sampling == "Y":
329-
if dctSampleTables[clsProfiling.data_schema + "." + clsProfiling.data_table][0] > -1:
330-
clsProfiling.parm_sample_size = dctSampleTables[
331-
clsProfiling.data_schema + "." + clsProfiling.data_table
332-
][0]
333-
clsProfiling.sample_ratio = dctSampleTables[
334-
clsProfiling.data_schema + "." + clsProfiling.data_table
335-
][1]
336-
clsProfiling.sample_percent_calc = dctSampleTables[
337-
clsProfiling.data_schema + "." + clsProfiling.data_table
338-
][2]
332+
table_identifier = f"{quote}{clsProfiling.data_schema}{quote}.{quote}{clsProfiling.data_table}{quote}"
333+
if dctSampleTables[table_identifier][0] > -1:
334+
clsProfiling.parm_sample_size = dctSampleTables[table_identifier][0]
335+
clsProfiling.sample_ratio = dctSampleTables[table_identifier][1]
336+
clsProfiling.sample_percent_calc = dctSampleTables[table_identifier][2]
339337
clsProfiling.parm_do_sample = clsProfiling.profile_use_sampling
340338
else:
341339
clsProfiling.parm_sample_size = 0

testgen/ui/components/frontend/js/components/connection_form.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,6 +1052,8 @@ const BigqueryForm = (
10521052
const projectId = van.state("");
10531053
const serviceAccountKeyFileRaw = van.state(cachedFile);
10541054

1055+
const validityPerField = {};
1056+
10551057
van.derive(() => {
10561058
projectId.val = serviceAccountKey.val?.project_id ?? '';
10571059
isValid.val = !!projectId.val;

testgen/ui/queries/source_data_queries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def generate_lookup_query(test_id: str, detail_exp: str, column_names: list[str]
3232
SELECT
3333
'{column}' AS column_name,
3434
MAX({quote}{column}{quote}) AS max_date_available
35-
FROM {{QUOTE}}{{TARGET_SCHEMA}}{{QUOTE}}.{{QUOTE}}{{TABLE_NAME}}{{QUOTE}}
35+
FROM {quote}{{TARGET_SCHEMA}}{quote}.{quote}{{TABLE_NAME}}{quote}
3636
"""
3737
for column in columns
3838
]

testgen/ui/views/connections.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,12 @@ class ConnectionFlavor:
465465
flavor="mssql",
466466
icon=get_asset_data_url("flavors/azure_synapse_table.svg"),
467467
),
468+
ConnectionFlavor(
469+
label="Databricks",
470+
value="databricks",
471+
flavor="databricks",
472+
icon=get_asset_data_url("flavors/databricks.svg"),
473+
),
468474
ConnectionFlavor(
469475
label="Google BigQuery",
470476
value="bigquery",
@@ -489,10 +495,4 @@ class ConnectionFlavor:
489495
flavor="snowflake",
490496
icon=get_asset_data_url("flavors/snowflake.svg"),
491497
),
492-
ConnectionFlavor(
493-
label="Databricks",
494-
value="databricks",
495-
flavor="databricks",
496-
icon=get_asset_data_url("flavors/databricks.svg"),
497-
),
498498
]

0 commit comments

Comments
 (0)