db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r596490 - /db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/
Date Mon, 19 Nov 2007 23:38:46 GMT
Author: djd
Date: Mon Nov 19 15:38:43 2007
New Revision: 596490

URL: http://svn.apache.org/viewvc?rev=596490&view=rev
Log:
DERBY-1734 Merge of 564792,565902,565926 & 565933 from trunk - cleanup of system table classes. Needed to allow some merges that fix bugs

Modified:
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java Mon Nov 19 15:38:43 2007
@@ -37,10 +37,6 @@
 
 abstract class PermissionsCatalogRowFactory extends CatalogRowFactory
 {
-    static final String AUTHORIZATION_ID_TYPE = "VARCHAR";
-    static final boolean AUTHORIZATION_ID_IS_BUILTIN_TYPE = true;
-    static final int AUTHORIZATION_ID_LENGTH = Limits.MAX_IDENTIFIER_LENGTH;
-
     PermissionsCatalogRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf,
                                         boolean convertIdToLower)
     {

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -90,8 +90,6 @@
 		,"80220011-010c-bc85-060d-000000109ab8" //index3
     };
 
-    private SystemColumn[] columnList;
-
     SYSCOLPERMSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf,
                                  boolean convertIdToLower)
 	{

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -21,61 +21,38 @@
 
 package org.apache.derby.impl.sql.catalog;
 
-import org.apache.derby.iapi.reference.Property;
-
-import org.apache.derby.iapi.types.DataTypeDescriptor;
-import org.apache.derby.iapi.types.TypeId;
-import org.apache.derby.iapi.types.DataValueDescriptor;
-
-import org.apache.derby.iapi.store.raw.RawStoreFactory;
+import java.sql.Types;
+import java.util.Properties;
 
-import org.apache.derby.iapi.types.DataValueFactory;
-import org.apache.derby.iapi.sql.dictionary.SystemColumn;
-import org.apache.derby.catalog.TypeDescriptor;
+import org.apache.derby.catalog.UUID;
 import org.apache.derby.catalog.types.BaseTypeIdImpl;
-
-import org.apache.derby.iapi.types.DataValueDescriptor;
-
-import org.apache.derby.iapi.types.SQLVarchar;
-import org.apache.derby.iapi.types.TypeId;
-import org.apache.derby.iapi.types.DataTypeDescriptor;
-import org.apache.derby.iapi.types.DataValueFactory;
-import org.apache.derby.iapi.types.RowLocation;
-
+import org.apache.derby.catalog.types.DefaultInfoImpl;
+import org.apache.derby.catalog.types.TypeDescriptorImpl;
+import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.iapi.services.monitor.Monitor;
+import org.apache.derby.iapi.services.sanity.SanityManager;
+import org.apache.derby.iapi.services.uuid.UUIDFactory;
 import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory;
 import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor;
 import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator;
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
-import org.apache.derby.iapi.sql.dictionary.TableDescriptor;
+import org.apache.derby.iapi.sql.dictionary.SystemColumn;
 import org.apache.derby.iapi.sql.dictionary.TupleDescriptor;
-import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
 import org.apache.derby.iapi.sql.dictionary.UniqueTupleDescriptor;
-
-import org.apache.derby.iapi.sql.execute.ExecutionContext;
-import org.apache.derby.iapi.sql.execute.ExecutionFactory;
-import org.apache.derby.iapi.sql.execute.ExecIndexRow;
 import org.apache.derby.iapi.sql.execute.ExecRow;
-
-import org.apache.derby.iapi.error.StandardException;
-
-import org.apache.derby.iapi.services.sanity.SanityManager;
-
-import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.catalog.types.TypeDescriptorImpl;
-import org.apache.derby.catalog.DefaultInfo;
-import org.apache.derby.iapi.services.uuid.UUIDFactory;
-import org.apache.derby.catalog.UUID;
-
+import org.apache.derby.iapi.sql.execute.ExecutionFactory;
+import org.apache.derby.iapi.store.raw.RawStoreFactory;
+import org.apache.derby.iapi.types.DataTypeDescriptor;
+import org.apache.derby.iapi.types.DataValueDescriptor;
+import org.apache.derby.iapi.types.DataValueFactory;
+import org.apache.derby.iapi.types.SQLChar;
+import org.apache.derby.iapi.types.SQLInteger;
+import org.apache.derby.iapi.types.SQLLongint;
+import org.apache.derby.iapi.types.SQLVarchar;
+import org.apache.derby.iapi.types.TypeId;
 import org.apache.derby.impl.sql.compile.ColumnDefinitionNode;
 
-import org.apache.derby.catalog.types.DefaultInfoImpl;
-
-import org.apache.derby.iapi.types.*;
-
-import java.io.Serializable;
-
-import java.util.Properties;
-
 /**
  * Factory for creating a SYSCOLUMNS row.
  *
@@ -87,11 +64,6 @@
 {
 	static final String		TABLENAME_STRING = "SYSCOLUMNS";
 
-	/**
-	 * Old name for REFERENCEID, used by upgrade
-	 */
-	public static final String		OLD_REFERENCEID_NAME = "TABLEID";
-
 	protected static final int		SYSCOLUMNS_COLUMN_COUNT = 9;
 	/* Column #s for syscolumns (1 based) */
 
@@ -114,10 +86,6 @@
 	//private static final String	SYSCOLUMNS_INDEX2_NAME = "SYSCOLUMNS_INDEX2";
 	protected static final int		SYSCOLUMNS_INDEX2_ID = 1;
 
-	protected	static	final	String	REFERENCEDID_STRING = "REFERENCEID";
-	protected	static	final	String	COLUMNNAME_STRING = "COLUMNNAME";
-	protected	static	final	String	COLUMNDEFAULTID_STRING = "COLUMNDEFAULTID";
-
     private	static	final	boolean[]	uniqueness = {
 		                                               true,
 													   false
@@ -143,8 +111,6 @@
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
-	private	SystemColumn[]		columnList;
-
 	/////////////////////////////////////////////////////////////////////////////
 	//
 	//	CONSTRUCTORS
@@ -495,116 +461,21 @@
 	 */
 	public SystemColumn[]	buildColumnList()
 	{
-		if ( columnList != null ) { return columnList; }
-
-		columnList = new SystemColumn[SYSCOLUMNS_COLUMN_COUNT];
-
-		// describe columns
-
-		columnList[0] = 
-					new SystemColumnImpl(
-								convertIdCase( REFERENCEDID_STRING),			// column name
-								SYSCOLUMNS_REFERENCEID,// column number
-								0,					// precision
-								0,					// scale
-								false,				// nullability
-								"CHAR",				// dataType
-								true,				// built-in type
-								36					// maxLength
-			                   );
-
-		columnList[1] = 
-					new SystemColumnImpl(			// SQL IDENTIFIER
-								convertIdCase( COLUMNNAME_STRING),		// column name
-								SYSCOLUMNS_COLUMNNAME,	// column number
-								false				// nullability
-			                   );
-
-		columnList[2] = 
-					new SystemColumnImpl(
-								convertIdCase( "COLUMNNUMBER"),	// column name
-								SYSCOLUMNS_COLUMNNUMBER,	// column number
-								0,					// precision
-								0,					// scale
-								false,				// nullability
-								"INTEGER",				// dataType
-								true,				// built-in type
-								4					// maxLength
-							   );
-
-		columnList[3] = 
-					new SystemColumnImpl(	
-							convertIdCase( "COLUMNDATATYPE"),			// column name
-							SYSCOLUMNS_COLUMNDATATYPE,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"org.apache.derby.catalog.TypeDescriptor",	    // dataType
-							false,				// built-in type
-							TypeDescriptor.MAXIMUM_WIDTH_UNKNOWN // maxLength
-			               );
-
-		columnList[4] = 
-					new SystemColumnImpl(	
-							convertIdCase( "COLUMNDEFAULT"),			// column name
-							SYSCOLUMNS_COLUMNDEFAULT,	// column number
-							0,					// precision
-							0,					// scale
-							true,				// nullability
-							"java.io.Serializable",	    // dataType
-							false,				// built-in type
-							TypeDescriptor.MAXIMUM_WIDTH_UNKNOWN // maxLength
-			               );
-
-		columnList[5] = 
-					new SystemColumnImpl(
-								convertIdCase( COLUMNDEFAULTID_STRING),			// column name
-								SYSCOLUMNS_COLUMNDEFAULTID,// column number
-								0,					// precision
-								0,					// scale
-								true,				// nullability
-								"CHAR",				// dataType
-								true,				// built-in type
-								36					// maxLength
-			                   );
-
-		// new columns for autoincrement.
-		columnList[6] = 
-			        new SystemColumnImpl(
-							    convertIdCase( "AUTOINCREMENTVALUE"), // column name
-								SYSCOLUMNS_AUTOINCREMENTVALUE,
-								0,
-								0, 
-								true,
-								"BIGINT",
-								true,
-								TypeId.LONGINT_MAXWIDTH
-							   );
-		
-		columnList[7] = 
-			        new SystemColumnImpl(
-							    convertIdCase( "AUTOINCREMENTSTART"), // column name
-								SYSCOLUMNS_AUTOINCREMENTSTART,
-								0,
-								0, 
-								true,
-								"BIGINT",
-								true,
-								TypeId.LONGINT_MAXWIDTH
-							   );
-
-		columnList[8] = 
-			        new SystemColumnImpl(
-							    convertIdCase( "AUTOINCREMENTINC"), // column name
-								SYSCOLUMNS_AUTOINCREMENTINC,
-								0,
-								0, 
-								true,
-								"BIGINT",
-								true,
-								TypeId.LONGINT_MAXWIDTH
-							   );
+        
+        return new SystemColumn[] {
+            SystemColumnImpl.getUUIDColumn("REFERENCEID", false),
+            SystemColumnImpl.getIdentifierColumn("COLUMNNAME", false),
+            SystemColumnImpl.getColumn("COLUMNNUMBER", Types.INTEGER, false),
+            SystemColumnImpl.getJavaColumn("COLUMNDATATYPE",
+                "org.apache.derby.catalog.TypeDescriptor", false),
+            SystemColumnImpl.getJavaColumn("COLUMNDEFAULT",
+                "java.io.Serializable", true),
+            SystemColumnImpl.getUUIDColumn("COLUMNDEFAULTID", true),
+            
+            SystemColumnImpl.getColumn("AUTOINCREMENTVALUE", Types.BIGINT, true),
+            SystemColumnImpl.getColumn("AUTOINCREMENTSTART", Types.BIGINT, true),
+            SystemColumnImpl.getColumn("AUTOINCREMENTINC", Types.BIGINT, true),
 
-		return	columnList;
+       };
 	}
 }

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java Mon Nov 19 15:38:43 2007
@@ -55,6 +55,7 @@
 
 import org.apache.derby.catalog.IndexDescriptor;
 
+import java.sql.Types;
 import java.util.Properties;
 
 /**
@@ -425,106 +426,19 @@
 	 *
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
+    	        
 	public SystemColumn[]	buildColumnList()
 	{
-		int						index = 0;
-		SystemColumn[]			columnList = new SystemColumn[SYSCONGLOMERATES_COLUMN_COUNT];
-
-		// describe columns
-
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "SCHEMAID"),			// column name
-							SYSCONGLOMERATES_SCHEMAID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			               );
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "TABLEID"),			// column name
-							SYSCONGLOMERATES_TABLEID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			               );
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "CONGLOMERATENUMBER"),		// column name
-							SYSCONGLOMERATES_CONGLOMERATENUMBER,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"BIGINT",				// dataType
-							true,				// built-in type
-							TypeId.LONGINT_MAXWIDTH	// maxLength
-			               );
-
-		columnList[index++] =
-					new SystemColumnImpl(		// SQL IDENTIFIER
-							convertIdCase( "CONGLOMERATENAME"),				// column name
-							SYSCONGLOMERATES_CONGLOMERATENAME,
-							true				// nullability
-							);
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "ISINDEX"),			// column name
-							SYSCONGLOMERATES_ISINDEX,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"BOOLEAN",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			               );
-
-		columnList[index++] =
-					new SystemColumnImpl(
-							convertIdCase( "DESCRIPTOR"),				// column name
-							SYSCONGLOMERATES_DESCRIPTOR,
-							0,					// precision
-							0,					// scale
-							true,				// nullability
-							"org.apache.derby.catalog.IndexDescriptor",	// datatype
-							false,				// built-in type
-							TypeDescriptor.MAXIMUM_WIDTH_UNKNOWN
-												// maxLength
-							);
-
-		columnList[index++] =
-					new SystemColumnImpl(
-							convertIdCase( "ISCONSTRAINT"),				// column name
-							SYSCONGLOMERATES_ISCONSTRAINT,
-							0,					// precision
-							0,					// scale
-							true,				// nullability
-							"BOOLEAN",	// datatype
-							true,				// built-in type
-							1					// maxLength
-							);
-
-		columnList[index++] =
-					new SystemColumnImpl(
-							convertIdCase( "CONGLOMERATEID"),	// column name
-							SYSCONGLOMERATES_CONGLOMERATEID,
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// datatype
-							true,				// built-in type
-							36					// maxLength
-							);
-
-		return	columnList;
-
+            return new SystemColumn[] {
+               SystemColumnImpl.getUUIDColumn("SCHEMAID", false),
+               SystemColumnImpl.getUUIDColumn("TABLEID", false),
+               SystemColumnImpl.getColumn("CONGLOMERATENUMBER", Types.BIGINT, false),
+               SystemColumnImpl.getIdentifierColumn("CONGLOMERATENAME", true),
+               SystemColumnImpl.getColumn("ISINDEX", Types.BOOLEAN, false),
+               SystemColumnImpl.getJavaColumn("DESCRIPTOR",
+                       "org.apache.derby.catalog.IndexDescriptor", true),
+               SystemColumnImpl.getColumn("ISCONSTRAINT", Types.BOOLEAN, true),
+               SystemColumnImpl.getUUIDColumn("CONGLOMERATEID", false)
+           };
 	}
 }

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -21,6 +21,8 @@
 
 package org.apache.derby.impl.sql.catalog;
 
+import java.sql.Types;
+
 import org.apache.derby.catalog.UUID;
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.sanity.SanityManager;
@@ -669,91 +671,15 @@
 	 */
 	public SystemColumn[]	buildColumnList()
 	{
-		int						index = 0;
-		SystemColumn[]			columnList = new SystemColumn[SYSCONSTRAINTS_COLUMN_COUNT];
-
-		// describe columns
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "CONSTRAINTID"),			// column name
-							SYSCONSTRAINTS_CONSTRAINTID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			               );
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "TABLEID"),			// column name
-							SYSCONSTRAINTS_TABLEID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			               );
-
-		columnList[index++] =
-					new SystemColumnImpl(		// SQL IDENTIFIER
-							convertIdCase( "CONSTRAINTNAME"),	// column name
-							SYSCONSTRAINTS_CONSTRAINTNAME,
-							false				// nullability
-							);
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "TYPE"),			// column name
-							SYSCONSTRAINTS_TYPE,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			               );
-
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "SCHEMAID"),		// column name
-							SYSCONSTRAINTS_SCHEMAID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			               );
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "STATE"),		// column name
-							SYSCONSTRAINTS_STATE,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			               );
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "REFERENCECOUNT"),		// column name
-							SYSCONSTRAINTS_REFERENCECOUNT,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"INTEGER",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			               );
-		return	columnList;
+            return new SystemColumn[] {
+               SystemColumnImpl.getUUIDColumn("CONSTRAINTID", false),
+               SystemColumnImpl.getUUIDColumn("TABLEID", false),
+               SystemColumnImpl.getIdentifierColumn("CONSTRAINTNAME", false),
+               SystemColumnImpl.getIndicatorColumn("TYPE"),
+               SystemColumnImpl.getUUIDColumn("SCHEMAID", false),
+               SystemColumnImpl.getIndicatorColumn("STATE"),
+               SystemColumnImpl.getColumn("REFERENCECOUNT", Types.INTEGER, false) 
+            };
 	}
 
 }

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -21,6 +21,8 @@
 
 package org.apache.derby.impl.sql.catalog;
 
