Merge lp:~oontvoo/akiban-sql-parser/optional_semi into lp:~akiban-technologies/akiban-sql-parser/trunk

[Vy Nguyen]

allow optional semicolon at the end

[lp:~oontvoo/akiban-sql-parser/optional_semi]

299. By Vy Nguyen on 2013-03-20

more tests with and without SEMI at the end

300. By Vy Nguyen on 2013-03-20

rename misleading test

[Nathan Williams (nwilliams)]

The grammar and API already provide for this in the existing via Statement/parseStatement and StatementList/parseStatements.

I don't think conflating the two at this level adds much benefit.

[Vy Nguyen (oontvoo)]

Ah, Ok, I'm not insisting on this change. I wasn't aware that you could allow the semicolon with the current parser?

Unmerged revisions

300. By Vy Nguyen on 2013-03-20

rename misleading test

299. By Vy Nguyen on 2013-03-20

more tests with and without SEMI at the end

298. By Vy Nguyen on 2013-03-20

clean up

297. By Vy Nguyen on 2013-03-20

rewrite conditions to avoid warnings

296. By Vy Nguyen on 2013-03-20

add lookahead to disallow duplicate SEMI

295. By Vy Nguyen on 2013-03-20

add lookahead to disallow duplicate SEMI

294. By Vy Nguyen on 2013-03-20

add tests

293. By Vy Nguyen on 2013-03-20

allow optional SEMI at the end

=== modified file 'src/main/javacc/SQLGrammar.jj'
--- src/main/javacc/SQLGrammar.jj	2013-02-25 00:17:53 +0000
+++ src/main/javacc/SQLGrammar.jj	2013-03-20 17:29:21 +0000
@@ -2909,7 +2909,7 @@
     StatementNode statementNode;
 }
 {
-    statementNode = StatementPart(null) <EOF>
+    statementNode = StatementPart(null) [<SEMICOLON>] <EOF>
     {
         return statementNode;
     }
@@ -2922,8 +2922,20 @@
 }
 {
     statementListElement(list, tokenHolder)
-    ( <SEMICOLON> [ statementListElement(list, tokenHolder) ] )*
-    <EOF>
+(
+    LOOKAHEAD ( {getToken(1).kind != EOF && getToken(2).kind != EOF } )
+    (
+        (
+          <SEMICOLON>[statementListElement(list, tokenHolder)]
+        )*
+        <EOF>
+    )
+    |
+    (
+        [<SEMICOLON>]
+        <EOF>
+    )
+)
 }
 
 void

=== modified file 'src/test/resources/com/akiban/sql/parser/alter-table-1.error'
--- src/test/resources/com/akiban/sql/parser/alter-table-1.error	2012-11-30 19:02:16 +0000
+++ src/test/resources/com/akiban/sql/parser/alter-table-1.error	2013-03-20 17:29:21 +0000
@@ -3,4 +3,5 @@
     <EOF> 
     "cascade" ...
     "restrict" ...
+    ";" ...
     
\ No newline at end of file

=== modified file 'src/test/resources/com/akiban/sql/parser/alter-table-2.error'
--- src/test/resources/com/akiban/sql/parser/alter-table-2.error	2012-11-30 19:02:16 +0000
+++ src/test/resources/com/akiban/sql/parser/alter-table-2.error	2013-03-20 17:29:21 +0000
@@ -1,4 +1,5 @@
 com.akiban.sql.parser.SQLParserException: Encountered " "," ", "" at line 1, column 25.
-Was expecting:
+Was expecting one of:
     <EOF> 
+    ";" ...
     
\ No newline at end of file

=== modified file 'src/test/resources/com/akiban/sql/parser/mysql-1x.error'
--- src/test/resources/com/akiban/sql/parser/mysql-1x.error	2012-05-16 00:15:22 +0000
+++ src/test/resources/com/akiban/sql/parser/mysql-1x.error	2013-03-20 17:29:21 +0000
@@ -20,4 +20,5 @@
     "offset" ...
     "limit" ...
     "," ...
+    ";" ...
     
\ No newline at end of file

=== modified file 'src/test/resources/com/akiban/sql/parser/mysql-2x.error'
--- src/test/resources/com/akiban/sql/parser/mysql-2x.error	2012-05-16 00:15:22 +0000
+++ src/test/resources/com/akiban/sql/parser/mysql-2x.error	2013-03-20 17:29:21 +0000
@@ -20,4 +20,5 @@
     "offset" ...
     "limit" ...
     "," ...
+    ";" ...
     
\ No newline at end of file

=== modified file 'src/test/resources/com/akiban/sql/parser/mysql-4x.error'
--- src/test/resources/com/akiban/sql/parser/mysql-4x.error	2012-05-16 00:15:22 +0000
+++ src/test/resources/com/akiban/sql/parser/mysql-4x.error	2013-03-20 17:29:21 +0000
@@ -17,4 +17,5 @@
     "with" ...
     "offset" ...
     "limit" ...
