db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1530913 - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
Date Thu, 10 Oct 2013 10:57:58 GMT
Author: kahatlen
Date: Thu Oct 10 10:57:58 2013
New Revision: 1530913

URL: http://svn.apache.org/r1530913
Log:
DERBY-6371: DROP COLUMN looks in wrong schema when checking trigger dependencies

Fix another occurrence where the wrong schema is used. This occurrence
doesn't cause any problems currently, since it's only used for
parsing, and the problems wouldn't appear until one attempt to do
binding with the incorrect schema. Fix it anyway for consistency.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java?rev=1530913&r1=1530912&r2=1530913&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
Thu Oct 10 10:57:58 2013
@@ -374,14 +374,13 @@ public class TriggerDescriptor extends U
 					isRow &&
 					usesReferencingClause)
 		{
-			SchemaDescriptor compSchema;
-			compSchema = getDataDictionary().getSchemaDescriptor(triggerSchemaId, null);
-			CompilerContext newCC = lcc.pushCompilerContext(compSchema);
+            CompilerContext newCC = lcc.pushCompilerContext(
+                    dd.getSchemaDescriptor(actionSPS.getCompSchemaId(), null));
 			Parser	pa = newCC.getParser();
 			Visitable stmtnode = pa.parseStatement(triggerDefinition);
 			lcc.popCompilerContext(newCC);
 					
-			actionSPS.setText(getDataDictionary().getTriggerActionString(stmtnode, 
+            actionSPS.setText(dd.getTriggerActionString(stmtnode,
 					oldReferencingName,
 					newReferencingName,
 					triggerDefinition,



Mime
View raw message