You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2013/12/05 14:17:12 UTC
svn commit: r1548127 -
/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/
Author: kahatlen
Date: Thu Dec 5 13:17:11 2013
New Revision: 1548127
URL: http://svn.apache.org/r1548127
Log:
DERBY-6362: CHECK constraint uses wrong schema for unqualified routine invocations
Part 1: Make sure visitors descend into all TableName nodes.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.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/CreateSequenceNode.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/CurrentOfNode.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/DropSequenceNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetConstraintsNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java Thu Dec 5 13:17:11 2013
@@ -31,6 +31,7 @@ import org.apache.derby.iapi.services.lo
import org.apache.derby.iapi.services.loader.ClassInspector;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.compile.CompilerContext;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.dictionary.AliasDescriptor;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
@@ -733,4 +734,12 @@ class AggregateNode extends UnaryOperato
return uad instanceof UserAggregateDefinition;
}
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (userAggregateName != null) {
+ userAggregateName = (TableName) userAggregateName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java Thu Dec 5 13:17:11 2013
@@ -23,6 +23,7 @@ package org.apache.derby.impl.sql.compil
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.context.ContextManager;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.shared.common.sanity.SanityManager;
/**
@@ -81,4 +82,13 @@ class AllResultColumn extends ResultColu
public TableName getTableNameObject() {
return tableName;
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (tableName != null) {
+ tableName = (TableName) tableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java Thu Dec 5 13:17:11 2013
@@ -25,6 +25,7 @@ import org.apache.derby.iapi.error.Stand
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.services.compiler.MethodBuilder;
import org.apache.derby.iapi.services.context.ContextManager;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.store.access.Qualifier;
import org.apache.derby.iapi.types.DataTypeDescriptor;
@@ -180,4 +181,13 @@ class BaseColumnNode extends ValueNode
return false;
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (tableName != null) {
+ tableName = (TableName) tableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java Thu Dec 5 13:17:11 2013
@@ -26,6 +26,7 @@ import org.apache.derby.iapi.error.Stand
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.services.compiler.MethodBuilder;
import org.apache.derby.iapi.services.context.ContextManager;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.store.access.Qualifier;
import org.apache.derby.iapi.types.DataTypeDescriptor;
@@ -1248,4 +1249,13 @@ public class ColumnReference extends Val
void setColName(String cName) { colName = cName; }
void setSource(ResultColumn rc) { source = rc; }
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (tableName != null) {
+ tableName = (TableName) tableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java Thu Dec 5 13:17:11 2013
@@ -29,6 +29,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.services.uuid.UUIDFactory;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.depend.ProviderList;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
@@ -500,4 +501,13 @@ public class ConstraintDefinitionNode ex
}
return uuidFactory;
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (constraintName != null) {
+ constraintName = (TableName) constraintName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java?rev=1548127&r1=1548126&r2=1548127&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 Thu Dec 5 13:17:11 2013
@@ -30,6 +30,7 @@ import org.apache.derby.iapi.reference.P
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.property.PropertyUtil;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor;
import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
@@ -322,4 +323,17 @@ class CreateIndexNode extends DDLStateme
}
}
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (indexName != null) {
+ indexName = (TableName) indexName.accept(v);
+ }
+
+ if (tableName != null) {
+ tableName = (TableName) tableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSequenceNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSequenceNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSequenceNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSequenceNode.java Thu Dec 5 13:17:11 2013
@@ -28,6 +28,7 @@ import org.apache.derby.iapi.sql.diction
import org.apache.derby.iapi.types.DataTypeDescriptor;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.services.context.ContextManager;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.types.TypeId;
@@ -248,5 +249,12 @@ class CreateSequenceNode extends DDLStat
_cycle);
}
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+ if (_sequenceName != null) {
+ _sequenceName = (TableName) _sequenceName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java?rev=1548127&r1=1548126&r2=1548127&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 Thu Dec 5 13:17:11 2013
@@ -34,6 +34,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.compile.CompilerContext;
import org.apache.derby.iapi.sql.compile.Visitable;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.conn.Authorizer;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
import org.apache.derby.iapi.sql.depend.DependencyManager;
@@ -997,4 +998,16 @@ class CreateTriggerNode extends DDLState
}
}
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (triggerName != null) {
+ triggerName = (TableName) triggerName.accept(v);
+ }
+
+ if (tableName != null) {
+ tableName = (TableName) tableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java Thu Dec 5 13:17:11 2013
@@ -34,8 +34,8 @@ import org.apache.derby.iapi.sql.compile
import org.apache.derby.iapi.sql.compile.Optimizable;
import org.apache.derby.iapi.sql.compile.OptimizablePredicateList;
import org.apache.derby.iapi.sql.compile.Optimizer;
-import org.apache.derby.iapi.sql.compile.RequiredRowOrdering;
import org.apache.derby.iapi.sql.compile.RowOrdering;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor;
import org.apache.derby.iapi.sql.dictionary.ColumnDescriptorList;
import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
@@ -593,4 +593,17 @@ public final class CurrentOfNode extends
return activation.getPreparedStatement();
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (exposedTableName != null) {
+ exposedTableName = (TableName) exposedTableName.accept(v);
+ }
+
+ if (baseTableName != null) {
+ baseTableName = (TableName) baseTableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java?rev=1548127&r1=1548126&r2=1548127&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 Thu Dec 5 13:17:11 2013
@@ -30,6 +30,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.compile.CompilerContext;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.conn.Authorizer;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
@@ -485,4 +486,12 @@ abstract class DDLStatementNode extends
return fromList;
}
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (tableName != null) {
+ tableName = (TableName) tableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java?rev=1548127&r1=1548126&r2=1548127&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 Thu Dec 5 13:17:11 2013
@@ -22,7 +22,6 @@
package org.apache.derby.impl.sql.compile;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.apache.derby.catalog.DefaultInfo;
@@ -1980,9 +1979,11 @@ abstract class DMLModStatementNode exten
if (targetTableName != null)
{
- targetTableName.accept(v);
+ targetTableName = (TableName) targetTableName.accept(v);
}
+
+ if (synonymTableName != null) {
+ synonymTableName = (TableName) synonymTableName.accept(v);
+ }
}
}
-
-
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSequenceNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSequenceNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSequenceNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSequenceNode.java Thu Dec 5 13:17:11 2013
@@ -25,6 +25,7 @@ import org.apache.derby.iapi.sql.execute
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.context.ContextManager;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
import org.apache.derby.iapi.sql.dictionary.SequenceDescriptor;
@@ -90,4 +91,12 @@ class DropSequenceNode extends DDLStatem
return getGenericConstantActionFactory().getDropSequenceConstantAction(getSchemaDescriptor(), getRelativeName());
}
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (dropItem != null) {
+ dropItem = (TableName) dropItem.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java Thu Dec 5 13:17:11 2013
@@ -27,6 +27,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.loader.GeneratedClass;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.ResultDescription;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.sql.dictionary.SPSDescriptor;
import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
@@ -311,4 +312,13 @@ class ExecSPSNode extends StatementNode
{
return "EXECUTE STATEMENT";
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (name != null) {
+ name = (TableName) name.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java Thu Dec 5 13:17:11 2013
@@ -26,6 +26,7 @@ import org.apache.derby.iapi.reference.S
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.StatementType;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.conn.Authorizer;
import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
@@ -161,4 +162,13 @@ public final class FKConstraintDefinitio
{
return Authorizer.REFERENCES_PRIV;
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (refTableName != null) {
+ refTableName = (TableName) refTableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java Thu Dec 5 13:17:11 2013
@@ -4890,6 +4890,10 @@ class FromBaseTable extends FromTable
if (requalificationRestrictionList != null) {
requalificationRestrictionList.accept(v);
}
+
+ if (tableName != null) {
+ tableName = (TableName) tableName.accept(v);
+ }
}
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java Thu Dec 5 13:17:11 2013
@@ -39,6 +39,7 @@ import org.apache.derby.iapi.sql.compile
import org.apache.derby.iapi.sql.compile.OptimizablePredicateList;
import org.apache.derby.iapi.sql.compile.Optimizer;
import org.apache.derby.iapi.sql.compile.RowOrdering;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.dictionary.*;
import org.apache.derby.iapi.types.DataTypeDescriptor;
import org.apache.derby.iapi.util.JBitSet;
@@ -1522,4 +1523,17 @@ abstract class FromTable extends ResultS
{
return this.origTableName;
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (origTableName != null) {
+ origTableName = (TableName) origTableName.accept(v);
+ }
+
+ if (corrTableName != null) {
+ corrTableName = (TableName) corrTableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java Thu Dec 5 13:17:11 2013
@@ -1856,6 +1856,10 @@ class FromVTI extends FromTable implemen
{
methodCall = (MethodCallNode) methodCall.accept(v);
}
+
+ if (exposedName != null) {
+ exposedName = (TableName) exposedName.accept(v);
+ }
}
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java Thu Dec 5 13:17:11 2013
@@ -26,6 +26,7 @@ import org.apache.derby.iapi.reference.S
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.compile.CompilerContext;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.conn.Authorizer;
import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
@@ -178,4 +179,13 @@ class LockTableNode extends Miscellaneou
conglomerateNumber,
exclusiveMode);
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (tableName != null) {
+ tableName = (TableName) tableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java Thu Dec 5 13:17:11 2013
@@ -30,6 +30,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.compile.CompilerContext;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
import org.apache.derby.iapi.sql.dictionary.SequenceDescriptor;
@@ -188,4 +189,13 @@ class NextSequenceNode extends ValueNode
boolean isEquivalent(ValueNode other) throws StandardException {
return false;
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (sequenceName != null) {
+ sequenceName = (TableName) sequenceName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java Thu Dec 5 13:17:11 2013
@@ -29,6 +29,7 @@ import org.apache.derby.catalog.types.Ro
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.services.context.ContextManager;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.depend.Provider;
import org.apache.derby.iapi.sql.dictionary.AliasDescriptor;
@@ -352,4 +353,13 @@ class PrivilegeNode extends QueryTreeNod
{
return StandardException.newException( SQLState.BTREE_UNIMPLEMENTED_FEATURE );
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (objectName != null) {
+ objectName = (TableName) objectName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java Thu Dec 5 13:17:11 2013
@@ -27,6 +27,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.StatementType;
import org.apache.derby.iapi.sql.compile.CompilerContext;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor;
import org.apache.derby.iapi.sql.dictionary.ColumnDescriptorList;
import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
@@ -455,4 +456,13 @@ class RenameNode extends DDLStatementNod
parent.getDescriptorType(),
parent.getDescriptorName());
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (newTableName != null) {
+ newTableName = (TableName) newTableName.accept(v);
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetConstraintsNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetConstraintsNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetConstraintsNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetConstraintsNode.java Thu Dec 5 13:17:11 2013
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.shared.common.sanity.SanityManager;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.sql.execute.ConstantAction;
@@ -122,4 +123,14 @@ class SetConstraintsNode extends Miscell
}
}
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (constraints != null) {
+ for (int i = 0; i < constraints.size(); i++) {
+ constraints.set(i, (TableName) constraints.get(i).accept(v));
+ }
+ }
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java?rev=1548127&r1=1548126&r2=1548127&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java Thu Dec 5 13:17:11 2013
@@ -37,6 +37,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.sql.compile.CompilerContext;
+import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.conn.Authorizer;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
import org.apache.derby.iapi.sql.dictionary.AliasDescriptor;
@@ -1441,4 +1442,13 @@ class StaticMethodCallNode extends Metho
{
return Authorizer.EXECUTE_PRIV;
}
+
+ @Override
+ void acceptChildren(Visitor v) throws StandardException {
+ super.acceptChildren(v);
+
+ if (procedureName != null) {
+ procedureName = (TableName) procedureName.accept(v);
+ }
+ }
}