db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r425820 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/sql/dictionary/SPSDescriptor.java impl/sql/catalog/DataDictionaryImpl.java impl/sql/execute/CreateTriggerConstantAction.java
Date Wed, 26 Jul 2006 19:53:17 GMT
Author: djd
Date: Wed Jul 26 12:53:16 2006
New Revision: 425820

URL: http://svn.apache.org/viewvc?rev=425820&view=rev
Log:
Cleanup of SPSDescriptor to remove setting of unused field paramDefaults.
Field still exists more work to do remove it entirely

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java?rev=425820&r1=425819&r2=425820&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
Wed Jul 26 12:53:16 2006
@@ -154,7 +154,10 @@
 	private	ExecPreparedStatement	preparedStatement;
 	private	DataTypeDescriptor		params[];
 	private	Timestamp				compileTime;
-	private	Object					paramDefaults[];
+	/**
+	 * Old code - never used.
+	 */
+	private Object			paramDefaults[];
 	private	boolean					initiallyCompilable;
 	private	boolean					lookedUpParams;
 	
@@ -173,11 +176,6 @@
 	 * @param	type	type
 	 * @param 	valid	is the sps valid
 	 * @param 	text	the text for this statement
-	 * @param 	usingText	the text for the USING clause supplied to
-	 *					CREATE or ALTER STATEMENT
-	 * @param	paramDefaults	default values for the parameters (if
-	 *					any) in this statement.  Generated by a USING
-	 *					clause, for use by the optimizer.
 	 * @param	initiallyCompilable	is the statement initially compilable?
 	 *
 	 * @exception StandardException on error
@@ -191,12 +189,10 @@
 				char				type,
 			   	boolean				valid,
 			   	String				text,
-				String				usingText,
-				Object[]			paramDefaults,
 				boolean				initiallyCompilable ) throws StandardException
 	{
-		this( dataDictionary, name, uuid, suuid, compSchemaUUID, type, valid, text, usingText,
null, null, initiallyCompilable );
-		this.paramDefaults = paramDefaults;
+		this( dataDictionary, name, uuid, suuid, compSchemaUUID,
+				type, valid, text, (String) null, null, null, initiallyCompilable );
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=425820&r1=425819&r2=425820&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
Wed Jul 26 12:53:16 2006
@@ -8289,8 +8289,6 @@
 												   SPSDescriptor.SPS_TYPE_REGULAR,
 												   !nocompile,		// it is valid, unless nocompile
 												   spsText, //sps text
-												   (String)null,	// using text
-												   (Object[])null, //	paramDefaults,
 												   !nocompile );
 			
 			addSPSDescriptor(spsd, tc, true);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java?rev=425820&r1=425819&r2=425820&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
Wed Jul 26 12:53:16 2006
@@ -354,8 +354,6 @@
 									SPSDescriptor.SPS_TYPE_TRIGGER,
 									true,				// it is valid
 									text,				// the text
-									(String)null,		// no using clause
-									(Object[])null,
 									true );	// no defaults
 
 		/*



Mime
View raw message