Merge pull request #429 from OHDSI/develop

Fix cdmDatatype SQL bug
OHDSI · Mar 16, 2023 · 1197d5d · 1197d5d
2 parents c468ebc + df260b7
commit 1197d5d
Show file tree

Hide file tree

Showing 40 changed files with 51 additions and 44 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: DataQualityDashboard
 Type: Package
 Title: Execute and View Data Quality Checks on OMOP CDM Database
-Version: 2.1.1
-Date: 2023-02-27
+Version: 2.1.2
+Date: 2023-03-10
 Authors@R: c(
   person("Katy", "Sadowski", email = "[email protected]", role = c("aut", "cre")),
   person("Clair", "Blacketer", role = c("aut")),
@@ -12,7 +12,7 @@ Authors@R: c(
   person("Frank", "DeFalco", role = c("aut")),
   person("Pavel", "Grafkin", role = c("aut"))
   )
-Maintainer: Katy Sadowski <katy.sadowski@gmail.com>
+Maintainer: Katy Sadowski <sadowski@ohdsi.org>
 Description: An R package for assessing data quality in standardized OMOP Common Data Model data sources.
 License: Apache License (>= 2)
 VignetteBuilder: knitr

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+DataQualityDashboard 2.1.2
+==========================
+
+1. Fixing bug in cdmDatatype check SQL that was causing NULL values to fail the check.
+
 DataQualityDashboard 2.1.1
 ==========================
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/AddNewCheck.html b/docs/articles/AddNewCheck.html
diff --git a/docs/articles/CheckStatusDefinitions.html b/docs/articles/CheckStatusDefinitions.html
diff --git a/docs/articles/CheckTypeDescriptions.html b/docs/articles/CheckTypeDescriptions.html
diff --git a/docs/articles/DataQualityDashboard.html b/docs/articles/DataQualityDashboard.html
diff --git a/docs/articles/DqdForCohorts.html b/docs/articles/DqdForCohorts.html
diff --git a/docs/articles/Thresholds.html b/docs/articles/Thresholds.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -8,5 +8,5 @@ articles:
   DataQualityDashboard: DataQualityDashboard.html
   DqdForCohorts: DqdForCohorts.html
   Thresholds: Thresholds.html
-last_built: 2023-02-27T22:52Z
+last_built: 2023-03-10T19:00Z
 
diff --git a/docs/pull_request_template.html b/docs/pull_request_template.html
diff --git a/docs/reference/dot-evaluateThresholds.html b/docs/reference/dot-evaluateThresholds.html
diff --git a/docs/reference/dot-getCheckId.html b/docs/reference/dot-getCheckId.html
diff --git a/docs/reference/dot-processCheck.html b/docs/reference/dot-processCheck.html
diff --git a/docs/reference/dot-recordResult.html b/docs/reference/dot-recordResult.html
diff --git a/docs/reference/dot-runCheck.html b/docs/reference/dot-runCheck.html
diff --git a/docs/reference/dot-summarizeResults.html b/docs/reference/dot-summarizeResults.html
diff --git a/docs/reference/dot-writeResultsToCsv.html b/docs/reference/dot-writeResultsToCsv.html
diff --git a/docs/reference/dot-writeResultsToJson.html b/docs/reference/dot-writeResultsToJson.html
diff --git a/docs/reference/dot-writeResultsToTable.html b/docs/reference/dot-writeResultsToTable.html
diff --git a/docs/reference/executeDqChecks.html b/docs/reference/executeDqChecks.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/listDqChecks.html b/docs/reference/listDqChecks.html
diff --git a/docs/reference/reEvaluateThresholds.html b/docs/reference/reEvaluateThresholds.html
diff --git a/docs/reference/viewDqDashboard.html b/docs/reference/viewDqDashboard.html
diff --git a/docs/reference/writeJsonResultsToCsv.html b/docs/reference/writeJsonResultsToCsv.html
diff --git a/docs/reference/writeJsonResultsToTable.html b/docs/reference/writeJsonResultsToTable.html
diff --git a/extras/DataQualityDashboard.pdf b/extras/DataQualityDashboard.pdf
diff --git a/inst/doc/AddNewCheck.pdf b/inst/doc/AddNewCheck.pdf
diff --git a/inst/doc/CheckStatusDefinitions.pdf b/inst/doc/CheckStatusDefinitions.pdf
diff --git a/inst/doc/CheckTypeDescriptions.pdf b/inst/doc/CheckTypeDescriptions.pdf
diff --git a/inst/doc/DataQualityDashboard.pdf b/inst/doc/DataQualityDashboard.pdf
diff --git a/inst/doc/DqdForCohorts.pdf b/inst/doc/DqdForCohorts.pdf
diff --git a/inst/doc/Thresholds.pdf b/inst/doc/Thresholds.pdf
diff --git a/inst/sql/sql_server/field_cdm_datatype.sql b/inst/sql/sql_server/field_cdm_datatype.sql
@@ -30,11 +30,9 @@ FROM
 		  cdmTable.* 
 		FROM @cdmDatabaseSchema.@cdmTableName cdmTable
 		WHERE 
-		  ISNUMERIC(cdmTable.@cdmFieldName) = 0 
-		  OR (
-		    ISNUMERIC(cdmTable.@cdmFieldName) = 1 
-		    AND CHARINDEX('.', CAST(ABS(cdmTable.@cdmFieldName) AS varchar)) != 0
-		  )
+		  (ISNUMERIC(cdmTable.@cdmFieldName) = 0 
+		    OR (ISNUMERIC(cdmTable.@cdmFieldName) = 1 
+		      AND CHARINDEX('.', CAST(ABS(cdmTable.@cdmFieldName) AS varchar)) != 0))
       AND cdmTable.@cdmFieldName IS NOT NULL
 		/*violatedRowsEnd*/
 	) violated_rows