Casting interval to int on DuckDb. Fixes OHDSI/DatabaseConnector#241

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: SqlRender
 Type: Package
 Title: Rendering Parameterized SQL and Translation to Dialects
-Version: 1.15.1
-Date: 2023-06-29
+Version: 1.15.2
+Date: 2023-07-04
 Authors@R: c(
   person("Martijn", "Schuemie", , "schuemie@ohdsi.org", role = c("aut", "cre")),
   person("Marc", "Suchard", role = c("aut"))

NEWS.md

@@ -1,3 +1,11 @@
+SqlRender 1.15.2
+================
+
+Bugfixes:
+
+1. Fixing translation of `DATEADD()` for DuckDB when number to add is not an integer.
+
+
 SqlRender 1.15.1
 ================
 

inst/csv/replacementPatterns.csv

@@ -1175,18 +1175,18 @@ duckdb,TRY_CAST(@a),CAST(@a)
 duckdb,"IIF(@condition, @whentrue, @whenfalse)","CASE WHEN @condition THEN @whentrue ELSE @whenfalse END"
 duckdb,"ROUND(@a,@b)","ROUND(CAST(@a AS NUMERIC),@b)"
 duckdb,"HASHBYTES('MD5',@a)","MD5(@a)"
-duckdb,"DATEADD(second,@seconds,@datetime)",(@datetime + TO_SECONDS(@seconds))
-duckdb,"DATEADD(minute,@minutes,@datetime)",(@datetime + TO_MINUTES(@minutes))
-duckdb,"DATEADD(hour,@hours,@datetime)",(@datetime + TO_HOURS(@hours))
-duckdb,"DATEADD(d,@days,@date)",(@date + TO_DAYS(@days))
-duckdb,"DATEADD(dd,@days,@date)",(@date + TO_DAYS(@days))
-duckdb,"DATEADD(day,@days,@date)",(@date + TO_DAYS(@days))
-duckdb,"DATEADD(m,@months,@date)",(@date + TO_MONTHS(@months))
-duckdb,"DATEADD(mm,@months,@date)",(@date + TO_MONTHS(@months))
-duckdb,"DATEADD(month,@months,@date)",(@date + TO_MONTHS(@months))
-duckdb,"DATEADD(yy,@years,@date)",(@date + TO_YEAR(@years))
-duckdb,"DATEADD(yyyy,@years,@date)",(@date + TO_YEAR(@years))
-duckdb,"DATEADD(year,@years,@date)",(@date + TO_YEAR(@years))
+duckdb,"DATEADD(second,@seconds,@datetime)",(@datetime + TO_SECONDS(CAST(@seconds AS INTEGER)))
+duckdb,"DATEADD(minute,@minutes,@datetime)",(@datetime + TO_MINUTES(CAST(@minutes AS INTEGER)))
+duckdb,"DATEADD(hour,@hours,@datetime)",(@datetime + TO_HOURS(CAST(@hours AS INTEGER)))
+duckdb,"DATEADD(d,@days,@date)",(@date + TO_DAYS(CAST(@days AS INTEGER)))
+duckdb,"DATEADD(dd,@days,@date)",(@date + TO_DAYS(CAST(@days AS INTEGER)))
+duckdb,"DATEADD(day,@days,@date)",(@date + TO_DAYS(CAST(@days AS INTEGER)))
+duckdb,"DATEADD(m,@months,@date)",(@date + TO_MONTHS(CAST(@months AS INTEGER)))
+duckdb,"DATEADD(mm,@months,@date)",(@date + TO_MONTHS(CAST(@months AS INTEGER)))
+duckdb,"DATEADD(month,@months,@date)",(@date + TO_MONTHS(CAST(@months AS INTEGER)))
+duckdb,"DATEADD(yy,@years,@date)",(@date + TO_YEAR(CAST(@years AS INTEGER)))
+duckdb,"DATEADD(yyyy,@years,@date)",(@date + TO_YEAR(CAST(@years AS INTEGER)))
+duckdb,"DATEADD(year,@years,@date)",(@date + TO_YEAR(CAST(@years AS INTEGER)))
 duckdb,INTERVAL'@(-?[0-9]+)a.0 @b',INTERVAL'@a @b'
 duckdb,"DATEDIFF(d,@start, @end)","(CONVERT(DATE, @end) - CAST(@start AS DATE))"
 duckdb,"DATEDIFF(dd,@start, @end)",(CAST(@end AS DATE) - CAST(@start AS DATE))

pom.xml

@@ -6,7 +6,7 @@
 	<groupId>org.ohdsi.sql</groupId>
 	<artifactId>SqlRender</artifactId>
 	<packaging>jar</packaging>
-	<version>1.15.1-SNAPSHOT</version>
+	<version>1.15.2-SNAPSHOT</version>
 	<name>SqlRender</name>
 	<scm>
 		<connection>scm:git:https://github.com/OHDSI/SqlRender</connection>

tests/testthat/test-translate-duckdb.R

@@ -30,7 +30,7 @@ test_that("translate sql server -> DuckDB add months", {
   sql <- translate("DATEADD(mm,2,date)", targetDialect = "duckdb")
   expect_equal_ignore_spaces(
     sql,
-    "(date + TO_MONTHS(2))"
+    "(date + TO_MONTHS(CAST(2 AS INTEGER)))"
   )
 })
 
@@ -224,6 +224,6 @@ test_that("translate sql server -> DuckDB add days with period", {
   sql <- translate("DATEADD(DAY, -2.0, date)", targetDialect = "duckdb")
   expect_equal_ignore_spaces(
     sql,
-    "(date + TO_DAYS(-2.0))"
+    "(date + TO_DAYS(CAST(-2.0 AS INTEGER)))"
   )
 })