Refactored Oracle Hint tests, added set selects

Author: valdasraps

src/test/java/net/sf/jsqlparser/test/TestUtils.java

@@ -27,6 +27,13 @@
 import java.io.*;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.statement.select.SelectBody;
+import net.sf.jsqlparser.statement.select.SetOperationList;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -90,4 +97,32 @@ public static void assertExpressionCanBeDeparsedAs(final Expression parsed, Stri
 
         assertEquals(expression, stringBuilder.toString());
     }
+    
+    public static void assertOracleHintExists(String sql, boolean assertDeparser, String... hints) throws JSQLParserException {
+        if (assertDeparser) {
+            assertSqlCanBeParsedAndDeparsed(sql, true);
+        }
+        Select stmt = (Select) CCJSqlParserUtil.parse(sql);
+        if (stmt.getSelectBody() instanceof PlainSelect) {
+            PlainSelect ps = (PlainSelect) stmt.getSelectBody();
+            OracleHint hint = ps.getOracleHint();
+            assertNotNull(hint);
+            assertEquals(hints[0], hint.getValue());
+        } else {
+            if (stmt.getSelectBody() instanceof SetOperationList) {
+                SetOperationList setop = (SetOperationList) stmt.getSelectBody();
+                for (int i = 0; i < setop.getSelects().size(); i++) {
+                    PlainSelect pselect = (PlainSelect) setop.getSelects().get(i);
+                    OracleHint hint = pselect.getOracleHint();
+                    if (hints[i] == null) {
+                        Assert.assertNull(hint);
+                    } else {
+                        assertNotNull(hint);
+                        assertEquals(hints[i], hint.getValue());
+                    }
+                }
+            }
+        }
+    }
+    
 }

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