+import java.sql.Types;
+
 import org.apache.derby.catalog.DependableFinder;
 import org.apache.derby.catalog.TypeDescriptor;
 import org.apache.derby.catalog.UUID;
@@ -231,59 +233,13 @@
 	 */
 	public SystemColumn[]	buildColumnList()
 	{
-		int						index = 0;
-		SystemColumn[]			columnList = new SystemColumn[SYSDEPENDS_COLUMN_COUNT];
-
-		// describe columns
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "DEPENDENTID"),			// column name
-							SYSDEPENDS_DEPENDENTID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			               );
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "DEPENDENTFINDER"),		// column name
-							SYSDEPENDS_DEPENDENTTYPE,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"org.apache.derby.catalog.DependableFinder",	    // dataType
-							false,				// built-in type
-							TypeDescriptor.MAXIMUM_WIDTH_UNKNOWN // maxLength
-			               );
-
-		columnList[index++] =
-					new SystemColumnImpl(
-							convertIdCase( "PROVIDERID"),		// column name
-							SYSDEPENDS_PROVIDERID,
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// datatype
-							true,				// built-in type
-							36					// maxLength
-							);
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "PROVIDERFINDER"),			// column name
-							SYSDEPENDS_PROVIDERTYPE,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"org.apache.derby.catalog.DependableFinder",	    // dataType
-							false,				// built-in type
-							TypeDescriptor.MAXIMUM_WIDTH_UNKNOWN // maxLength
-			               );
-
-		return	columnList;
+            return new SystemColumn[] {
+                SystemColumnImpl.getUUIDColumn("DEPENDENTID", false),
+                SystemColumnImpl.getJavaColumn("DEPENDENTFINDER",
+                        "org.apache.derby.catalog.DependableFinder", false),
+                SystemColumnImpl.getUUIDColumn("PROVIDERID", false),
+                SystemColumnImpl.getJavaColumn("PROVIDERFINDER",
+                        "org.apache.derby.catalog.DependableFinder", false),
+           };
 	}
 }

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -21,6 +21,8 @@
 
 package org.apache.derby.impl.sql.catalog;
 
