Skip to content

[Analyze-3513] Add care site to config #3615

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
brandantck merged 6 commits into from
Nov 4, 2026
Merged

[Analyze-3513] Add care site to config #3615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
039e902
add caresite to duckdb config
brandantck Oct 27, 2026
a3abeed
add caresite to hana config
brandantck Oct 27, 2026
adfe709
add regex for $$SCHEMA$$ and $$VOCAB_SCHEMA$$ to fix cdw config valid…
brandantck Oct 27, 2026
36ed671
split regex into more understandable units
brandantck Oct 27, 2026
1e00b8e
remove deprecated regex
brandantck Oct 28, 2026
c7895e4
Merge branch 'develop' into brandantck/analyze-3513_add_care_site_to_…
brandantck Nov 4, 2026
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
16 changes: 14 additions & 2 deletions plugins/functions/cdw-svc/src/qe/config/configDefinition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
import { ruleValidator as rulesLib } from "@alp/alp-config-utils";
import { getTablePlaceholdersFromExpression } from "../utils/queryutils";
export const allowedPlaceholderRegex =
/^((((?!(_SYS|SYS|SYSTEM|HANA_XS_BASE))(\w+)|(_SYS_BIC))|("((?!(_SYS|SYS|SYSTEM|HANA_XS_BASE))([^\]]+)|(_SYS_BIC))"))\."([^"]*)")|^("([^"]*)")$/i;

// A schema must not be a HANA system schema, except _SYS_BIC.
const NOT_SYSTEM_SCHEMA = "(?!(_SYS|SYS|SYSTEM|HANA_XS_BASE))";
const UNQUOTED_SCHEMA = `(${NOT_SYSTEM_SCHEMA}\\w+|_SYS_BIC)`;
const QUOTED_SCHEMA = `"(${NOT_SYSTEM_SCHEMA}[^\\]]+|_SYS_BIC)"`;
// Resolved at query time to the dataset's own schemas.
const SCHEMA_PLACEHOLDER = "\\$\\$(SCHEMA|VOCAB_SCHEMA)\\$\\$";
const QUOTED_TABLE = '"[^"]*"';

// Accepts schema."table" or "table".
export const allowedPlaceholderRegex = new RegExp(
`^((${UNQUOTED_SCHEMA}|${QUOTED_SCHEMA}|${SCHEMA_PLACEHOLDER})\\.${QUOTED_TABLE}|${QUOTED_TABLE})$`,
"i"
);

export function getDefinition(tableMapping: any) {
// Ensure cohort definition placeholders are always defined
Expand Down
13 changes: 0 additions & 13 deletions plugins/functions/cdw-svc/src/utils/trexConnection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Logger } from "@alp/alp-base-utils";
import { translateHanaToDuckdb } from "../../../_shared/alp-base-utils/src/helpers/hanaTranslation";
import { DUCKDB_FILE_SCHEMA_NAME } from "../qe/settings/Defaults";
const logger = Logger.CreateLogger("cdw-svc: trexConnection");
const readyDestinations = new Set<string>();
const destinationLocks = new Map<string, Promise<void>>();
Expand All @@ -16,18 +15,6 @@ const parseSql = (
// $$$$SCHEMA$$$$ is the replacement, but will appear in the string as $$SCHEMA$$
temp = temp.replace(/\$\$SCHEMA_DIRECT_CONN\$\$./g, "$$$$SCHEMA$$$$.");

// This specific translation is required because the create-cachedb-flow plugin creates the duckdb file which as a different database and schema name as the file that is created by trex
if (schemaName !== DUCKDB_FILE_SCHEMA_NAME) {
temp = temp.replace(
/SELECT COUNT\(\*\) AS tableCount from tables where schema_name=(\%s|\?) and table_name=(\%s|\?)/gi,
`select count(*) as "tableCount" from pg_tables where schemaname=%s and tablename=%s`
);
temp = temp.replace(
/select count\(\*\) as \"TABLECOUNT\" from pg_tables where schemaname=(\%s|\?|\$[0-9]) and tablename=(\%s|\?|\$[0-9])/gi,
`select count(*) AS tableCount from information_schema.tables where table_schema=%s and table_name=%s`
);
}

return translateHanaToDuckdb(
temp,
schemaName,
Expand Down
Loading
Loading