Added SELECT parsing and JUnit test

Author: cbockermann

pom.xml

@@ -28,8 +28,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.0.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.5</source>
+					<target>1.5</target>
 				</configuration>
 			</plugin>
 			<plugin>

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -278,8 +278,8 @@ Update Update():
 	Table table = null;
 	Expression where = null;
 	Column tableColumn = null;
-	List expList = new ArrayList(); 
-	List columns = new ArrayList(); 
+	List<Expression> expList = new ArrayList<Expression>(); 
+	List<Column> columns = new ArrayList<Column>(); 
 	Expression value = null;
 
 }
@@ -304,8 +304,8 @@ Replace Replace():
 	Column tableColumn = null;
 	Expression value = null;
 
-	List columns = new ArrayList(); 
-	List expList = new ArrayList(); 
+	List<Column> columns = new ArrayList<Column>(); 
+	List<Expression> expList = new ArrayList<Expression>(); 
 	ItemsList itemsList = null;
 	Expression exp = null;
 
@@ -355,8 +355,8 @@ Insert Insert():
 	Insert insert = new Insert(); 
 	Table table = null;
 	Column tableColumn = null;
-	List columns = new ArrayList(); 
-	List primaryExpList = new ArrayList(); 
+	List<Column> columns = new ArrayList<Column>(); 
+	List<Expression> primaryExpList = new ArrayList<Expression>(); 
 	ItemsList itemsList = null;
 	Expression exp = null;
 }
@@ -482,7 +482,7 @@ Select Select():
 { 
 	Select select = new Select();
 	SelectBody selectBody = null;
-	List with = null; 
+	List<WithItem> with = null; 
 }
 {
 	[ with=WithList() { select.setWithItemsList(with); } ]
@@ -510,10 +510,10 @@ PlainSelect PlainSelect():
 	PlainSelect plainSelect = new PlainSelect(); 
 	List selectItems = null;
 	FromItem fromItem = null;
-	List joins = null;
+	List<Join> joins = null;
 	List distinctOn = null;
 	Expression where = null;
-	List orderByElements;
+	List<OrderByElement> orderByElements;
 	List groupByColumnReferences = null;
 	Expression having = null;
 	Limit limit = null;
@@ -562,10 +562,10 @@ PlainSelect PlainSelect():
 Union Union():
 { 
 	Union union = new Union(); 
-	List orderByElements = null;
+	List<OrderByElement> orderByElements = null;
 	Limit limit = null;
 	PlainSelect select = null;
-	ArrayList selects = new ArrayList();
+	ArrayList<PlainSelect> selects = new ArrayList<PlainSelect>();
 /*
 this is not 100% right, since multiple UNION could have different ALL/DISTINCT clauses...
 */
@@ -599,7 +599,7 @@ this is not 100% right, since multiple UNION could have different ALL/DISTINCT c
 
 List WithList():
 {
-	ArrayList withItemsList = new ArrayList();
+	ArrayList<WithItem> withItemsList = new ArrayList<WithItem>();
 	WithItem with = null;
 }
 {
@@ -612,7 +612,7 @@ WithItem WithItem():
 {
 	WithItem with = new WithItem();
 	String name = null;
-	List selectItems = null;
+	List<SelectItem> selectItems = null;
 	SelectBody selectBody = null;
 }
 {
@@ -625,7 +625,7 @@ WithItem WithItem():
 
 List SelectItemsList():
 { 
-	ArrayList selectItemsList = new ArrayList();
+	ArrayList<SelectItem> selectItemsList = new ArrayList<SelectItem>();
 	SelectItem selectItem = null; 
 }
 { 
@@ -730,7 +730,7 @@ FromItem SubJoin():
 
 List JoinsList():
 {
-	ArrayList joinsList = new ArrayList();
+	ArrayList<Join> joinsList = new ArrayList<Join>();
 	Join join = null; 
 }
 {
@@ -746,7 +746,7 @@ Join JoinerExpression():
 	FromItem right = null;
 	Expression onExpression = null;
 	Column tableColumn;
-	List columns = null;
+	List<Column> columns = null;
 }
 {
 

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

@@ -633,6 +633,12 @@ public void testSelectFunction() throws JSQLParserException {
 	      String statement = "SELECT 1+2 AS sum";
 	      parserManager.parse( new StringReader( statement ) );
 	}
+	
+	
+	public void testWeirdSelect() throws JSQLParserException {
+	    String sql = "select r.reviews_id, substring(rd.reviews_text, 100) as reviews_text, r.reviews_rating, r.date_added, r.customers_name from reviews r, reviews_description rd where r.products_id = '19' and r.reviews_id = rd.reviews_id and rd.languages_id = '1' and r.reviews_status = 1 order by r.reviews_id desc limit 0, 6";
+	    parserManager.parse( new StringReader( sql ) );
+	}
 
 	public static void main(String[] args) {
 		junit.swingui.TestRunner.run(SelectTest.class);