Added few functions to compare date and datetimes to fix some test ca…

…ses in 'operator.date' test (AOS-203) Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
Bit-Quill · Nov 19, 2021 · d62d23f · d62d23f
1 parent dd357bc
commit d62d23f
Showing 1 changed file with 73 additions and 2 deletions.
diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd b/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
@@ -63,16 +63,87 @@
             <argument type='datetime' />
             <argument type='datetime' />
         </function>
+
+        <function group='operator' name='==' return-type='bool'>
+            <formula>(TIMESTAMP(%1) = TIMESTAMP(%2))</formula>
+            <argument type='date' />
+            <argument type='datetime' />
+        </function>
+        <function group='operator' name='==' return-type='bool'>
+            <formula>(TIMESTAMP(%1) = TIMESTAMP(%2))</formula>
+            <argument type='datetime' />
+            <argument type='date' />
+        </function>
         <function group='operator' name='!=' return-type='bool'>
-            <formula>(CAST(DATE_FORMAT(DATE(%1), '%Y-%m-%d 00:00:00') AS TIMESTAMP) &lt;&gt; %2)</formula>
+            <formula>(TIMESTAMP(%1) &lt;&gt; TIMESTAMP(%2))</formula>
             <argument type='date' />
             <argument type='datetime' />
         </function>
         <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 &lt;&gt; CAST(DATE_FORMAT(DATE(%2), '%Y-%m-%d 00:00:00') AS TIMESTAMP))</formula>
+            <formula>(TIMESTAMP(%1) &lt;&gt; TIMESTAMP(%2))</formula>
+            <argument type='datetime' />
+            <argument type='date' />
+        </function>
+        <function group='operator' name='&gt;=' return-type='bool'>
+            <formula>(TIMESTAMP(%1) &gt;= TIMESTAMP(%2))</formula>
+            <argument type='date' />
+            <argument type='datetime' />
+        </function>
+        <function group='operator' name='&gt;=' return-type='bool'>
+            <formula>(TIMESTAMP(%1) &gt;= TIMESTAMP(%2))</formula>
+            <argument type='datetime' />
+            <argument type='date' />
+        </function>
+        <function group='operator' name='&lt;=' return-type='bool'>
+            <formula>(TIMESTAMP(%1) &lt;= TIMESTAMP(%2))</formula>
+            <argument type='date' />
+            <argument type='datetime' />
+        </function>
+        <function group='operator' name='&lt;=' return-type='bool'>
+            <formula>(TIMESTAMP(%1) &lt;= TIMESTAMP(%2))</formula>
+            <argument type='datetime' />
+            <argument type='date' />
+        </function>
+        <function group='operator' name='&gt;' return-type='bool'>
+            <formula>(TIMESTAMP(%1) &gt; TIMESTAMP(%2))</formula>
+            <argument type='date' />
+            <argument type='datetime' />
+        </function>
+        <function group='operator' name='&gt;' return-type='bool'>
+            <formula>(TIMESTAMP(%1) &gt; TIMESTAMP(%2))</formula>
+            <argument type='datetime' />
+            <argument type='date' />
+        </function>
+        <function group='operator' name='&lt;' return-type='bool'>
+            <formula>(TIMESTAMP(%1) &lt; TIMESTAMP(%2))</formula>
+            <argument type='date' />
+            <argument type='datetime' />
+        </function>
+        <function group='operator' name='&lt;' return-type='bool'>
+            <formula>(TIMESTAMP(%1) &lt; TIMESTAMP(%2))</formula>
+            <argument type='datetime' />
+            <argument type='date' />
+        </function>
+
+        <function group='operator' name='-' return-type='real'>
+            <!-- 86400 as it represents seconds in a day -->
+            <formula>((TO_DAYS(TIMESTAMP(%1)) - TO_DAYS(TIMESTAMP(%2))) + ((TIME_TO_SEC(TIMESTAMP(%1)) - TIME_TO_SEC(TIMESTAMP(%2))) / 86400.0))</formula>
+            <argument type='date' />
+            <argument type='datetime' />
+        </function>
+        <function group='operator' name='-' return-type='real'>
+            <!-- 86400 as it represents seconds in a day -->
+            <formula>((TO_DAYS(TIMESTAMP(%1)) - TO_DAYS(TIMESTAMP(%2))) + ((TIME_TO_SEC(TIMESTAMP(%1)) - TIME_TO_SEC(TIMESTAMP(%2))) / 86400.0))</formula>
             <argument type='datetime' />
             <argument type='date' />
         </function>
+        <function group='operator' name='-' return-type='real'>
+            <!-- 86400 as it represents seconds in a day -->
+            <formula>((TO_DAYS(TIMESTAMP(%1)) - TO_DAYS(TIMESTAMP(%2))) + ((TIME_TO_SEC(TIMESTAMP(%1)) - TIME_TO_SEC(TIMESTAMP(%2))) / 86400.0))</formula>
+            <argument type='datetime' />
+            <argument type='datetime' />
+        </function>
+
         <function group='operator' name='+' return-type='datetime'>
             <!-- 86400 as it represents seconds in a day -->
             <formula>DATE_ADD(DATE_ADD(%1, INTERVAL FLOOR(%2) DAY), INTERVAL CAST(86400 * (%2 - FLOOR(%2)) AS INT) SECOND)</formula>