db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r359264 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/
Date Tue, 27 Dec 2005 19:10:42 GMT
Author: djd
Date: Tue Dec 27 11:10:36 2005
New Revision: 359264

URL: http://svn.apache.org/viewcvs?rev=359264&view=rev
Log:
Cleanup in the StatementNode hierachy. Remove the nodes
ReadCursorNode, CreateStatementNode and DropStatementNode
which added no value.

Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GrantNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RevokeNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.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/CreateAliasNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
Tue Dec 27 11:10:36 2005
@@ -61,7 +61,7 @@
  * @author Jerry Brenner
  */
 
-public class CreateAliasNode extends CreateStatementNode
+public class CreateAliasNode extends DDLStatementNode
 {
 	private String				javaClassName;
 	private String				methodName;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
Tue Dec 27 11:10:36 2005
@@ -63,7 +63,7 @@
  * @author Jeff Lichtman
  */
 
-public class CreateIndexNode extends CreateStatementNode
+public class CreateIndexNode extends DDLStatementNode
 {
 	boolean				unique;
 	DataDictionary		dd = null;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
Tue Dec 27 11:10:36 2005
@@ -49,7 +49,7 @@
  * @author Jeff Lichtman
  */
 
-public class CreateTableNode extends CreateStatementNode
+public class CreateTableNode extends DDLStatementNode
 {
 	private char				lockGranularity;
 	private boolean				onCommitDeleteRows; //If true, on commit delete rows else on commit preserve
rows of temporary table.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
Tue Dec 27 11:10:36 2005
@@ -66,7 +66,7 @@
  * @author jamie
  */
 
-public class CreateTriggerNode extends CreateStatementNode
+public class CreateTriggerNode extends DDLStatementNode
 {
 	private	TableName			triggerName;
 	private	TableName			tableName;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
Tue Dec 27 11:10:36 2005
@@ -59,7 +59,7 @@
  * @author Jerry Brenner
  */
 
-public class CreateViewNode extends CreateStatementNode
+public class CreateViewNode extends DDLStatementNode
 {
 	ResultColumnList	resultColumns;
 	ResultSetNode		queryExpression;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java Tue
Dec 27 11:10:36 2005
@@ -56,7 +56,7 @@
  * @author Jeff Lichtman
  */
 
-public class CursorNode extends ReadCursorNode
+public class CursorNode extends DMLStatementNode
 {
 	public final static int UNSPECIFIED = 0;
 	public final static int READ_ONLY = 1;
@@ -74,13 +74,12 @@
 	*/
 	private Vector	updatableColumns;
 	private FromTable updateTable;
-	private ResultColumnList	targetColumns;
 	private ResultColumnDescriptor[]	targetColumnDescriptors;
 
 	//If cursor references session schema tables, save the list of those table names in savedObjects
in compiler context
 	//Following is the position of the session table names list in savedObjects in compiler
context
 	//At generate time, we save this position in activation for easy access to session table
names list from compiler context
-	protected int indexOfSessionTableNamesInSavedObjects = -1;
+	private int indexOfSessionTableNamesInSavedObjects = -1;
 
 	/**
 	 * Initializer for a CursorNode
@@ -111,16 +110,8 @@
 		init(resultSet);
 		this.name = (String) name;
 		this.statementType = (String) statementType;
-		if (orderByList != null)
-		{
-			// The above "if" is redundant but jdk118 will load
-			// OrderByList.class even if orderByList is null; i.e
-			// this.orderByList = (OrderByList)null; 
-			// will load orderByList.class-- this is a cheap way to not load
-			// this class under jdk118. 
-			// :) 
-			this.orderByList = (OrderByList) orderByList;
-		}
+		this.orderByList = (OrderByList) orderByList;
+
 		this.updateMode = ((Integer) updateMode).intValue();
 		this.updatableColumns = (Vector) updatableColumns;
 
@@ -247,8 +238,35 @@
 			orderByList.pullUpOrderByColumns(resultSet);
 		}
 
+		FromList	fromList = (FromList) getNodeFactory().getNode(
+				C_NodeTypes.FROM_LIST,
+				getNodeFactory().doJoinOrderOptimization(),
+				getContextManager());
+
+		/* Check for ? parameters directly under the ResultColums */
+		resultSet.rejectParameters();
+
 		super.bind(dataDictionary);
 
+		// bind the query expression
+		resultSet.bindResultColumns(fromList);
+
+		// this rejects any untyped nulls in the select list
+		// pass in null to indicate that we don't have any
+		// types for this node
+		resultSet.bindUntypedNullsToResultColumns(null);
+
+		// Reject any XML values in the select list; JDBC doesn't
+		// define how we bind these out, so we don't allow it.
+		resultSet.rejectXMLValues();
+
+		/* Verify that all underlying ResultSets reclaimed their FromList */
+		if (SanityManager.DEBUG) {
+			SanityManager.ASSERT(fromList.size() == 0,
+					"fromList.size() is expected to be 0, not "
+							+ fromList.size()
+							+ " on return from RS.bindExpressions()");
+		}
 		// bind the order by
 		if (orderByList != null)
 		{
@@ -548,8 +566,11 @@
 		// result set of the statement.
 		resultSet.markStatementResultSet();
 
-	    // this will generate an expression that will be a ResultSet
-        super.generate(acb, mb);
+		generateAuthorizeCheck(acb, mb,
+				org.apache.derby.iapi.sql.conn.Authorizer.SQL_SELECT_OP);
+
+		// this will generate an expression that will be a ResultSet
+	    resultSet.generate(acb, mb);
 
 		/*
 		** Generate the position code if this cursor is updatable.  This
@@ -615,7 +636,7 @@
 		the target table (this may contain non-updatable columns).
 	 * @exception StandardException		Thrown on error
 	 */
-	public ResultColumnDescriptor[] genTargetResultColList()
+	private ResultColumnDescriptor[] genTargetResultColList()
 		throws StandardException
 	{
 		ResultColumnList newList;
@@ -663,7 +684,6 @@
 		}
 
 		// we save the result so we only do this once
-		targetColumns = newList;
 		targetColumnDescriptors = newList.makeResultDescriptors();
 		return targetColumnDescriptors;
 	}
@@ -768,5 +788,10 @@
 		updatableColumns.copyInto(names);
 
 		return names;
+	}
+	
+	public String getXML()
+	{
+		return null;
 	}
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
Tue Dec 27 11:10:36 2005
@@ -45,7 +45,7 @@
  * @author Jeff Lichtman
  */
 
-public abstract class DDLStatementNode extends StatementNode
+abstract class DDLStatementNode extends StatementNode
 {
 	/////////////////////////////////////////////////////////////////////////
 	//

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
Tue Dec 27 11:10:36 2005
@@ -89,7 +89,7 @@
  * @author Jamie
  */
 
-public abstract class DMLModStatementNode extends DMLStatementNode
+abstract class DMLModStatementNode extends DMLStatementNode
 {
 //	protected DataDictionary	dataDictionary;
 	protected FromVTI			targetVTI;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
Tue Dec 27 11:10:36 2005
@@ -67,7 +67,7 @@
  * @author Jeff Lichtman
  */
 
-public abstract class DMLStatementNode extends StatementNode
+abstract class DMLStatementNode extends StatementNode
 {
 
 	/**
@@ -84,10 +84,8 @@
 	 * representing the keys will be added after parsing (perhaps in
 	 * the binding phase?).
 	 *
-	 * RESOLVE: This is public so RepDeleteNode can see it. Perhaps it should
-	 * hava a public accessor function.
 	 */
-	public ResultSetNode	resultSet;
+	ResultSetNode	resultSet;
 
 	/**
 	 * Initializer for a DMLStatementNode

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java Tue
Dec 27 11:10:36 2005
@@ -93,7 +93,7 @@
 public class DeleteNode extends DMLModStatementNode
 {
 	/* Column name for the RowLocation column in the ResultSet */
-	public static final String COLUMNNAME = "###RowLocationToDelete";
+	private static final String COLUMNNAME = "###RowLocationToDelete";
 
 	/* Filled in by bind. */
 	protected boolean				deferred;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java Tue
Dec 27 11:10:36 2005
@@ -45,7 +45,7 @@
  * @author Jerry Brenner
  */
 
-public class DropAliasNode extends DropStatementNode
+public class DropAliasNode extends DDLStatementNode
 {
 	private char aliasType;
 	private char nameSpace;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java Tue
Dec 27 11:10:36 2005
@@ -46,10 +46,10 @@
  * @author Jeff Lichtman
  */
 
-public class DropIndexNode extends DropStatementNode
+public class DropIndexNode extends DDLStatementNode
 {
-	ConglomerateDescriptor	cd;
-	TableDescriptor			td;
+	private ConglomerateDescriptor	cd;
+	private TableDescriptor			td;
 
 	public String statementToString()
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
Tue Dec 27 11:10:36 2005
@@ -35,7 +35,7 @@
  * @author jamie
  */
 
-public class DropSchemaNode extends DropStatementNode
+public class DropSchemaNode extends DDLStatementNode
 {
 	private int			dropBehavior;
 	private String		schemaName;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java Tue
Dec 27 11:10:36 2005
@@ -50,7 +50,7 @@
  * @author Jerry Brenner
  */
 
-public class DropTableNode extends DropStatementNode
+public class DropTableNode extends DDLStatementNode
 {
 	private long		conglomerateNumber;
 	private int			dropBehavior;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
Tue Dec 27 11:10:36 2005
@@ -37,7 +37,7 @@
  *
  * @author Jamie
  */
-public class DropTriggerNode extends DropStatementNode
+public class DropTriggerNode extends DDLStatementNode
 {
 	private TableDescriptor td;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java Tue
Dec 27 11:10:36 2005
@@ -41,7 +41,7 @@
  * @author Jerry Brenner
  */
 
-public class DropViewNode extends DropStatementNode
+public class DropViewNode extends DDLStatementNode
 {
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GrantNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GrantNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GrantNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GrantNode.java Tue Dec
27 11:10:36 2005
@@ -34,8 +34,8 @@
  */
 public class GrantNode extends MiscellaneousStatementNode
 {
-	PrivilegeNode privileges;
-	List grantees;
+	private PrivilegeNode privileges;
+	private List grantees;
 
 	/**
 	 * Convert this object to a String.  See comments in QueryTreeNode.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
Tue Dec 27 11:10:36 2005
@@ -45,7 +45,7 @@
  * @author Jerry Brenner
  */
 
-public abstract class MiscellaneousStatementNode extends StatementNode
+abstract class MiscellaneousStatementNode extends StatementNode
 {
 
 	int activationKind()

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RevokeNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RevokeNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RevokeNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RevokeNode.java Tue
Dec 27 11:10:36 2005
@@ -34,8 +34,8 @@
  */
 public class RevokeNode extends MiscellaneousStatementNode
 {
-    PrivilegeNode privileges;
-    List grantees;
+    private PrivilegeNode privileges;
+    private List grantees;
 
 	/**
 	 * Convert this object to a String.  See comments in QueryTreeNode.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java Tue
Dec 27 11:10:36 2005
@@ -59,7 +59,7 @@
 *	5/8/97	Rick Hilleags	Moved node-name-string to child classes.
 */
 
-public abstract class StatementNode extends QueryTreeNode
+abstract class StatementNode extends QueryTreeNode
 {
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java?rev=359264&r1=359263&r2=359264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
Tue Dec 27 11:10:36 2005
@@ -32,7 +32,7 @@
  * @author Ames Carlson
  */
 
-public abstract class TransactionStatementNode extends StatementNode
+abstract class TransactionStatementNode extends StatementNode
 {
 	int activationKind()
 	{

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=359264&r1=359263&r2=359264&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 Tue Dec
27 11:10:36 2005
@@ -97,7 +97,7 @@
 import org.apache.derby.impl.sql.compile.ValueNodeList;
 import org.apache.derby.impl.sql.compile.GroupByColumn;
 import org.apache.derby.impl.sql.compile.CurrentDatetimeOperatorNode;
-import org.apache.derby.impl.sql.compile.CreateStatementNode;
+import org.apache.derby.impl.sql.compile.DDLStatementNode;
 import org.apache.derby.impl.sql.compile.AlterTableNode;
 
 import org.apache.derby.impl.sql.compile.StringSlicer;
@@ -11378,7 +11378,7 @@
 			if ( cdn.isAutoincrementColumn())
 				throw StandardException.newException(SQLState.LANG_ALTER_TABLE_AUTOINCREMENT_COLUMN_NOT_ALLOWED);
 		}
-		changeType[0] = CreateStatementNode.ADD_TYPE;
+		changeType[0] = DDLStatementNode.ADD_TYPE;
 		tableElementList.addTableElement(tableElement);
 		return lockGranularity;
 	}
@@ -11386,7 +11386,7 @@
 	<ALTER> [ <COLUMN> ] columnName = identifier(Limits.MAX_IDENTIFIER_LENGTH, true)
<SET>
 		typeDescriptor = DB2AlterColumn(autoIncrementInfo)
 	{
-		changeType[0] = CreateStatementNode.MODIFY_TYPE;
+		changeType[0] = DDLStatementNode.MODIFY_TYPE;
 		/* typeDescriptor is not null for MODIFY_COLUMN_TYPE_NODE */
 		if (typeDescriptor != null)
 			tableElementList.addTableElement((TableElementNode) nodeFactory.getNode(
@@ -11411,14 +11411,14 @@
                         || getToken(2).kind == CHECK)} )
 	tableElement = dropTableConstraintDefinition()
 	{
-		changeType[0] = CreateStatementNode.DROP_TYPE;
+		changeType[0] = DDLStatementNode.DROP_TYPE;
 		tableElementList.addTableElement(tableElement);
 		return lockGranularity;
 	}
 |
 	lockGranularity = DB2lockGranularityClause()
 	{
-		changeType[0] = CreateStatementNode.LOCKING_TYPE;
+		changeType[0] = DDLStatementNode.LOCKING_TYPE;
 		return lockGranularity;
 	}
 }



Mime
View raw message