+import java.sql.Types;
+
 import org.apache.derby.catalog.UUID;
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.sanity.SanityManager;
@@ -246,64 +248,14 @@
 	 */
 	public SystemColumn[]	buildColumnList()
 	{
-		int						index = 0;
-		SystemColumn[]			columnList = new SystemColumn[SYSFOREIGNKEYS_COLUMN_COUNT];
-
-		// describe columns
-
-		columnList[index++] = new SystemColumnImpl(	
-							convertIdCase( "CONSTRAINTID"),			// name 
-							SYSFOREIGNKEYS_CONSTRAINTID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-		columnList[index++] = new SystemColumnImpl(	
-							convertIdCase( "CONGLOMERATEID"),			// name 
-							SYSFOREIGNKEYS_CONGLOMERATEID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-		columnList[index++] = new SystemColumnImpl(	
-							convertIdCase( "KEYCONSTRAINTID"),			// name 
-							SYSFOREIGNKEYS_KEYCONSTRAINTID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-
-		columnList[index++] = new SystemColumnImpl(	
-							convertIdCase( "DELETERULE"),			// name 
-							SYSFOREIGNKEYS_DELETERULE,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			                );
-
-		columnList[index++] = new SystemColumnImpl(	
-							convertIdCase( "UPDATERULE"),			// name 
-							SYSFOREIGNKEYS_UPDATERULE,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			                );
-		return	columnList;
+            return new SystemColumn[] {
+                 SystemColumnImpl.getUUIDColumn("CONSTRAINTID", false),
+                 SystemColumnImpl.getUUIDColumn("CONGLOMERATEID", false),
+                 SystemColumnImpl.getUUIDColumn("KEYCONSTRAINTID", false),
+                 SystemColumnImpl.getIndicatorColumn("DELETERULE"),
+                 SystemColumnImpl.getIndicatorColumn("UPDATERULE"),
+           
+            };
 	}
 
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -200,36 +200,10 @@
 	 */
 	public SystemColumn[]	buildColumnList()
 	{
-		int						index = 0;
-		SystemColumn[]			columnList = new SystemColumn[SYSKEYS_COLUMN_COUNT];
-
-		// describe columns
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "CONSTRAINTID"),			// column name
-							SYSKEYS_CONSTRAINTID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			               );
-
-		columnList[index++] = 
-					new SystemColumnImpl(	
-							convertIdCase( "CONGLOMERATEID"),	// column name
-							SYSKEYS_CONGLOMERATEID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			               );
-
-		return	columnList;
-	}
+            return new SystemColumn[] {
+                SystemColumnImpl.getUUIDColumn("CONSTRAINTID", false),
+                SystemColumnImpl.getUUIDColumn("CONGLOMERATEID", false),
+            };
+        }
 
 }

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -21,6 +21,7 @@
 
 package org.apache.derby.impl.sql.catalog;
 
