db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1469240 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/sql/dictionary/TriggerDescriptor.java iapi/sql/dictionary/UserDescriptor.java impl/sql/catalog/SYSTRIGGERSRowFactory.java
Date Thu, 18 Apr 2013 09:25:12 GMT
Author: kahatlen
Date: Thu Apr 18 09:25:11 2013
New Revision: 1469240

URL: http://svn.apache.org/r1469240
Log:
DERBY-6186: Encapsulation improvements

- Use DataDescriptorGenerator.newTriggerDescriptor() to build descriptor
  in SYSTRIGGERSRowFactory instead of calling constructor directly

- Make TriggerDescriptor's constructor package private

- Make UserDescriptor's constructor package private

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UserDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.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=1469240&r1=1469239&r2=1469240&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 Apr 18 09:25:11 2013
@@ -153,7 +153,7 @@ public class TriggerDescriptor extends T
 	 * @param oldReferencingName old referencing table name, if any, that appears in REFERCING
clause
 	 * @param newReferencingName new referencing table name, if any, that appears in REFERCING
clause
 	 */
-	public TriggerDescriptor
+    TriggerDescriptor
 	(
 		DataDictionary		dataDictionary,
 		SchemaDescriptor	sd,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UserDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UserDescriptor.java?rev=1469240&r1=1469239&r2=1469240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UserDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UserDescriptor.java
Thu Apr 18 09:25:11 2013
@@ -24,10 +24,6 @@ package org.apache.derby.iapi.sql.dictio
 import java.sql.Timestamp;
 import java.util.Arrays;
 
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.services.sanity.SanityManager;
-
 /**
  * A Descriptor for a user stored in SYSUSERS.
  */
@@ -47,8 +43,7 @@ public final class  UserDescriptor exten
 	 * @param password  The user's password.
 	 * @param lastModified  Time that the password was last modified.
 	 */
-
-	public UserDescriptor
+    UserDescriptor
         (
          DataDictionary dataDictionary,
          String userName,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java?rev=1469240&r1=1469239&r2=1469240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
Thu Apr 18 09:25:11 2013
@@ -25,15 +25,10 @@ import org.apache.derby.iapi.types.DataT
 import org.apache.derby.iapi.types.DataValueDescriptor;
 import org.apache.derby.iapi.types.SQLBoolean;
 import org.apache.derby.iapi.types.SQLChar;
-import org.apache.derby.iapi.types.SQLTimestamp;
 import org.apache.derby.iapi.types.SQLVarchar;
-import org.apache.derby.iapi.types.TypeId;
 import org.apache.derby.iapi.types.UserType;
 
-import org.apache.derby.iapi.types.TypeId;
-
 import org.apache.derby.iapi.types.DataValueFactory;
-import org.apache.derby.iapi.types.RowLocation;
 
 import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory;
 import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator;
@@ -42,13 +37,11 @@ import org.apache.derby.iapi.sql.diction
 import org.apache.derby.iapi.sql.dictionary.TriggerDescriptor;
 import org.apache.derby.iapi.sql.dictionary.TupleDescriptor;
 
-import org.apache.derby.iapi.sql.execute.ExecIndexRow;
 import org.apache.derby.iapi.sql.execute.ExecRow;
 import org.apache.derby.iapi.sql.execute.ExecutionFactory;
 
 import org.apache.derby.iapi.error.StandardException;
 
-import org.apache.derby.iapi.services.monitor.Monitor;
 import org.apache.derby.catalog.ReferencedColumns;
 import org.apache.derby.catalog.types.ReferencedColumnsDescriptorImpl;
 import org.apache.derby.catalog.UUID;
@@ -399,8 +392,7 @@ public class SYSTRIGGERSRowFactory exten
 		col = row.getColumn(17);
 		newReferencingName = col.getString();
 
-		descriptor = new TriggerDescriptor(
-									dd,
+        descriptor = ddg.newTriggerDescriptor(
 									dd.getSchemaDescriptor(suuid, null),
 									uuid, 
 									name, 



Mime
View raw message