Revert "#393 Simplify OracleDialect generated queries"

This reverts commit bef8143.

Author: ericbn

activejdbc/src/main/java/org/javalite/activejdbc/dialects/OracleDialect.java

@@ -50,14 +50,15 @@ public class OracleDialect extends DefaultDialect {
      */
     @Override
     public String formSelect(String tableName, String subQuery, List<String> orderBys, long limit, long offset) {
+
         boolean needLimit = limit != -1L;
         boolean needOffset = offset != -1L;
 
         StringBuilder fullQuery = new StringBuilder();
         if (needOffset) {
             fullQuery.append("SELECT * FROM (SELECT t2.*, ROWNUM AS oracle_row_number FROM (");
         } else if (needLimit) { // if needLimit and don't needOffset
-            fullQuery.append("SELECT * FROM (");
+            fullQuery.append("SELECT * FROM (SELECT t2.* FROM (");
         }
         //TODO check if this can be simplified removing the alias t
         appendSelect(fullQuery, tableName, (needLimit || needOffset) ? "t" : null, subQuery, orderBys);
@@ -69,7 +70,7 @@ public String formSelect(String tableName, String subQuery, List<String> orderBy
                 fullQuery.append(" AND ROWNUM <= ").append(limit);
             }
         } else if (needLimit) {
-            fullQuery.append(") WHERE ROWNUM <= ").append(limit);
+            fullQuery.append(") t2) WHERE ROWNUM <= ").append(limit);            
         }
 
         return fullQuery.toString();