+import org.apache.derby.iapi.reference.JDBC30Translation;
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
 import org.apache.derby.iapi.sql.dictionary.TupleDescriptor;
 import org.apache.derby.iapi.sql.dictionary.RoutinePermsDescriptor;
@@ -80,8 +81,6 @@
 		,"08264012-010c-bc85-060d-000000109ab8" // index3
     };
 
-    private SystemColumn[] columnList;
-
     public SYSROUTINEPERMSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf,
                                      boolean convertIdToLower)
 	{
@@ -153,58 +152,14 @@
 	/** builds a column list for the catalog */
 	public SystemColumn[] buildColumnList()
     {
-		if (columnList == null)
-        {
-            columnList = new SystemColumn[ COLUMN_COUNT];
-
-            columnList[ ROUTINEPERMSID_COL_NUM - 1] =
-                new SystemColumnImpl( convertIdCase( "ROUTINEPERMSID"),
-                                      ROUTINEPERMSID_COL_NUM,
-                                      0, // precision
-                                      0, // scale
-                                      false, // nullability
-                                      "CHAR",
-                                      true,
-                                      36);
-            columnList[ GRANTEE_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "GRANTEE"),
-                                    GRANTEE_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    AUTHORIZATION_ID_TYPE,
-                                    AUTHORIZATION_ID_IS_BUILTIN_TYPE,
-                                    AUTHORIZATION_ID_LENGTH);
-            columnList[ GRANTOR_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "GRANTOR"),
-                                    GRANTOR_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    AUTHORIZATION_ID_TYPE,
-                                    AUTHORIZATION_ID_IS_BUILTIN_TYPE,
-                                    AUTHORIZATION_ID_LENGTH);
-            columnList[ ALIASID_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "ALIASID"),
-                                    ALIASID_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    "CHAR", // dataType
-                                    true, // built-in type
-                                    36);
-            columnList[ GRANTOPTION_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "GRANTOPTION"),
-                                    GRANTOPTION_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    "CHAR", // dataType
-                                    true, // built-in type
-                                    1);
-        }
-		return columnList;
-    } // end of buildColumnList
+         return new SystemColumn[] {
+             SystemColumnImpl.getUUIDColumn("ROUTINEPERMSID", false),
+             SystemColumnImpl.getIdentifierColumn("GRANTEE", false),
+             SystemColumnImpl.getIdentifierColumn("GRANTOR", false),
+             SystemColumnImpl.getUUIDColumn("ALIASID", false),
+             SystemColumnImpl.getIndicatorColumn("GRANTOPTION")
+         };
+    }
 
 	/**
 	 * builds an index key row given for a given index number.

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java Mon Nov 19 15:38:43 2007
@@ -223,36 +223,10 @@
 	 */
 	public SystemColumn[]	buildColumnList() 
 	{
-		int						index = 0;
-		SystemColumn[]			columnList = new SystemColumn[SYSSCHEMAS_COLUMN_COUNT];
-
-		// describe columns
-
-		columnList[index++] = new SystemColumnImpl(	
-							convertIdCase( "SCHEMAID"),			// name 
-							SYSSCHEMAS_SCHEMAID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-		columnList[index++] = 
-					new SystemColumnImpl(		// SQL IDENTIFIER
-							convertIdCase( "SCHEMANAME"),		// column name
-							SYSSCHEMAS_SCHEMANAME,	// column number
-							false				// nullability
-							);
-
-		columnList[index++] = 
-					new SystemColumnImpl(		// SQL IDENTIFIER
-							convertIdCase( "AUTHORIZATIONID"),	// column name
-							SYSSCHEMAS_SCHEMAAID,	// column number
-							false				// nullability
-							);
-
-
-		return	columnList;
+            return new SystemColumn[] {
+                SystemColumnImpl.getUUIDColumn("SCHEMAID", false),
+                SystemColumnImpl.getIdentifierColumn("SCHEMANAME", false),
+                SystemColumnImpl.getIdentifierColumn("AUTHORIZATIONID", false),
+            };
 	}
 }

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -59,6 +59,7 @@
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
 import java.sql.Timestamp;
