Author: shawkins Date: 2009-08-17 12:50:34 -0400 (Mon, 17 Aug 2009) New Revision: 1251 Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java trunk/connectors/sandbox/connector-oracle-spatial/src/test/java/org/teiid/connector/jdbc/oracle/spatial/TestOracleSpatialTranslator.java Log: TEIID-757 changing the relate hint to use /*+ instead of /* + Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java =================================================================== --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-08-17 16:21:17 UTC (rev 1250) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-08-17 16:50:34 UTC (rev 1251) @@ -131,7 +131,7 @@ int indx1 = funcName.indexOf("SDO"); //$NON-NLS-1$ int indx2 = funcName.indexOf("RELATE"); //$NON-NLS-1$ if (indx1 >= 0 && indx2 > indx1) - return comment + " /* + ORDERED */"; //$NON-NLS-1$ + return comment + "/*+ ORDERED */ "; //$NON-NLS-1$ } } return comment; Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/test/java/org/teiid/connector/jdbc/oracle/spatial/TestOracleSpatialTranslator.java =================================================================== --- trunk/connectors/sandbox/connector-oracle-spatial/src/test/java/org/teiid/connector/jdbc/oracle/spatial/TestOracleSpatialTranslator.java 2009-08-17 16:21:17 UTC (rev 1250) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/test/java/org/teiid/connector/jdbc/oracle/spatial/TestOracleSpatialTranslator.java 2009-08-17 16:50:34 UTC (rev 1251) @@ -116,9 +116,7 @@ * * @throws Exception */ - @Ignore("TEIID-757: Translator needs fixing so that spacing is valid between hint and query") @Test public void testRewrite_sdo_relate() throws Exception { - // TODO TEIID-757: Translator needs fixing so that spacing is valid between hint and query String input = "SELECT a.INTKEY FROM BQT1.SMALLA A, BQT1.SMALLB B WHERE sdo_relate(A.OBJECTVALUE, b.OBJECTVALUE, 'mask=ANYINTERACT') = true"; //$NON-NLS-1$ String output = "SELECT /*+ ORDERED */ A.IntKey FROM SmallA A, SmallB B WHERE SDO_RELATE(A.ObjectValue, B.ObjectValue, 'mask=ANYINTERACT') = 'true'"; //$NON-NLS-1$