[1/2] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-12 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 8fe0b86ce -> 5c70a2265


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5c70a226/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index b387ee8..099f6f5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -582,19 +582,19 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName3 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, " 
+query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, "
 + tableName3 + " c, " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM (" + tableName4 + " o, " 
+query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM (" + tableName4 + " o, "
 + tableName3 + " c), " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, (" 
+query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, ("
 + tableName3 + " c, " 
 + tableName1 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -794,10 +794,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName2 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + "(" + tableName1 + " i RIGHT JOIN " + tableName2 + " s ON 
i.\"supplier_id\" = s.\"supplier_id\")" 
 + " ON o.\"item_id\" = i.\"item_id\" ORDER BY \"order_id\", 
s.\"supplier_id\" DESC";
 try {
@@ -900,10 +900,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " i RIGHT JOIN " 
+

[1/2] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-12 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 0a78f055b -> 88c092f12


http://git-wip-us.apache.org/repos/asf/phoenix/blob/88c092f1/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index b387ee8..099f6f5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -582,19 +582,19 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName3 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, " 
+query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, "
 + tableName3 + " c, " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM (" + tableName4 + " o, " 
+query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM (" + tableName4 + " o, "
 + tableName3 + " c), " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, (" 
+query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, ("
 + tableName3 + " c, " 
 + tableName1 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -794,10 +794,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName2 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + "(" + tableName1 + " i RIGHT JOIN " + tableName2 + " s ON 
i.\"supplier_id\" = s.\"supplier_id\")" 
 + " ON o.\"item_id\" = i.\"item_id\" ORDER BY \"order_id\", 
s.\"supplier_id\" DESC";
 try {
@@ -900,10 +900,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " i RIGHT JOIN " 
+

[1/2] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore) [Forced Update!]

2016-10-12 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/master fd1dac0d4 -> e280cb9b6 (forced update)


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e280cb9b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index b387ee8..099f6f5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -582,19 +582,19 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName3 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, " 
+query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, "
 + tableName3 + " c, " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM (" + tableName4 + " o, " 
+query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM (" + tableName4 + " o, "
 + tableName3 + " c), " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, (" 
+query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, ("
 + tableName3 + " c, " 
 + tableName1 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -794,10 +794,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName2 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + "(" + tableName1 + " i RIGHT JOIN " + tableName2 + " s ON 
i.\"supplier_id\" = s.\"supplier_id\")" 
 + " ON o.\"item_id\" = i.\"item_id\" ORDER BY \"order_id\", 
s.\"supplier_id\" DESC";
 try {
@@ -900,10 +900,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " i RIGHT JOIN

[1/2] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords

2016-10-12 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/master d1156eaad -> fd1dac0d4


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fd1dac0d/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index b387ee8..099f6f5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -582,19 +582,19 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName3 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, " 
+query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, "
 + tableName3 + " c, " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM (" + tableName4 + " o, " 
+query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM (" + tableName4 + " o, "
 + tableName3 + " c), " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, (" 
+query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, ("
 + tableName3 + " c, " 
 + tableName1 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -794,10 +794,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName2 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + "(" + tableName1 + " i RIGHT JOIN " + tableName2 + " s ON 
i.\"supplier_id\" = s.\"supplier_id\")" 
 + " ON o.\"item_id\" = i.\"item_id\" ORDER BY \"order_id\", 
s.\"supplier_id\" DESC";
 try {
@@ -900,10 +900,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " i RIGHT JOIN " 
+