Author: shawkins Date: 2011-11-22 11:25:33 -0500 (Tue, 22 Nov 2011) New Revision: 3687 Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj Log: TEIID-1842 completely removing the concept of an update procedure Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj =================================================================== --- trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2011-11-22 16:17:43 UTC (rev 3686) +++ trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2011-11-22 16:25:33 UTC (rev 3687) @@ -465,7 +465,7 @@ Command command = null; } { - (LOOKAHEAD(2) command = createUpdateProcedure(info) | + (LOOKAHEAD(2) command = createProcedure(info) | command = userCommand(info) | command = callableStatement(info) ) @@ -496,7 +496,7 @@ Command command = null; } { - (command = createUpdateProcedure(info) | + (command = createProcedure(info) | command = forEachRowTriggerAction(info)) <EOF> { @@ -550,7 +550,7 @@ } | (<PROCEDURE> target = id() <AS> { comment = getToken(1).specialToken; } stmt = statement(info)) { - CreateUpdateProcedureCommand cup = new CreateUpdateProcedureCommand(asBlock(stmt)); + CreateProcedureCommand cup = new CreateProcedureCommand(asBlock(stmt)); cup.setUpdateProcedure(false); if (comment != null) { cup.setCacheHint(getQueryCacheOption(comment.image)); @@ -1059,10 +1059,10 @@ * Parse create update procedure command * @throws ParseException if parsing failed */ -CreateUpdateProcedureCommand createUpdateProcedure(ParseInfo info) : +CreateProcedureCommand createProcedure(ParseInfo info) : { - CreateUpdateProcedureCommand updateProcCmd = - new CreateUpdateProcedureCommand(); + CreateProcedureCommand procCmd = + new CreateProcedureCommand(); Statement stmt = null; } {