+import java.sql.Types;
 import java.util.Properties;
 
 /**
@@ -384,113 +385,19 @@
 	 */
 	public SystemColumn[] buildColumnList()
 	{
-		/*
-		** Create one less than the number of columns, we
-		** skip the last one deliberately.
-		*/	
-		SystemColumn[]	columnList = new SystemColumn[SYSSTATEMENTS_COLUMN_COUNT - SYSSTATEMENTS_HIDDEN_COLUMN_COUNT];
-
-
-		// describe columns
-		columnList[0] = new SystemColumnImpl(	
-							convertIdCase( "STMTID"),			// name 
-							SYSSTATEMENTS_STMTID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-
-		columnList[1] = 
-					new SystemColumnImpl(		// SQL IDENTIFIER
-							convertIdCase( "STMTNAME"),			// column name
-							SYSSTATEMENTS_STMTNAME,	// column number
-							false				// nullability
-							);
-
-		columnList[2] = new SystemColumnImpl(	
-							convertIdCase( "SCHEMAID"),				// name 
-							SYSSTATEMENTS_SCHEMAID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-
-		columnList[3] = 
-					new SystemColumnImpl(		
-							convertIdCase( "TYPE"),				// name 
-							SYSSTATEMENTS_TYPE,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			                );
-
-		columnList[4] = 
-					new SystemColumnImpl(		
-							convertIdCase( "VALID"),			// name 
-							SYSSTATEMENTS_VALID,// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"BOOLEAN",			// dataType
-							true,				// built-in type
-							1					// maxLength
-			                );
-
-		columnList[5] = 
-					new SystemColumnImpl(		
-							convertIdCase( "TEXT"),				// name 
-							SYSSTATEMENTS_TEXT,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"LONG VARCHAR",	// dataType
-							true,				// built-in type
-							TypeId.LONGVARCHAR_MAXWIDTH	// maxLength
-			                );
-
-		columnList[6] = 
-					new SystemColumnImpl(		
-							convertIdCase( "LASTCOMPILED"),				// name 
-							SYSSTATEMENTS_LASTCOMPILED,	// column number
-							0,							// precision
-							0,							// scale
-							true,						// nullability
-							"TIMESTAMP",				// dataType
-							true,						// built-in type
-							TypeId.TIMESTAMP_MAXWIDTH	// maxLength
-			                );
-
-		columnList[7] = new SystemColumnImpl(	
-							convertIdCase( "COMPILATIONSCHEMAID"),				// name 
-							SYSSTATEMENTS_COMPILATION_SCHEMAID,	// column number
-							0,					// precision
-							0,					// scale
-							true,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-
-		columnList[8] = 
-					new SystemColumnImpl(		
-							convertIdCase( "USINGTEXT"),		// name 
-							SYSSTATEMENTS_USINGTEXT,// column number
-							0,					// precision
-							0,					// scale
-							true,				// nullability
-							"LONG VARCHAR",	// dataType
-							true,				// built-in type
-							TypeId.LONGVARCHAR_MAXWIDTH	// maxLength
-			                );
+            return new SystemColumn[] {
+                SystemColumnImpl.getUUIDColumn("STMTID", false),
+                SystemColumnImpl.getIdentifierColumn("STMTNAME", false),
+                SystemColumnImpl.getUUIDColumn("SCHEMAID", false),
+                SystemColumnImpl.getIndicatorColumn("TYPE"),
+                SystemColumnImpl.getColumn("VALID", Types.BOOLEAN, false),
+                SystemColumnImpl.getColumn("TEXT", Types.LONGVARCHAR, false,
+                        TypeId.LONGVARCHAR_MAXWIDTH),
+                SystemColumnImpl.getColumn("LASTCOMPILED", Types.TIMESTAMP, true),
+                SystemColumnImpl.getUUIDColumn("COMPILATIONSCHEMAID", true),
+                SystemColumnImpl.getColumn("USINGTEXT", Types.LONGVARCHAR, true,
+                        TypeId.LONGVARCHAR_MAXWIDTH),         
+            };
 		/*
 		** This column is deliberately left out.  It
 	 	** is effectively 'hidden' from users.  The code
@@ -527,8 +434,6 @@
 		//					1					// maxLength
 		//	                );
 
-
-		return	columnList;
 	}
 
 	/**

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -44,6 +44,7 @@
 import org.apache.derby.iapi.types.*;
 
 import java.sql.Timestamp;
+import java.sql.Types;
 
 /**
  * Factory for creating a SYSSTATISTICS row.
@@ -110,7 +111,6 @@
 	/*
 	 * STATE
 	 */
-	private	SystemColumn[]		columnList;
 
 	/*
 	 *	CONSTRUCTORS
@@ -239,108 +239,16 @@
 	 */
 	public SystemColumn[] buildColumnList()
 	{
-		if (columnList != null)
-			return columnList;
-
-		columnList = new SystemColumn[SYSSTATISTICS_COLUMN_COUNT];
-		
-		columnList[0] = new SystemColumnImpl(
-						   convertIdCase( "STATID"),			// column name
-						   SYSSTATISTICS_ID,    // column number
-						   0,					// precision
-						   0,					// scale
-						   false,				// nullability
-						   "CHAR",				// dataType
-						   true,				// built-in type
-						   36					// maxLength
-						   );
-		
-		columnList[1] = new SystemColumnImpl(
-						   convertIdCase( "REFERENCEID"),			  // column name
-						   SYSSTATISTICS_REFERENCEID, // column number
-						   0,						  // precision
-						   0,						  // scale
-						   false,					  // nullability
-						   "CHAR",					  // dataType
-						   true,					  // built-in type
-						   36						  // maxLength
-						   );
-
-		columnList[2] = new SystemColumnImpl(
-						   convertIdCase( "TABLEID"),			      // column name
-						   SYSSTATISTICS_TABLEID,    // column number
-						   0,						  // precision
-						   0,						  // scale
-						   false,					  // nullability
-						   "CHAR",					  // dataType
-						   true,					  // built-in type
-						   36						  // maxLength
-						   );
-
-		columnList[3] = 
-					new SystemColumnImpl(		
-							convertIdCase( "CREATIONTIMESTAMP"),	  // name 
-							SYSSTATISTICS_TIMESTAMP,  // column number
-							0,						  // precision
-							0,						  // scale
-							false,					  // nullability
-							"TIMESTAMP",			  // dataType
-							true,					  // built-in type
-							TypeId.TIMESTAMP_MAXWIDTH // maxLength
-			                );
-
-		columnList[4] = 
-					new SystemColumnImpl(		
-							convertIdCase( "TYPE"),	  			  	  // name 
-							SYSSTATISTICS_TYPE,  	  // column number
-							0,						  // precision
-							0,						  // scale
-							false,					  // nullability
-							"CHAR",					  // dataType
-							true,					  // built-in type
-							1						  // maxLength
-			                );
-
-		columnList[5] = 
-					new SystemColumnImpl(		
-							convertIdCase( "VALID"),	  			  	  // name 
-							SYSSTATISTICS_VALID,  	  // column number
-							0,						  // precision
-							0,						  // scale
-							false,					  // nullability
-							"BOOLEAN",					  // dataType
-							true,					  // built-in type
-							1						  // maxLength
-			                );
-
-
-		columnList[6] = 
-			       new SystemColumnImpl(
-							convertIdCase( "COLCOUNT"), 				// name
-							SYSSTATISTICS_COLCOUNT,    // column number
-							0,							// precision
-							0,							// scale
-							false,						// nullability
-							"INTEGER",					// data type
-							true,						// built in type
-							4							//maxlength
-							 );
-		columnList[7] = 
-					new SystemColumnImpl(		
-							convertIdCase( "STATISTICS"),	  		  // name 
-							SYSSTATISTICS_STAT,  	  // column number
-							0,						  // precision
-							0,						  // scale
-							false,					  // nullability
-							"org.apache.derby.catalog.Statistics",  // dataType
-							false,					  // built-in type
-							12						  // maxLength
-			                );
-
-
-
-		return columnList;
-	}
-
-
+            return new SystemColumn[] {
+                SystemColumnImpl.getUUIDColumn("STATID", false),
+                SystemColumnImpl.getUUIDColumn("REFERENCEID", false),
+                SystemColumnImpl.getUUIDColumn("TABLEID", false),
+                SystemColumnImpl.getColumn("CREATIONTIMESTAMP", Types.TIMESTAMP, false),
+                SystemColumnImpl.getIndicatorColumn("TYPE"),
+                SystemColumnImpl.getColumn("VALID", Types.BOOLEAN, false),
+                SystemColumnImpl.getColumn("COLCOUNT", Types.INTEGER, false),
+                SystemColumnImpl.getJavaColumn("STATISTICS",
+                        "org.apache.derby.catalog.Statistics", false)
+            };
+        }
 }	

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -84,8 +84,6 @@
 		,"f81e0010-010c-bc85-060d-000000109ab8"	// index3
     };
 
-    private SystemColumn[] columnList;
-
     public SYSTABLEPERMSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf,
                                    boolean convertIdToLower)
 	{
@@ -198,103 +196,19 @@
 	/** builds a column list for the catalog */
 	public SystemColumn[] buildColumnList()
     {
-		if (columnList == null)
-        {
-            columnList = new SystemColumn[ COLUMN_COUNT];
-
-            columnList[ TABLEPERMSID_COL_NUM - 1] =
-                new SystemColumnImpl( convertIdCase( "TABLEPERMSID"),
-                                      TABLEPERMSID_COL_NUM,
-                                      0, // precision
-                                      0, // scale
-                                      false, // nullability
-                                      "CHAR",
-                                      true,
-                                      36);
-            columnList[ GRANTEE_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "GRANTEE"),
-                                    GRANTEE_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    AUTHORIZATION_ID_TYPE,
-                                    AUTHORIZATION_ID_IS_BUILTIN_TYPE,
-                                    AUTHORIZATION_ID_LENGTH);
-            columnList[ GRANTOR_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "GRANTOR"),
-                                    GRANTOR_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    AUTHORIZATION_ID_TYPE,
-                                    AUTHORIZATION_ID_IS_BUILTIN_TYPE,
-                                    AUTHORIZATION_ID_LENGTH);
-            columnList[ TABLEID_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "TABLEID"),
-                                    TABLEID_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    "CHAR", // dataType
-                                    true, // built-in type
-                                    36);
-            columnList[ SELECTPRIV_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "SELECTPRIV"),
-                                    SELECTPRIV_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    "CHAR", // dataType
-                                    true, // built-in type
-                                    1);
-            columnList[ DELETEPRIV_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "DELETEPRIV"),
-                                    DELETEPRIV_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    "CHAR", // dataType
-                                    true, // built-in type
-                                    1);
-            columnList[ INSERTPRIV_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "INSERTPRIV"),
-                                    INSERTPRIV_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    "CHAR", // dataType
-                                    true, // built-in type
-                                    1);
-            columnList[ UPDATEPRIV_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "UPDATEPRIV"),
-                                    UPDATEPRIV_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    "CHAR", // dataType
-                                    true, // built-in type
-                                    1);
-            columnList[ REFERENCESPRIV_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "REFERENCESPRIV"),
-                                    REFERENCESPRIV_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    "CHAR", // dataType
-                                    true, // built-in type
-                                    1);
-            columnList[ TRIGGERPRIV_COL_NUM - 1] =
-              new SystemColumnImpl( convertIdCase( "TRIGGERPRIV"),
-                                    TRIGGERPRIV_COL_NUM,
-                                    0, // precision
-                                    0, // scale
-                                    false, // nullability
-                                    "CHAR", // dataType
-                                    true, // built-in type
-                                    1);
-        }
-		return columnList;
-    } // end of buildColumnList
+        return new SystemColumn[] {
+            SystemColumnImpl.getUUIDColumn("TABLEPERMSID", false),
+            SystemColumnImpl.getIdentifierColumn("GRANTEE", false),
+            SystemColumnImpl.getIdentifierColumn("GRANTOR", false),
+            SystemColumnImpl.getUUIDColumn("TABLEID", false),
+            SystemColumnImpl.getIndicatorColumn("SELECTPRIV"),
+            SystemColumnImpl.getIndicatorColumn("DELETEPRIV"),
+            SystemColumnImpl.getIndicatorColumn("INSERTPRIV"),
+            SystemColumnImpl.getIndicatorColumn("UPDATEPRIV"),
+            SystemColumnImpl.getIndicatorColumn("REFERENCESPRIV"),
+            SystemColumnImpl.getIndicatorColumn("TRIGGERPRIV"),
+        };
+    }
 
 	/**
 	 * builds a key row given for a given index number.

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java Mon Nov 19 15:38:43 2007
@@ -382,61 +382,13 @@
 	 */
 	public SystemColumn[]	buildColumnList()
 	{
-		SystemColumn[]			columnList = new SystemColumn[SYSTABLES_COLUMN_COUNT];
-
-		// describe columns
-
-		columnList[0] = new SystemColumnImpl(	
-								convertIdCase( "TABLEID"),			// column name
-								SYSTABLES_TABLEID,	// column number
-								0,					// precision
-								0,					// scale
-								false,				// nullability
-								"CHAR",				// dataType
-								true,				// built-in type
-								36					// maxLength
-			                   );
-
-		columnList[1] = new SystemColumnImpl(		// SQLIDENTIFIER
-								convertIdCase( "TABLENAME"),		// column name
-								SYSTABLES_TABLENAME, 	// column number
-								false				// nullability
-			                   );
-
-		columnList[2] = new SystemColumnImpl(	
-								convertIdCase( "TABLETYPE"),		// column name
-								SYSTABLES_TABLETYPE,// column number
-								0,					// precision
-								0,					// scale
-								false,				// nullability
-								"CHAR",				// dataType
-								true,				// built-in type
-								1					// maxLength
-			                   );
-
-		columnList[3] = new SystemColumnImpl(	
-								convertIdCase( "SCHEMAID"),			// column name
-								SYSTABLES_SCHEMAID,	// schema number
-								0,					// precision
-								0,					// scale
-								false,				// nullability
-								"CHAR",				// dataType
-								true,				// built-in type
-								36					// maxLength
-			                   );
-
-		columnList[4] = new SystemColumnImpl(	
-								convertIdCase( "LOCKGRANULARITY"),		// column name
-								SYSTABLES_LOCKGRANULARITY,// column number
-								0,					// precision
-								0,					// scale
-								false,				// nullability
-								"CHAR",				// dataType
-								true,				// built-in type
-								1					// maxLength
-			                   );
-
-		return	columnList;
+        return new SystemColumn[] {
+            SystemColumnImpl.getUUIDColumn("TABLEID", false),
+            SystemColumnImpl.getIdentifierColumn("TABLENAME", false),
+            SystemColumnImpl.getIndicatorColumn("TABLETYPE"),
+            SystemColumnImpl.getUUIDColumn("SCHEMAID", false),
+            SystemColumnImpl.getIndicatorColumn("LOCKGRANULARITY"),
+        };
 	}
 
 }

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -54,6 +54,7 @@
 import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.types.SQLTimestamp;
 import java.sql.Timestamp;
