db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r373580 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile: CallStatementNode.java sqlgrammar.jj
Date Mon, 30 Jan 2006 20:29:46 GMT
Author: djd
Date: Mon Jan 30 12:29:41 2006
New Revision: 373580

URL: http://svn.apache.org/viewcvs?rev=373580&view=rev
Log:
Minor cleanup for CallStatementNode, remove unused field methodName and unused method getMethodCallNode.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java?rev=373580&r1=373579&r2=373580&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
Mon Jan 30 12:29:41 2006
@@ -66,7 +66,6 @@
  */
 public class CallStatementNode extends DMLStatementNode
 {
-	private String		methodName;
 	private ValueNode	methodCall;
 
 	/* Need to track any subqueries under the methodCall */
@@ -78,16 +77,13 @@
 	/**
 	 * Initializer for a CallStatementNode.
 	 *
-	 * @param methodName		The method name
 	 * @param methodCall		The expression to "call"
 	 * @exception StandardException		Thrown on error
 	 */
 
-	public void init(Object methodName, Object methodCall)
-		throws StandardException
+	public void init(Object methodCall)
 	{
-		init(null);
-		this.methodName = (String) methodName;
+		super.init(null);
 		this.methodCall = (ValueNode) methodCall;
 		((JavaToSQLValueNode)methodCall).getJavaValueNode().markForCallStatement();
 	}
@@ -103,7 +99,7 @@
 	{
 		if (SanityManager.DEBUG)
 		{
-			return "methodName: " + methodName + "\n" +
+			return "CALL " + methodCall.toString() + "\n" +
 				super.toString();
 		}
 		else
@@ -325,26 +321,6 @@
 		}
 
 		return returnNode;
-	}
-
-	/////////////////////////////////////////////////////////////////////
-	//
-	//	ACCESSORS
-	//
-	/////////////////////////////////////////////////////////////////////
-
-	/**
-	  *	Get the method call node.
-	  *
-	  *	@return	the method call node.
-	  */
-	public	MethodCallNode	getMethodCallNode()
-	{
-		JavaToSQLValueNode	jnode = (JavaToSQLValueNode) methodCall;
-
-		MethodCallNode		mnode = (MethodCallNode) jnode.getJavaValueNode();
-
-		return mnode;
 	}
 }
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=373580&r1=373579&r2=373580&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Mon Jan
30 12:29:41 2006
@@ -3283,7 +3283,6 @@
 bareCallStatement() throws StandardException :
 {
 	ParameterNode		returnParam = null;
-	String				methodName = null;
 	ValueNode			value = null;
 	ResultSetNode		resultSetNode = null;
 }
@@ -3299,7 +3298,6 @@
 		QueryTreeNode callStatement =
 									(QueryTreeNode) nodeFactory.getNode(
 												C_NodeTypes.CALL_STATEMENT_NODE,
-												methodName,
 												value,
 												getContextManager());
 



Mime
View raw message