From 580e1affc3440bb10dfca6813b8ebe1b943b2bee Mon Sep 17 00:00:00 2001
From: Guian Gumpac <guiang@bitquilltech.com>
Date: Thu, 18 Nov 2021 10:52:07 -0800
Subject: [PATCH 1/3] Added IFNULL function

Signed-off-by: Guian Gumpac <guiang@bitquilltech.com>
---
 .../src/TableauConnector/opensearch_sql_jdbc/dialect.tdd    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd b/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
index 73cc10a08c..ebf73c7eff 100644
--- a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
+++ b/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
@@ -33,6 +33,12 @@
             <argument type='datetime' />
         </function>
 
+        <function group='logical' name='IFNULL' return-type='datetime'>
+            <formula>CASE WHEN ISNULL(%1) THEN CAST(DATE_FORMAT(%2, &apos;%Y-%m-%d 00:00:00&apos;) AS TIMESTAMP) ELSE %1 END</formula>
+            <argument type='datetime' />
+            <argument type='date' />
+        </function>
+
         <function group='operator' name='!=' return-type='bool'>
             <formula>(%1 AND NOT %2 OR NOT %1 AND %2)</formula>
             <argument type='bool' />

From 10aba05b3d0949e0cb7c6d9f93445a6383a0151c Mon Sep 17 00:00:00 2001
From: Guian Gumpac <guiang@bitquilltech.com>
Date: Thu, 18 Nov 2021 15:41:08 -0800
Subject: [PATCH 2/3] Added MIN and MAX for two string arguments

Signed-off-by: Guian Gumpac <guiang@bitquilltech.com>
---
 .../opensearch_sql_jdbc/dialect.tdd           | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd b/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
index ebf73c7eff..406a639dbb 100644
--- a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
+++ b/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
@@ -156,6 +156,14 @@
             <argument type='datetime' />
             <argument type='datetime' />
         </function>
+        <function group='numeric' name='MAX' return-type='str'>
+            <formula>CASE WHEN ISNULL(%1) THEN NULL
+                WHEN ISNULL(%2) THEN NULL
+	            WHEN %1 &gt; %2 THEN %1
+                ELSE %2 END</formula>
+            <argument type='str' />
+            <argument type='str' />
+        </function>
         <function group='numeric' name='MIN' return-type='int'>
             <formula>CASE WHEN ISNULL(%1) THEN NULL
                 WHEN ISNULL(%2) THEN NULL
@@ -180,6 +188,14 @@
             <argument type='datetime' />
             <argument type='datetime' />
         </function>
+        <function group='numeric' name='MIN' return-type='str'>
+            <formula>CASE WHEN ISNULL(%1) THEN NULL
+                WHEN ISNULL(%2) THEN NULL
+	            WHEN %1 &lt; %2 THEN %1
+                ELSE %2 END</formula>
+            <argument type='str' />
+            <argument type='str' />
+        </function>
         <function group='numeric' name='CEILING' return-type='int'>
             <formula>CEIL(%1)</formula>
             <argument type='real' />
@@ -340,24 +356,8 @@
             <argument type='datetime' />
         </remove-function>
 
-        <remove-function name='MAX'>
-            <argument type='str' />
-        </remove-function>
-        <remove-function name='MAX'>
-            <argument type='str' />
-            <argument type='str' />
-        </remove-function>
-
         <remove-function name='SPACE'>
             <argument type='int' />
         </remove-function>
-
-        <remove-function name='MIN'>
-            <argument type='str' />
-        </remove-function>
-        <remove-function name='MIN'>
-            <argument type='str' />
-            <argument type='str' />
-        </remove-function>
    </function-map>
 </dialect>

From f212e35b7acb025421073b6f3117490a015e1838 Mon Sep 17 00:00:00 2001
From: Guian Gumpac <guiang@bitquilltech.com>
Date: Mon, 22 Nov 2021 12:18:51 -0800
Subject: [PATCH 3/3] Modified Timestamp conversion formula

Signed-off-by: Guian Gumpac <guiang@bitquilltech.com>
---
 sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd b/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
index 406a639dbb..e85feb33ab 100644
--- a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
+++ b/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
@@ -34,7 +34,7 @@
         </function>
 
         <function group='logical' name='IFNULL' return-type='datetime'>
-            <formula>CASE WHEN ISNULL(%1) THEN CAST(DATE_FORMAT(%2, &apos;%Y-%m-%d 00:00:00&apos;) AS TIMESTAMP) ELSE %1 END</formula>
+            <formula>CASE WHEN ISNULL(%1) THEN SUBDATE(TIMESTAMP(%2), INTERVAL HOUR(TIMESTAMP(%2)) HOUR) ELSE %1 END</formula>
             <argument type='datetime' />
             <argument type='date' />
         </function>