+import java.sql.Types;
 
 /**
  * Factory for creating a SYSTRIGGERS row.
@@ -432,197 +433,28 @@
 	 */
 	public SystemColumn[] buildColumnList()
 	{
-		SystemColumn[]	columnList = new SystemColumn[SYSTRIGGERS_COLUMN_COUNT];
-
-		// describe columns
-		columnList[SYSTRIGGERS_TRIGGERID-1] = new SystemColumnImpl(	
-							convertIdCase( "TRIGGERID"),			// name 
-							SYSTRIGGERS_TRIGGERID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_TRIGGERNAME-1] = 
-					new SystemColumnImpl(		// SQL IDENTIFIER
-							convertIdCase( "TRIGGERNAME"),			// column name
-							SYSTRIGGERS_TRIGGERNAME,	// column number
-							false				// nullability
-							);
-
-		columnList[SYSTRIGGERS_SCHEMAID-1] = new SystemColumnImpl(	
-							convertIdCase( "SCHEMAID"),				// name 
-							SYSTRIGGERS_SCHEMAID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_CREATIONTIMESTAMP-1] = 
-					new SystemColumnImpl(		
-							convertIdCase( "CREATIONTIMESTAMP"),		// name 
-							SYSTRIGGERS_CREATIONTIMESTAMP,	// column number
-							0,							// precision
-							0,							// scale
-							false,						// nullability
-							"TIMESTAMP",				// dataType
-							true,						// built-in type
-							TypeId.TIMESTAMP_MAXWIDTH	// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_EVENT-1] = 
-					new SystemColumnImpl(		
-							convertIdCase( "EVENT"),			// name 
-							SYSTRIGGERS_EVENT,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_FIRINGTIME-1] = 
-					new SystemColumnImpl(		
-							convertIdCase( "FIRINGTIME"),		// name 
-							SYSTRIGGERS_FIRINGTIME, // column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_TYPE-1] = 
-					new SystemColumnImpl(		
-							convertIdCase( "TYPE"),				// name 
-							SYSTRIGGERS_TYPE,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_STATE-1] = 
-					new SystemColumnImpl(		
-							convertIdCase( "STATE"),			// name 
-							SYSTRIGGERS_STATE,// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							1					// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_TABLEID-1] = 
-					new SystemColumnImpl(	
-							convertIdCase( "TABLEID"),			// name 
-							SYSTRIGGERS_TABLEID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_WHENSTMTID-1] = 
-					new SystemColumnImpl(	
-							convertIdCase( "WHENSTMTID"),				// name 
-							SYSTRIGGERS_WHENSTMTID,		// column number
-							0,							// precision
-							0,							// scale
-							true,						// nullability
-							"CHAR",						// dataType
-							true,						// built-in type
-							36							// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_ACTIONSTMTID-1] = 
-					new SystemColumnImpl(	
-							convertIdCase( "ACTIONSTMTID"),				// name 
-							SYSTRIGGERS_ACTIONSTMTID,	// column number
-							0,							// precision
-							0,							// scale
-							true,						// nullability
-							"CHAR",						// dataType
-							true,						// built-in type
-							36							// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_REFERENCEDCOLUMNS-1] = 
-					new SystemColumnImpl(		
-							convertIdCase( "REFERENCEDCOLUMNS"),			// name 
-							SYSTRIGGERS_REFERENCEDCOLUMNS,	// column number
-							0,								// precision
-							0,								// scale
-							true,							// nullability
-							"org.apache.derby.catalog.ReferencedColumns",	//datatype
-							false,							// built-in type
-							DataTypeDescriptor.MAXIMUM_WIDTH_UNKNOWN // maxLength
-			                );
-
-		columnList[SYSTRIGGERS_TRIGGERDEFINITION-1] = 
-					new SystemColumnImpl(	
-							convertIdCase( "TRIGGERDEFINITION"),				// name 
-							SYSTRIGGERS_TRIGGERDEFINITION,	// column number
-							0,							// precision
-							0,							// scale
-							true,						// nullability
-							"LONG VARCHAR",			// dataType
-							true,				// built-in type
-							Integer.MAX_VALUE	// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_REFERENCINGOLD-1] = 
-					new SystemColumnImpl(		
-							convertIdCase( "REFERENCINGOLD"),			// name 
-							SYSTRIGGERS_REFERENCINGOLD,// column number
-							0,					// precision
-							0,					// scale
-							true,				// nullability
-							"BOOLEAN",			// dataType
-							true,				// built-in type
-							1					// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_REFERENCINGNEW-1] = 
-					new SystemColumnImpl(		
-							convertIdCase( "REFERENCINGNEW"),			// name 
-							SYSTRIGGERS_REFERENCINGNEW,// column number
-							0,					// precision
-							0,					// scale
-							true,				// nullability
-							"BOOLEAN",			// dataType
-							true,				// built-in type
-							1					// maxLength
-			                );
-
-		columnList[SYSTRIGGERS_OLDREFERENCINGNAME-1] = 
-					new SystemColumnImpl(		// SQL IDENTIFIER
-							convertIdCase( "OLDREFERENCINGNAME"),			// column name
-							SYSTRIGGERS_OLDREFERENCINGNAME,	// column number
-							true				// nullability
-							);
-
-		columnList[SYSTRIGGERS_NEWREFERENCINGNAME-1] = 
-					new SystemColumnImpl(		// SQL IDENTIFIER
-							convertIdCase( "NEWREFERENCINGNAME"),			// column name
-							SYSTRIGGERS_NEWREFERENCINGNAME,	// column number
-							true				// nullability
-							);
-
-		return	columnList;
+        return new SystemColumn[] {
+            SystemColumnImpl.getUUIDColumn("TRIGGERID", false),
+            SystemColumnImpl.getIdentifierColumn("TRIGGERNAME", false),
+            SystemColumnImpl.getUUIDColumn("SCHEMAID", false),
+            SystemColumnImpl.getColumn("CREATIONTIMESTAMP", Types.TIMESTAMP, false),
+            SystemColumnImpl.getIndicatorColumn("EVENT"),
+            SystemColumnImpl.getIndicatorColumn("FIRINGTIME"),
+            SystemColumnImpl.getIndicatorColumn("TYPE"),
+            SystemColumnImpl.getIndicatorColumn("STATE"),
+            SystemColumnImpl.getUUIDColumn("TABLEID", false),
+            SystemColumnImpl.getUUIDColumn("WHENSTMTID", true),
+            SystemColumnImpl.getUUIDColumn("ACTIONSTMTID", true),
+            SystemColumnImpl.getJavaColumn("REFERENCEDCOLUMNS",
+                    "org.apache.derby.catalog.ReferencedColumns", true),
+            SystemColumnImpl.getColumn("TRIGGERDEFINITION",
+                    Types.LONGVARCHAR, true, Integer.MAX_VALUE),
+            SystemColumnImpl.getColumn("REFERENCINGOLD", Types.BOOLEAN, true),
+            SystemColumnImpl.getColumn("REFERENCINGNEW", Types.BOOLEAN, true),
+            SystemColumnImpl.getIdentifierColumn("OLDREFERENCINGNAME", true),
+            SystemColumnImpl.getIdentifierColumn("NEWREFERENCINGNAME", true),
+            
+           };
 	}
 
 	// a little helper

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java Mon Nov 19 15:38:43 2007
@@ -21,6 +21,8 @@
 
 package org.apache.derby.impl.sql.catalog;
 
+import java.sql.Types;
+
 import org.apache.derby.catalog.UUID;
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.sanity.SanityManager;
@@ -261,53 +263,13 @@
 	 */
 	public SystemColumn[]	buildColumnList()
 	{
-		SystemColumn[]			columnList = new SystemColumn[SYSVIEWS_COLUMN_COUNT];
-
-		columnList[0] = new SystemColumnImpl(	
-							convertIdCase( "TABLEID"),			// name 
-							SYSVIEWS_TABLEID,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-		// describe columns
-
-		columnList[1] = 
-					new SystemColumnImpl(	
-							convertIdCase( "VIEWDEFINITION"),		// column name
-							SYSVIEWS_VIEWDEFINITION,	// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"LONG VARCHAR",	    // dataType
-							true,				// built-in type
-							TypeId.LONGVARCHAR_MAXWIDTH // maxLength
-			               );
-		columnList[2] = 
-					new SystemColumnImpl(	
-							convertIdCase( "CHECKOPTION"),		// column name
-							SYSVIEWS_CHECKOPTION,// column number
-							0,					// precision
-							0,					// scale
-							false,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							1					// maxLength
-		                   );
-
-		columnList[3] = new SystemColumnImpl(	
-							convertIdCase( "COMPILATIONSCHEMAID"),	// name 
-							SYSVIEWS_COMPILATION_SCHEMAID,	// column number
-							0,					// precision
-							0,					// scale
-							true,				// nullability
-							"CHAR",				// dataType
-							true,				// built-in type
-							36					// maxLength
-			                );
-		return	columnList;
+            return new SystemColumn[] {
+                SystemColumnImpl.getUUIDColumn("TABLEID", false),
+                SystemColumnImpl.getColumn("VIEWDEFINITION", Types.LONGVARCHAR,
+                        false, TypeId.LONGVARCHAR_MAXWIDTH),
+                SystemColumnImpl.getIndicatorColumn("CHECKOPTION"),
+                SystemColumnImpl.getUUIDColumn("COMPILATIONSCHEMAID", true),
+                        
+            };
 	}
 }

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java?rev=596490&r1=596489&r2=596490&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java Mon Nov 19 15:38:43 2007
@@ -23,11 +23,8 @@
 
 import java.sql.Types;
 
-import	org.apache.derby.iapi.sql.dictionary.SystemColumn;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.iapi.sql.dictionary.SystemColumn;
 import org.apache.derby.iapi.types.DataTypeDescriptor;
-import org.apache.derby.iapi.types.DataValueDescriptor;
-import org.apache.derby.iapi.types.DataValueFactory;
 import org.apache.derby.iapi.types.TypeId;
 
 /**
@@ -147,76 +144,6 @@
         this.name = name;
         this.type = type;
     }
-
-	/**
-     * Constructor to create a description of a column in a system table.
-     * 
-     * @param name
-     *            of column.
-     * @param id
-     *            of column.
-     * @param nullability
-     *            Whether or not column accepts nulls.
-     * @param dataType
-     *            Datatype of column.
-     * @param maxLength
-     *            Maximum length of data in column.
-     */
-	SystemColumnImpl(	String	name,
-								int		id,
-								boolean	nullability,
-								String	dataType,
-								boolean	builtInType,
-								int		maxLength )
-	{
-		this.name			= name;
-        
-        TypeId  typeId;
-
-        if (builtInType)
-        {
-            typeId = TypeId.getBuiltInTypeId(dataType);
-        }
-        else
-        {
-
-            typeId = TypeId.getUserDefinedTypeId(dataType, false);
-        }
-
-        this.type = new DataTypeDescriptor(
-                               typeId,
-                               0,
-                               0,
-                               nullability,
-                               maxLength
-                               );
-	}
-    SystemColumnImpl(   String  name,
-            int     id,
-            int ignoreP,
-            int ignoreS,
-            boolean nullability,
-            String  dataType,
-            boolean builtInType,
-            int     maxLength )
-{
-        this(name, id, nullability, dataType, builtInType, maxLength);
-}
-
-	/**
-	 * Constructor to create a description of a column in a system table.
-	 * This constructor is used for SQL Identifiers (varchar 128).
-	 *
-	 *	@param	name of column.
-	 *	@param	id of column.
-	 *	@param	nullability Whether or not column accepts nulls.
-	 */
-	SystemColumnImpl(	String	name,
-								int		id,
-								boolean	nullability)
-	{
-        this(name, id, nullability, "VARCHAR", true, 128);
-	}
 
 	/**
 	 * Gets the name of this column.



Mime
View raw message