@@ -1960,67 +1960,36 @@ public void testIssue77_singleQuoteEscape2() throws JSQLParserException {
 	}
 
     public void testOracleHint() throws JSQLParserException {
-        String[][] sqls = new String[][] {
-            {"SOMEHINT", "SELECT /*+ SOMEHINT */ * FROM mytable", 
-                "true"},
-            {"MORE HINTS POSSIBLE", "SELECT /*+ MORE HINTS POSSIBLE */ * FROM mytable", 
-                "true"},
-            {"MORE\nHINTS\t\nPOSSIBLE", "SELECT /*+   MORE\nHINTS\t\nPOSSIBLE  */ * FROM mytable", 
-                "true"},
-            {"leading(sn di md sh ot) cardinality(ot 1000)", "SELECT /*+ leading(sn di md sh ot) cardinality(ot 1000) */ c, b FROM mytable", 
-                "true"},
-            {"ORDERED INDEX (b, jl_br_balances_n1) USE_NL (j b) \n" +
-                "           USE_NL (glcc glf) USE_MERGE (gp gsb)", 
-                "SELECT /*+ ORDERED INDEX (b, jl_br_balances_n1) USE_NL (j b) \n" +
+        assertOracleHintExists("SELECT /*+ SOMEHINT */ * FROM mytable", true, "SOMEHINT");
+        assertOracleHintExists("SELECT /*+ MORE HINTS POSSIBLE */ * FROM mytable", true, "MORE HINTS POSSIBLE");
+        assertOracleHintExists("SELECT /*+   MORE\nHINTS\t\nPOSSIBLE  */ * FROM mytable", true, "MORE\nHINTS\t\nPOSSIBLE");
+        assertOracleHintExists("SELECT /*+ leading(sn di md sh ot) cardinality(ot 1000) */ c, b FROM mytable", true, "leading(sn di md sh ot) cardinality(ot 1000)");
+        assertOracleHintExists("SELECT /*+ ORDERED INDEX (b, jl_br_balances_n1) USE_NL (j b) \n" +
                 "           USE_NL (glcc glf) USE_MERGE (gp gsb) */\n" +
-                " b.application_id ,\n" +
-                " b.set_of_books_id ,\n" +
-                " b.personnel_id,\n" +
-                " p.vendor_id Personnel,\n" +
-                " p.segment1 PersonnelNumber,\n" +
-                " p.vendor_name Name\n" +
+                " b.application_id\n" +
                 "FROM  jl_br_journals j,\n" +
-                "      jl_br_balances b,\n" +
-                "      gl_code_combinations glcc,\n" +
-                "      fnd_flex_values_vl glf,\n" +
-                "      gl_periods gp,\n" +
-                "      gl_sets_of_books gsb,\n" +
-                "      po_vendors p", 
-                "true" },
-            {"ROWID(emp)", "SELECT /*+ROWID(emp)*/ /*+ THIS IS NOT HINT! ***/ * \n" +
+                "      po_vendors p", true, "ORDERED INDEX (b, jl_br_balances_n1) USE_NL (j b) \n" +
+                "           USE_NL (glcc glf) USE_MERGE (gp gsb)");
+        assertOracleHintExists("SELECT /*+ROWID(emp)*/ /*+ THIS IS NOT HINT! ***/ * \n" +
                 "FROM emp \n" +
-                "WHERE rowid > 'AAAAtkAABAAAFNTAAA' AND empno = 155", 
-                "false"},
-            {"INDEX(patients sex_index) use sex_index because there are few\n" +
-                "   male patients", "SELECT /*+ INDEX(patients sex_index) use sex_index because there are few\n" +
+                "WHERE rowid > 'AAAAtkAABAAAFNTAAA' AND empno = 155", false, "ROWID(emp)");
+        assertOracleHintExists("SELECT /*+ INDEX(patients sex_index) use sex_index because there are few\n" +
                 "   male patients  */ name, height, weight\n" +
                 "FROM patients\n" +
-                "WHERE sex = 'm'", 
-                "true"},
-            {"INDEX_COMBINE(emp sal_bmi hiredate_bmi)", "SELECT /*+INDEX_COMBINE(emp sal_bmi hiredate_bmi)*/ * \n" +
+                "WHERE sex = 'm'", true, "INDEX(patients sex_index) use sex_index because there are few\n   male patients");
+        assertOracleHintExists("SELECT /*+INDEX_COMBINE(emp sal_bmi hiredate_bmi)*/ * \n" +
                 "FROM emp  \n" +
-                "WHERE sal < 50000 AND hiredate < '01-JAN-1990'", 
-                "true"},
-            {"CLUSTER", "SELECT --+ CLUSTER \n" +
+                "WHERE sal < 50000 AND hiredate < '01-JAN-1990'", true, "INDEX_COMBINE(emp sal_bmi hiredate_bmi)");
+        assertOracleHintExists("SELECT --+ CLUSTER \n" +
                 "emp.ename, deptno\n" +
                 "FROM emp, dept\n" +
                 "WHERE deptno = 10 \n" +
-                "AND emp.deptno = dept.deptno", 
-                "true"},
-            {"CLUSTER", "SELECT --+ CLUSTER \n --+ some other comment, not hint\n /* even more comments */ * from dual", 
-                "false"}
-        };
-        
-        for (String[] sql: sqls) {
-            if (Boolean.parseBoolean(sql[2])) {
-                assertSqlCanBeParsedAndDeparsed(sql[1], true);
-            }
-            Select select = (Select) CCJSqlParserUtil.parse(sql[1]);
-            PlainSelect pselect = (PlainSelect) select.getSelectBody();
-            OracleHint hint = pselect.getOracleHint();
-            assertNotNull(hint);
-            assertEquals(sql[0], hint.getValue());
-        }
+                "AND emp.deptno = dept.deptno", true, "CLUSTER");
+        assertOracleHintExists("SELECT --+ CLUSTER \n --+ some other comment, not hint\n /* even more comments */ * from dual", false, "CLUSTER");
+        assertOracleHintExists("(SELECT * from t1) UNION (select /*+ CLUSTER */ * from dual)", true, null, "CLUSTER");
+        assertOracleHintExists("(SELECT * from t1) UNION (select /*+ CLUSTER */ * from dual) UNION (select * from dual)", true, null, "CLUSTER", null);
+        assertOracleHintExists("(SELECT --+ HINT1 HINT2 HINT3\n * from t1) UNION (select /*+ HINT4 HINT5 */ * from dual)", true, "HINT1 HINT2 HINT3", "HINT4 HINT5");
+
     }
 
 }