+    ";" ...
     
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/test-no-semi-2.expected'
--- src/test/resources/com/akiban/sql/parser/test-no-semi-2.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/test-no-semi-2.expected	2013-03-20 17:29:21 +0000
@@ -0,0 +1,32 @@
+com.akiban.sql.parser.CursorNode@4253c155
+name: null
+updateMode: UNSPECIFIED
+statementType: SELECT
+resultSet: 	
+	com.akiban.sql.parser.SelectNode@8b9d578
+	isDistinct: false
+	resultColumns: 		
+		com.akiban.sql.parser.ResultColumnList@606dbdc1
+
+		[0]:		
+		com.akiban.sql.parser.ResultColumn@44c4fb5c
+		exposedName: null
+		name: null
+		tableName: null
+		isDefaultColumn: false
+		type: null
+		expression: 			
+			com.akiban.sql.parser.BinaryArithmeticOperatorNode@60527849
+			operator: +
+			methodName: plus
+			type: null
+			leftOperand: 				
+				com.akiban.sql.parser.NumericConstantNode@46573206
+				value: 2
+				type: INTEGER NOT NULL
+			rightOperand: 				
+				com.akiban.sql.parser.NumericConstantNode@6954bfe
+				value: 3
+				type: INTEGER NOT NULL
+	fromList: 		
+		com.akiban.sql.parser.FromList@33b01412
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/test-no-semi-2.sql'
--- src/test/resources/com/akiban/sql/parser/test-no-semi-2.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/test-no-semi-2.sql	2013-03-20 17:29:21 +0000
@@ -0,0 +1,1 @@
+SELECT 2 + 3

=== added file 'src/test/resources/com/akiban/sql/parser/test-semi-1.expected'
--- src/test/resources/com/akiban/sql/parser/test-semi-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/test-semi-1.expected	2013-03-20 17:29:21 +0000
@@ -0,0 +1,32 @@
+com.akiban.sql.parser.CursorNode@4253c155
+name: null
+updateMode: UNSPECIFIED
+statementType: SELECT
+resultSet: 	
+	com.akiban.sql.parser.SelectNode@8b9d578
+	isDistinct: false
+	resultColumns: 		
+		com.akiban.sql.parser.ResultColumnList@606dbdc1
+
+		[0]:		
+		com.akiban.sql.parser.ResultColumn@44c4fb5c
+		exposedName: null
+		name: null
+		tableName: null
+		isDefaultColumn: false
+		type: null
+		expression: 			
+			com.akiban.sql.parser.BinaryArithmeticOperatorNode@60527849
+			operator: +
+			methodName: plus
+			type: null
+			leftOperand: 				
+				com.akiban.sql.parser.NumericConstantNode@46573206
+				value: 2
+				type: INTEGER NOT NULL
+			rightOperand: 				
+				com.akiban.sql.parser.NumericConstantNode@6954bfe
+				value: 3
+				type: INTEGER NOT NULL
+	fromList: 		
+		com.akiban.sql.parser.FromList@33b01412
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/test-semi-1.sql'
--- src/test/resources/com/akiban/sql/parser/test-semi-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/test-semi-1.sql	2013-03-20 17:29:21 +0000
@@ -0,0 +1,1 @@
+SELECT 2 + 3;
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/test-semi-3.expected'
--- src/test/resources/com/akiban/sql/parser/test-semi-3.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/test-semi-3.expected	2013-03-20 17:29:21 +0000
@@ -0,0 +1,32 @@
+com.akiban.sql.parser.CursorNode@65bbd743
+name: null
+updateMode: UNSPECIFIED
+statementType: SELECT
+resultSet: 	
+	com.akiban.sql.parser.SelectNode@f31a3e3
+	isDistinct: false
+	resultColumns: 		
+		com.akiban.sql.parser.ResultColumnList@3fe93e0
+
+		[0]:		
+		com.akiban.sql.parser.ResultColumn@3e9e592c
+		exposedName: null
+		name: null
+		tableName: null
+		isDefaultColumn: false
+		type: null
+		expression: 			
+			com.akiban.sql.parser.BinaryArithmeticOperatorNode@df077d2
+			operator: +
+			methodName: plus
+			type: null
+			leftOperand: 				
+				com.akiban.sql.parser.NumericConstantNode@264a8324
+				value: 2
+				type: INTEGER NOT NULL
+			rightOperand: 				
+				com.akiban.sql.parser.NumericConstantNode@65e7c41f
+				value: 3
+				type: INTEGER NOT NULL
+	fromList: 		
+		com.akiban.sql.parser.FromList@52fd037d
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/test-semi-3.sql'
--- src/test/resources/com/akiban/sql/parser/test-semi-3.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/test-semi-3.sql	2013-03-20 17:29:21 +0000
@@ -0,0 +1,2 @@
+SELECT 2 + 3 
+;
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/multiple/multiple-4.expected'
--- src/test/resources/com/akiban/sql/unparser/multiple/multiple-4.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/multiple/multiple-4.expected	2013-03-20 17:29:21 +0000
@@ -0,0 +1,3 @@
+[0]: SELECT (3 + 3);
+[1]: SELECT (4 + 6);
+[2]: SELECT (6 + 3);
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/multiple/multiple-4.sql'
--- src/test/resources/com/akiban/sql/unparser/multiple/multiple-4.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/multiple/multiple-4.sql	2013-03-20 17:29:21 +0000
@@ -0,0 +1,3 @@
+SELECT 3 + 3;
+SELECT 4 + 6;
+SELECT 6 + 3;
\ No newline at end of file