Issue 274: Sybase/MSSQLServer compatibility - support index clause e.g. "select…

Issue 274: Sybase/MSSQLServer compatibility - support index clause e.g. "select * from test (index table1_index)"

h2/src/docsrc/html/changelog.html

@@ -30,8 +30,9 @@ Change Log
 </li><li>Fix Issue 406: support "SELECT h2version()"
 </li><li>Fix Issue 389: When there is a multi-column primary key, H2 does not seem to always pick the right index
 </li><li>Fix Issue 305: Implement SELECT ... FOR FETCH ONLY
-</li><li>Issue 274:	Sybase/MSSQLServer compatibility - Add GETDATE and CHARINDEX system functions
-</li><li>Issue 274:	Sybase/MSSQLServer compatibility - swap parameters of CONVERT function.
+</li><li>Issue 274: Sybase/MSSQLServer compatibility - Add GETDATE and CHARINDEX system functions
+</li><li>Issue 274: Sybase/MSSQLServer compatibility - swap parameters of CONVERT function.
+</li><li>Issue 274: Sybase/MSSQLServer compatibility - support index clause e.g. "select * from test (index table1_index)"
 </li></ul>
 
 <h2>Version 1.3.171 (2013-03-17)</h2>

h2/src/main/org/h2/command/Parser.java

@@ -1065,7 +1065,14 @@ public class Parser {
         } else {
             String tableName = readIdentifierWithSchema(null);
             Schema schema = getSchema();
-            if (readIf("(")) {
+            boolean foundLeftBracket = readIf("(");
+            if (foundLeftBracket && readIf("INDEX")) {
+                // Sybase compatibility with "select * from test (index table1_index)"
+                readIdentifierWithSchema(null);
+                read(")");
+                foundLeftBracket = false;
+            }
+            if (foundLeftBracket) {
                 Schema mainSchema = database.getSchema(Constants.SCHEMA_MAIN);
                 if (equalsToken(tableName, RangeTable.NAME)) {
                     Expression min = readExpression();

h2/src/test/org/h2/test/db/TestCompatibility.java

@@ -309,6 +309,10 @@ public class TestCompatibility extends TestBase {
         rs.next();
         assertEquals(10, rs.getInt(1));
         rs.close();
+
+        // make sure we're ignoring the index part of the statement
+        rs = stat.executeQuery("select * from test (index table1_index)");
+        rs.close();
     }
 
     private void testDB2() throws SQLException {