Added support for select without from-list ( SELECT 1 + 2 )

Modified test cases for test resources in src/test/resources

Author: cbockermann

.classpath

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="classes" path="src"/>
-	<classpathentry kind="src" output="testclasses" path="testsrc"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="testlib/junit.jar"/>
-	<classpathentry kind="output" path="classes"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="src" output="target/classes" path="target/generated-sources/javacc">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.project

@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,6 @@
+#Fri Sep 16 21:59:46 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,5 @@
+#Fri Sep 16 21:59:45 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

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

@@ -170,6 +170,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_INTO:"INTO">
 |   <K_NULL:"NULL">
 |   <K_LIKE:"LIKE">
+|   <K_REGEXP:"REGEXP">
 |   <K_DROP:"DROP">
 |   <K_JOIN:"JOIN">
 |   <K_LEFT:"LEFT">
@@ -538,9 +539,9 @@ PlainSelect PlainSelect():
 
      // TODO
     [IntoClause()]
-    <K_FROM>
+    [<K_FROM>
     fromItem=FromItem()
-    joins=JoinsList()
+    joins=JoinsList()]
     [ where=WhereClause() { plainSelect.setWhere(where); }]
     [ groupByColumnReferences=GroupByColumnReferences() { plainSelect.setGroupByColumnReferences(groupByColumnReferences); }]
     [ having=Having() { plainSelect.setHaving(having); }]
@@ -550,7 +551,7 @@ PlainSelect PlainSelect():
 	{ 
 		plainSelect.setSelectItems(selectItems);
 		plainSelect.setFromItem(fromItem);
-		if (joins.size() > 0)
+		if (joins != null && joins.size() > 0)
 			plainSelect.setJoins(joins);
 		return plainSelect; 
 	}

src/test/java/net/sf/jsqlparser/test/create/CreateTableTest.java

@@ -1,8 +1,7 @@
 package net.sf.jsqlparser.test.create;
 
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
+import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -38,9 +37,7 @@ public void testCreateTable() throws JSQLParserException {
 	}
 
 	public void testRUBiSCreateList() throws Exception {
-
-		BufferedReader in = new BufferedReader(new FileReader("testfiles" + File.separator
-				+ "RUBiS-create-requests.txt"));
+	    BufferedReader in = new BufferedReader( new InputStreamReader( CreateTableTest.class.getResourceAsStream( "/RUBiS-create-requests.txt" ) ) );
 		TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
 
 		try {

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

@@ -628,6 +628,11 @@ public void testBitwise() throws JSQLParserException {
 		assertEquals(statement, parsed.toString());
 		assertEquals(statement, deParser.getBuffer().toString());
 	}
+	
+	public void testSelectFunction() throws JSQLParserException {
+	      String statement = "SELECT 1+2 AS sum";
+	      parserManager.parse( new StringReader( statement ) );
+	}
 
 	public static void main(String[] args) {
 		junit.swingui.TestRunner.run(SelectTest.class);

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

@@ -1,8 +1,7 @@
 package net.sf.jsqlparser.test.select;
 
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
+import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -16,6 +15,7 @@
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.test.TestException;
+import net.sf.jsqlparser.test.create.CreateTableTest;
 import net.sf.jsqlparser.test.simpleparsing.CCJSqlParserManagerTest;
 import net.sf.jsqlparser.test.tablesfinder.TablesNamesFinder;
 
@@ -29,7 +29,7 @@ public SpeedTest(String arg0) {
 
 	public void testSpeed() throws Exception {
 		// all the statements in testfiles/simple_parsing.txt
-		BufferedReader in = new BufferedReader(new FileReader("testfiles" + File.separator + "simple_parsing.txt"));
+        BufferedReader in = new BufferedReader( new InputStreamReader( SpeedTest.class.getResourceAsStream( "/simple_parsing.txt" ) ) );
 		CCJSqlParserManagerTest d;
 		ArrayList statementsList = new ArrayList();
 
@@ -40,7 +40,7 @@ public void testSpeed() throws Exception {
 			statementsList.add(statement);
 		}
 		in.close();
-		in = new BufferedReader(new FileReader("testfiles" + File.separator + "RUBiS-select-requests.txt"));
+		in = new BufferedReader( new InputStreamReader( SpeedTest.class.getResourceAsStream( "/RUBiS-select-requests.txt" ) ) );
 
 		// all the statements in testfiles/RUBiS-select-requests.txt
 		while (true) {

src/test/java/net/sf/jsqlparser/test/simpleparsing/CCJSqlParserManagerTest.java

@@ -3,13 +3,15 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
+import java.io.InputStreamReader;
 import java.io.StringReader;
 
 import junit.framework.TestCase;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.test.TestException;
+import net.sf.jsqlparser.test.create.CreateTableTest;
 
 public class CCJSqlParserManagerTest extends TestCase {
 
@@ -23,7 +25,8 @@ public static void main(String[] args) {
 
 	public void testParse() throws Exception {
 		CCJSqlParserManager parserManager = new CCJSqlParserManager();
-		BufferedReader in = new BufferedReader(new FileReader("testfiles" + File.separator + "simple_parsing.txt"));
+		BufferedReader in = new BufferedReader( new InputStreamReader( CreateTableTest.class.getResourceAsStream( "/simple_parsing.txt" ) ) );
+
 		String statement = "";
 		while (true) {
 			try {

src/test/java/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinderTest.java

@@ -3,6 +3,7 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
+import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -13,6 +14,7 @@
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.test.TestException;
+import net.sf.jsqlparser.test.create.CreateTableTest;
 import net.sf.jsqlparser.test.simpleparsing.CCJSqlParserManagerTest;
 
 public class TablesNamesFinderTest extends TestCase {
@@ -28,8 +30,7 @@ public static void main(String[] args) {
 
 	public void testRUBiSTableList() throws Exception {
 
-		BufferedReader in = new BufferedReader(new FileReader("testfiles" + File.separator
-				+ "RUBiS-select-requests.txt"));
+	    BufferedReader in = new BufferedReader( new InputStreamReader( CreateTableTest.class.getResourceAsStream( "/RUBiS-select-requests.txt" ) ) );
 		TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
 
 		try {