MD-3355: baseline updates for MapR-DB tests (#513)

diff --git a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query1.sql b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query1.sql
index 5631519..0c2ce55 100755
--- a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query1.sql
+++ b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query1.sql
@@ -12,7 +12,7 @@
 FROM
  lineitem
 WHERE
-  L_SHIPDate <= DATE '1998-12-01' - INTERVAL '120' DAY (3)
+  L_SHIPDate <= CAST((DATE '1998-12-01' - INTERVAL '120' DAY (3)) AS DATE)
 GROUP BY
   L_RETURNFLAG,
   L_LINESTATUS 
diff --git a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query10.sql b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query10.sql
index ea5ee6a..dd0ae1a 100755
--- a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query10.sql
+++ b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query10.sql
@@ -16,7 +16,7 @@
   C.C_CUSTKEY = O.O_CUSTKEY
   AND L.L_ORDERKEY = O.O_ORDERKEY
   AND O.O_ORDERDate >= DATE '1994-03-01'
-  AND O.O_ORDERDate < DATE '1994-03-01' + INTERVAL '3' MONTH
+  AND O.O_ORDERDate < CAST((DATE '1994-03-01' + INTERVAL '3' MONTH) AS DATE)
   AND L.L_RETURNFLAG = 'R'
   AND C.C_NATIONKEY = N.N_NATIONKEY
 GROUP BY
diff --git a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query12.sql b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query12.sql
index 50e2b92..aab7c67 100755
--- a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query12.sql
+++ b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query12.sql
@@ -21,7 +21,7 @@
   AND L.L_COMMITDate < L.L_RECEIPTDate
   AND L.L_SHIPDate < L.L_COMMITDate
   AND L.L_RECEIPTDate >= DATE '1994-01-01'
-  AND L.L_RECEIPTDate < DATE '1994-01-01' + INTERVAL '1' YEAR
+  AND L.L_RECEIPTDate < CAST((DATE '1994-01-01' + INTERVAL '1' YEAR) AS DATE)
 GROUP BY
   L.L_SHIPMODE
 ORDER BY
diff --git a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query14.sql b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query14.sql
index 74d784c..f883860 100755
--- a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query14.sql
+++ b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query14.sql
@@ -10,4 +10,4 @@
 WHERE
   L.L_PARTKEY = P.P_PARTKEY
   AND L.L_SHIPDate >= DATE '1994-08-01'
-  AND L.L_SHIPDate < DATE '1994-08-01' + INTERVAL '1' MONTH;
+  AND L.L_SHIPDate < CAST((DATE '1994-08-01' + INTERVAL '1' MONTH) AS DATE);
diff --git a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query4.sql b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query4.sql
index f6617a8..e5d5fdc 100755
--- a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query4.sql
+++ b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query4.sql
@@ -5,7 +5,7 @@
   orders O
 WHERE
   O.O_ORDERDate >= DATE '1996-10-01'
-  AND O.O_ORDERDate < DATE '1996-10-01' + INTERVAL '3' MONTH
+  AND O.O_ORDERDate < CAST((DATE '1996-10-01' + INTERVAL '3' MONTH) AS DATE)
   AND 
   EXISTS (
     SELECT
diff --git a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query5.sql b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query5.sql
index dd1914f..1937f20 100755
--- a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query5.sql
+++ b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query5.sql
@@ -17,7 +17,7 @@
   AND N.N_REGIONKEY = R.R_REGIONKEY
   AND R.R_NAME = 'EUROPE'
   AND O.O_ORDERDate >= DATE '1997-01-01'
-  AND O.O_ORDERDate < DATE '1997-01-01' + INTERVAL '1' YEAR
+  AND O.O_ORDERDate < CAST((DATE '1997-01-01' + INTERVAL '1' YEAR) AS DATE)
 GROUP BY
   N.N_NAME
 ORDER BY
diff --git a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query6.sql b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query6.sql
index 47e1394..ac4c786 100755
--- a/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query6.sql
+++ b/framework/resources/Advanced/tpch/tpch_sf1/original/maprdb/json/query6.sql
@@ -4,7 +4,7 @@
   lineitem
 WHERE
   L_SHIPDate >= DATE '1997-01-01'
-  AND L_SHIPDate < DATE '1997-01-01' + INTERVAL '1' YEAR
+  AND L_SHIPDate < CAST((DATE '1997-01-01' + INTERVAL '1' YEAR) AS DATE)
   AND
   L_DISCOUNT BETWEEN 0.03 - 0.01 AND 0.03 + 0.01
   AND L_QUANTITY < 24;