Better handle missing indicationId

Author: anthonysena

inst/sql/sql_server/getCmMetaEstimationV6.sql

@@ -2,9 +2,9 @@ SELECT ev.evidence_synthesis_description AS database_name
 	,r.analysis_id
 	,a.description
 	,c1.cohort_name AS target_name
-	,r.target_id
+	,tc.target_id
 	,c2.cohort_name AS comparator_name
-	,r.comparator_id
+	,tc.comparator_id
 	,c4.cohort_name AS indication_name
 	,tc.nesting_cohort_id AS indication_id
 	,c3.cohort_name AS outcome_name
@@ -31,12 +31,12 @@ INNER JOIN @schema.@cm_table_prefixtarget_comparator_outcome AS tco ON r.target_
 INNER JOIN @schema.@es_table_prefixcm_diagnostics_summary AS unblind ON r.analysis_id = unblind.analysis_id
 	AND r.target_comparator_id = unblind.target_comparator_id
 	AND r.outcome_id = unblind.outcome_id
-INNER JOIN @schema.@cg_table_prefixcohort_definition AS c1 ON c1.cohort_definition_id = r.target_id
-INNER JOIN @schema.@cg_table_prefixcohort_definition AS c2 ON c2.cohort_definition_id = r.comparator_id
+INNER JOIN @schema.@cg_table_prefixcohort_definition AS c1 ON c1.cohort_definition_id = tc.target_id
+INNER JOIN @schema.@cg_table_prefixcohort_definition AS c2 ON c2.cohort_definition_id = tc.comparator_id
 INNER JOIN @schema.@cg_table_prefixcohort_definition AS c3 ON c3.cohort_definition_id = r.outcome_id
 LEFT JOIN @schema.@cg_table_prefixcohort_definition AS c4 ON c4.cohort_definition_id = tc.nesting_cohort_id
 INNER JOIN @schema.@cm_table_prefixanalysis AS a ON a.analysis_id = r.analysis_id
 INNER JOIN @schema.@es_table_prefixanalysis AS ev ON ev.evidence_synthesis_analysis_id = r.evidence_synthesis_analysis_id
 WHERE r.calibrated_rr != 0
 	AND tco.outcome_of_interest = 1
-	AND unblind.unblind = 1 {@include_target}?{and r.target_id IN (@target_id) } {@include_outcome}?{and r.outcome_id IN (@outcome_id) } {@include_comparator}?{and r.comparator_id IN (@comparator_id) };
+	AND unblind.unblind = 1 {@include_target}?{and tc.target_id IN (@target_id) } {@include_outcome}?{and r.outcome_id IN (@outcome_id) } {@include_comparator}?{and tc.comparator_id IN (@comparator_id) };

inst/sql/sql_server/getCmNegativeControlEstimatesV6.sql

@@ -9,4 +9,4 @@ INNER JOIN @schema.@cm_table_prefixdiagnostics_summary ds ON ds.target_comparato
 	AND ds.analysis_id = cmr.analysis_id
 	AND ds.database_id = cmr.database_id
 	AND ds.outcome_id = cmr.outcome_id
-WHERE cmtco.outcome_of_interest != 1 {@exclude_positive_controls}?{AND cmtco.true_effect_size = 1 } {@use_target}?{AND tc.target_id IN (@target_ids) } {@use_comparator}?{AND tc.comparator_id IN (@comparator_ids) } {@use_indication}?{AND tc.nesting_cohort_id IN (@indication_ids) } {@use_analysis}?{AND cmr.analysis_id IN (@analysis_ids) } {@use_database}?{AND cmr.database_id IN (@database_ids) };
+WHERE cmtco.outcome_of_interest != 1 {@exclude_positive_controls}?{AND cmtco.true_effect_size = 1 } {@use_target}?{AND tc.target_id IN (@target_ids) } {@use_comparator}?{AND tc.comparator_id IN (@comparator_ids) } {@use_indication}?{AND tc.nesting_cohort_id IN (@indication_ids) }:{and tc.nesting_cohort_id IS NULL} {@use_analysis}?{AND cmr.analysis_id IN (@analysis_ids) } {@use_database}?{AND cmr.database_id IN (@database_ids) };

inst/sql/sql_server/getCmPropensityModelV6.sql

@@ -16,6 +16,6 @@ FROM (
 JOIN @schema.@cm_table_prefixpropensity_model cmpm ON cmc.covariate_id = cmpm.covariate_id
 JOIN @schema.@cm_table_prefixtarget_comparator tc ON tc.target_comparator_id = cmpm.target_comparator_id
 WHERE tc.target_id = @target_id
-	AND tc.comparator_id = @comparator_id {@use_indication}?{AND tc.nesting_cohort_id = @indication_id}
+	AND tc.comparator_id = @comparator_id {@use_indication}?{AND tc.nesting_cohort_id = @indication_id}:{and tc.nesting_cohort_id IS NULL}
 	AND cmpm.analysis_id = @analysis_id
 	AND cmpm.database_id = '@database_id';

inst/sql/sql_server/getCmTableV6.sql

@@ -17,4 +17,4 @@ INNER JOIN @schema.@cg_table_prefixcohort_definition AS c3 ON c3.cohort_definiti
 LEFT JOIN @schema.@cg_table_prefixcohort_definition AS c4 ON c4.cohort_definition_id = tc.nesting_cohort_id
 INNER JOIN @schema.@cm_table_prefixanalysis AS a ON a.analysis_id = tab.analysis_id
 INNER JOIN @schema.@database_table AS dmd ON dmd.database_id = tab.database_id
-WHERE 1 = 1 {@include_target}?{and tc.target_id IN (@target_id) } {@include_outcome}?{and tab.outcome_id IN (@outcome_id) } {@include_indication}?{and tc.nesting_cohort_id IN (@indication_id) } {@include_comparator}?{and tc.comparator_id IN (@comparator_id) } {@include_database}?{and tab.database_id IN (@database_id) } {@include_analyses}?{and tab.analysis_id IN (@analysis_id) };
+WHERE 1 = 1 {@include_target}?{and tc.target_id IN (@target_id) } {@include_outcome}?{and tab.outcome_id IN (@outcome_id) } {@include_indication}?{and tc.nesting_cohort_id IN (@indication_id) }:{and tc.nesting_cohort_id IS NULL} {@include_comparator}?{and tc.comparator_id IN (@comparator_id) } {@include_database}?{and tab.database_id IN (@database_id) } {@include_analyses}?{and tab.analysis_id IN (@analysis_id) };