db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r540689 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/
Date Tue, 22 May 2007 18:38:05 GMT
Author: djd
Date: Tue May 22 11:38:02 2007
New Revision: 540689

URL: http://svn.apache.org/viewvc?view=rev&rev=540689
Log:
Change the DataDictionary implementation for Derby to use SQLChar/SQLVarchar directly
as all system columns are UCS_BASIC collation based. This removes one level of indirection
for creating objects in the system catalogs, ie. instead of using DataValueFactory.
See also package.html for the iapi.types package on the reason for using some types directly.

Modified:
    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/catalog/PermissionsCatalogRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java

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?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- 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 Tue May 22 11:38:02 2007
@@ -76,6 +76,8 @@
 import org.apache.derby.iapi.types.DataValueFactory;
 import org.apache.derby.iapi.types.NumberDataValue;
 
+import org.apache.derby.iapi.types.SQLChar;
+import org.apache.derby.iapi.types.SQLVarchar;
 import org.apache.derby.iapi.types.StringDataValue;
 import org.apache.derby.iapi.types.TypeId;
 import org.apache.derby.iapi.types.DataTypeDescriptor;
@@ -1487,7 +1489,7 @@
 		TabInfoImpl					ti = coreInfo[SYSSCHEMAS_CORE_NUM];
 
 		/* Use UUIDStringOrderable in both start and stop positions for scan */
-		UUIDStringOrderable = dvf.getCharDataValue(schemaId.toString());
+		UUIDStringOrderable = getIDValueAsCHAR(schemaId);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -1528,7 +1530,7 @@
 		/* Use aliasNameOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		schemaNameOrderable = dvf.getVarcharDataValue(schemaName);
+		schemaNameOrderable = new SQLVarchar(schemaName);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -1726,7 +1728,7 @@
 		/* Use schemaNameOrderable in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		schemaNameOrderable = dvf.getVarcharDataValue(schemaName);
+		schemaNameOrderable = new SQLVarchar(schemaName);
 
 		/* Set up the start/stop position for the scan */
 		keyRow1 = exFactory.getIndexableRow(1);
@@ -1829,8 +1831,8 @@
 		/* Use tableNameOrderable and schemaIdOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		tableNameOrderable = dvf.getVarcharDataValue(tableName);
-		schemaIDOrderable = dvf.getCharDataValue(schemaUUID);
+		tableNameOrderable = new SQLVarchar(tableName);
+		schemaIDOrderable = new SQLChar(schemaUUID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(2);
@@ -1942,7 +1944,7 @@
 		/* Use tableNameOrderable and schemaIdOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		tableIDOrderable = dvf.getCharDataValue(tableUUID);
+		tableIDOrderable = new SQLChar(tableUUID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -2005,7 +2007,7 @@
 		DataValueDescriptor     schemaIdOrderable;
 		TransactionController	tc = getTransactionCompile();
 
-		schemaIdOrderable = getValueAsDVD(sd.getUUID());
+		schemaIdOrderable = getIDValueAsCHAR(sd.getUUID());
 
 		if (isSchemaReferenced(tc, coreInfo[SYSTABLES_CORE_NUM],
 					SYSTABLESRowFactory.SYSTABLES_INDEX1_ID,
@@ -2156,8 +2158,8 @@
 		/* Use tableIdOrderable and schemaIdOrderable in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		tableNameOrderable = dvf.getVarcharDataValue(td.getName());
-		schemaIDOrderable = getValueAsDVD(schema.getUUID());
+		tableNameOrderable = new SQLVarchar(td.getName());
+		schemaIDOrderable = getIDValueAsCHAR(schema.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(2);
@@ -2192,8 +2194,8 @@
 		/* Use tableIdOrderable and schemaIdOrderable in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		tableNameOrderable = dvf.getVarcharDataValue(td.getName());
-		schemaIDOrderable = getValueAsDVD(schema.getUUID());
+		tableNameOrderable = new SQLVarchar(td.getName());
+		schemaIDOrderable = getIDValueAsCHAR(schema.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(2);
@@ -2249,7 +2251,7 @@
 		TabInfoImpl				ti = coreInfo[SYSCOLUMNS_CORE_NUM];
 
 		/* Use UUIDStringOrderable in both start and stop positions for scan */
-		UUIDStringOrderable = dvf.getCharDataValue(uuid.toString());
+		UUIDStringOrderable = getIDValueAsCHAR(uuid);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -2310,7 +2312,7 @@
 		TabInfoImpl                 ti              = coreInfo[SYSCOLUMNS_CORE_NUM];
 
 		/* Use refIDOrderable in both start and stop position for scan. */
-		refIDOrderable = getValueAsDVD(uuid);
+		refIDOrderable = getIDValueAsCHAR(uuid);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -2364,8 +2366,8 @@
 		/* Use tableIDOrderable and columnNameOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		tableIdOrderable = getValueAsDVD(tableID);
-		columnNameOrderable = dvf.getVarcharDataValue(columnName);
+		tableIdOrderable = getIDValueAsCHAR(tableID);
+		columnNameOrderable = new SQLVarchar(columnName);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(2);
@@ -2391,7 +2393,7 @@
 		DataValueDescriptor		tableIdOrderable;
 
 		/* Use tableIDOrderable in both start and stop position for scan. */
-		tableIdOrderable = getValueAsDVD(tableID);
+		tableIdOrderable = getIDValueAsCHAR(tableID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -2419,7 +2421,7 @@
 			return;
 
 		/* Use tableIDOrderable in both start and stop position for scan. */
-		tableIdOrderable = getValueAsDVD(tableID);
+		tableIdOrderable = getIDValueAsCHAR(tableID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -2501,7 +2503,7 @@
 		// First get all the ColPermsDescriptor for the given tableid from   
 		//SYSCOLPERMS using getDescriptorViaIndex(). 
 		List permissionDescriptorsList;//all ColPermsDescriptor for given tableid
-		DataValueDescriptor		tableIDOrderable = getValueAsDVD(tableID);
+		DataValueDescriptor		tableIDOrderable = getIDValueAsCHAR(tableID);
 		TabInfoImpl	ti = getNonCoreTI(SYSCOLPERMS_CATALOG_NUM);
 		SYSCOLPERMSRowFactory rf = (SYSCOLPERMSRowFactory) ti.getCatalogRowFactory();
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -2607,7 +2609,7 @@
 			return;
 
 		/* Use tableIDOrderable in both start and stop position for scan. */
-		routineIdOrderable = getValueAsDVD(routineID);
+		routineIdOrderable = getIDValueAsCHAR(routineID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -2745,8 +2747,8 @@
 		/* Use objectID/columnName in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		refIDOrderable = getValueAsDVD(formerUUID);
-		columnNameOrderable = dvf.getVarcharDataValue(formerName);
+		refIDOrderable = getIDValueAsCHAR(formerUUID);
+		columnNameOrderable = new SQLVarchar(formerName);
 
 		/* Set up the start/stop position for the scan */
 		keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(2);
@@ -2874,7 +2876,7 @@
 		/* Use viewIdOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		viewIdOrderable = dvf.getCharDataValue(viewID.toString());
+		viewIdOrderable = getIDValueAsCHAR(viewID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -2915,7 +2917,7 @@
 		/* Use aliasNameOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		viewIdOrderable = getValueAsDVD(vd.getUUID());
+		viewIdOrderable = getIDValueAsCHAR(vd.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -2936,7 +2938,7 @@
 	{
 		DataValueDescriptor		  idOrderable;
 		TabInfoImpl					  ti = getNonCoreTI(SYSFILES_CATALOG_NUM);
-		idOrderable = dvf.getCharDataValue(id.toString());
+		idOrderable = getIDValueAsCHAR(id);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -2978,8 +2980,8 @@
 		DataValueDescriptor		  nameOrderable;
 		TabInfoImpl					  ti = getNonCoreTI(SYSFILES_CATALOG_NUM);
 
-		nameOrderable = dvf.getVarcharDataValue(name);
-		schemaIDOrderable = dvf.getCharDataValue(schemaId.toString());
+		nameOrderable = new SQLVarchar(name);
+		schemaIDOrderable = getIDValueAsCHAR(schemaId);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(2);
@@ -3023,7 +3025,7 @@
 		/* Use tableIdOrderable and schemaIdOrderable in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		idOrderable = getValueAsDVD(fid.getUUID());
+		idOrderable = getIDValueAsCHAR(fid.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -3162,7 +3164,7 @@
 		/* Use stmtIdOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		stmtIDOrderable = dvf.getCharDataValue(stmtUUID);
+		stmtIDOrderable = new SQLChar(stmtUUID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -3254,8 +3256,8 @@
 		/* Use stmtNameOrderable and schemaIdOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		stmtNameOrderable = dvf.getVarcharDataValue(stmtName);
-		schemaIDOrderable = dvf.getCharDataValue(schemaUUID);
+		stmtNameOrderable = new SQLVarchar(stmtName);
+		schemaIDOrderable = new SQLChar(schemaUUID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(2);
@@ -3471,7 +3473,7 @@
 			updCols = new int[]	{SYSSTATEMENTSRowFactory.SYSSTATEMENTS_VALID} ;
 		}
 			
-		idOrderable = getValueAsDVD(spsd.getUUID());
+		idOrderable = getIDValueAsCHAR(spsd.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -3672,7 +3674,7 @@
 		DataValueDescriptor		stmtIdOrderable;
 		TabInfoImpl					ti = getNonCoreTI(SYSSTATEMENTS_CATALOG_NUM);
 
-		stmtIdOrderable = getValueAsDVD(uuid);
+		stmtIdOrderable = getIDValueAsCHAR(uuid);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -3774,7 +3776,7 @@
 				throws StandardException
 	{
 		TabInfoImpl					  ti = getNonCoreTI(SYSTRIGGERS_CATALOG_NUM);
-		DataValueDescriptor triggerIdOrderable = dvf.getCharDataValue(uuid.toString());
+		DataValueDescriptor triggerIdOrderable = getIDValueAsCHAR(uuid);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -3812,8 +3814,8 @@
 		/* Use triggerNameOrderable and schemaIdOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		triggerNameOrderable = dvf.getVarcharDataValue(name);
-		schemaIDOrderable = dvf.getCharDataValue(sd.getUUID().toString());
+		triggerNameOrderable = new SQLVarchar(name);
+		schemaIDOrderable = getIDValueAsCHAR(sd.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(2);
@@ -3891,7 +3893,7 @@
 		TabInfoImpl					ti = getNonCoreTI(SYSTRIGGERS_CATALOG_NUM);
 
 		/* Use tableIDOrderable in both start and stop positions for scan */
-		tableIDOrderable = getValueAsDVD(td.getUUID());
+		tableIDOrderable = getIDValueAsCHAR(td.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -3927,7 +3929,7 @@
 		DataValueDescriptor		idOrderable;
 		TabInfoImpl					ti = getNonCoreTI(SYSTRIGGERS_CATALOG_NUM);
 
-		idOrderable = getValueAsDVD(descriptor.getUUID());
+		idOrderable = getIDValueAsCHAR(descriptor.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -3968,7 +3970,7 @@
 		/* Use objectID in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		IDOrderable = getValueAsDVD(formerUUID);
+		IDOrderable = getIDValueAsCHAR(formerUUID);
 
 		/* Set up the start/stop position for the scan */
 		keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -4051,7 +4053,7 @@
 		TabInfoImpl					ti = getNonCoreTI(SYSCONSTRAINTS_CATALOG_NUM);
 
 		/* Use UUIDStringOrderable in both start and stop positions for scan */
-		UUIDStringOrderable = dvf.getCharDataValue(uuid.toString());
+		UUIDStringOrderable = getIDValueAsCHAR(uuid);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -4090,8 +4092,8 @@
 		TabInfoImpl					ti = getNonCoreTI(SYSCONSTRAINTS_CATALOG_NUM);
 
 		/* Construct keys for both start and stop positions for scan */
-		constraintNameOrderable = dvf.getVarcharDataValue(constraintName);
-		UUIDStringOrderable = dvf.getCharDataValue(schemaID.toString());
+		constraintNameOrderable = new SQLVarchar(constraintName);
+		UUIDStringOrderable = getIDValueAsCHAR(schemaID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(2);
@@ -4118,7 +4120,7 @@
 		DataValueDescriptor UUIDStringOrderable;
 
 		/* set up the start/stop position for the scan */
-		UUIDStringOrderable = dvf.getCharDataValue(td.getUUID().toString());
+		UUIDStringOrderable = getIDValueAsCHAR(td.getUUID());
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
 		keyRow.setColumn(1, UUIDStringOrderable);
 		
@@ -4310,7 +4312,7 @@
 		TabInfoImpl					  ti = getNonCoreTI(SYSCONSTRAINTS_CATALOG_NUM);
 
 		/* Use tableIDOrderable in both start and stop positions for scan */
-		tableIDOrderable = getValueAsDVD(td.getUUID());
+		tableIDOrderable = getIDValueAsCHAR(td.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -4627,7 +4629,7 @@
 		List fkList = newSList();
 
 		// Use constraintIDOrderable in both start and stop positions for scan
-		DataValueDescriptor constraintIDOrderable = getValueAsDVD(constraintId);
+		DataValueDescriptor constraintIDOrderable = getIDValueAsCHAR(constraintId);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -4698,7 +4700,7 @@
 		try
 		{
 			/* Use tableIDOrderable in both start and stop positions for scan */
-			DataValueDescriptor orderable = getValueAsDVD(uuid);
+			DataValueDescriptor orderable = getIDValueAsCHAR(uuid);
 	
 			/* Set up the start/stop position for the scan */
 			ExecIndexRow keyRow = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -4728,8 +4730,7 @@
               new FormatableBitSet(SYSCONSTRAINTSRowFactory.SYSCONSTRAINTS_COLUMN_COUNT);
 			columnToGetSet.set(columnNum - 1);
 
-			rowTemplate[columnNum - 1] = 
-                dvf.getNullChar((StringDataValue) null);
+			rowTemplate[columnNum - 1] = new SQLChar();
 	
 			// Scan the index and go to the data pages for qualifying rows 
 			scanController = tc.openScan(
@@ -4880,7 +4881,7 @@
 		/* Use objectID/columnName in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		IDOrderable = getValueAsDVD(formerUUID);
+		IDOrderable = getIDValueAsCHAR(formerUUID);
 
 		/* Set up the start/stop position for the scan */
 		keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -4981,8 +4982,8 @@
 		/* Use constraintNameOrderable and schemaIdOrderable in both start 
 		 * and stop position for index 2 scan. 
 		 */
-		constraintNameOrderable = dvf.getVarcharDataValue(descriptor.getConstraintName());
-		schemaIDOrderable = getValueAsDVD(descriptor.getSchemaDescriptor().getUUID());
+		constraintNameOrderable = new SQLVarchar(descriptor.getConstraintName());
+		schemaIDOrderable = getIDValueAsCHAR(descriptor.getSchemaDescriptor().getUUID());
 
 		/* Set up the start/stop position for the scan */
 		keyRow = (ExecIndexRow) exFactory.getIndexableRow(2);
@@ -5058,7 +5059,7 @@
 		ti = getNonCoreTI(baseNum);
 
 		/* Use constraintIDOrderable in both start and stop positions for scan */
-		constraintIDOrderable = getValueAsDVD(constraintId);
+		constraintIDOrderable = getIDValueAsCHAR(constraintId);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -5208,7 +5209,7 @@
 		/* Use constraintIdOrderable in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		constraintIdOrderable = getValueAsDVD(constraint.getUUID());
+		constraintIdOrderable = getIDValueAsCHAR(constraint.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -5235,7 +5236,7 @@
 		SYSCHECKSRowFactory			rf = (SYSCHECKSRowFactory) ti.getCatalogRowFactory();
 
 		/* Use constraintIDOrderable in both start and stop positions for scan */
-		constraintIDOrderable = getValueAsDVD(constraintId);
+		constraintIDOrderable = getIDValueAsCHAR(constraintId);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -5270,7 +5271,7 @@
 		/* Use constraintIdOrderable in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		constraintIdOrderable = getValueAsDVD(constraintId);
+		constraintIdOrderable = getIDValueAsCHAR(constraintId);
 
 		/* Set up the start/stop position for the scan */
 		checkRow1 = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -5431,7 +5432,7 @@
 		TabInfoImpl					ti = coreInfo[SYSCONGLOMERATES_CORE_NUM];
 
 		/* Use UUIDStringOrderable in both start and stop positions for scan */
-		UUIDStringOrderable = dvf.getCharDataValue(uuid.toString());
+		UUIDStringOrderable = getIDValueAsCHAR(uuid);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -5549,7 +5550,7 @@
 		TabInfoImpl					ti = coreInfo[SYSCONGLOMERATES_CORE_NUM];
 
 		/* Use tableIDOrderable in both start and stop positions for scan */
-		tableIDOrderable = getValueAsDVD(td.getUUID());
+		tableIDOrderable = getIDValueAsCHAR(td.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		keyRow3 = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -5591,8 +5592,8 @@
 		DataValueDescriptor		  schemaIDOrderable = null;
 		TabInfoImpl					  ti = coreInfo[SYSCONGLOMERATES_CORE_NUM];
 
-		nameOrderable = dvf.getVarcharDataValue(indexName);
-		schemaIDOrderable = getValueAsDVD(sd.getUUID());
+		nameOrderable = new SQLVarchar(indexName);
+		schemaIDOrderable = getIDValueAsCHAR(sd.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		keyRow2 = exFactory.getIndexableRow(2);
@@ -5628,8 +5629,8 @@
 		DataValueDescriptor		schemaIDOrderable = null;
 		TabInfoImpl					ti = coreInfo[SYSCONGLOMERATES_CORE_NUM];
 
-		nameOrderable = dvf.getVarcharDataValue(conglomerate.getConglomerateName());
-		schemaIDOrderable = getValueAsDVD(conglomerate.getSchemaID());
+		nameOrderable = new SQLVarchar(conglomerate.getConglomerateName());
+		schemaIDOrderable = getIDValueAsCHAR(conglomerate.getSchemaID());
 
 		/* Set up the start/stop position for the scan */
 		keyRow2 = (ExecIndexRow) exFactory.getIndexableRow(2);
@@ -5661,7 +5662,7 @@
 		/* Use tableIDOrderable in both start 
 		 * and stop position for index 3 scan. 
 		 */
-		tableIDOrderable = getValueAsDVD(td.getUUID());
+		tableIDOrderable = getIDValueAsCHAR(td.getUUID());
 
 		/* Set up the start/stop position for the scan */
 		keyRow3 = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -5742,7 +5743,7 @@
 		/* Use schemaNameOrderable in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		schemaNameOrderable = dvf.getVarcharDataValue(schemaName);
+		schemaNameOrderable = new SQLVarchar(schemaName);
 
 		/* Set up the start/stop position for the scan */
 		keyRow = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -5752,7 +5753,7 @@
 		ExecRow row = rf.makeEmptyRow();
 
 		row.setColumn(SYSSCHEMASRowFactory.SYSSCHEMAS_SCHEMAAID,
-					  dvf.getVarcharDataValue(authorizationId));
+					  new SQLVarchar(authorizationId));
 
 		boolean[] bArray = {false, false};
 
@@ -5799,7 +5800,7 @@
 			/* Use conglomIDOrderable in both start 
 			 * and stop position for index 1 scan. 
 			 */
-			conglomIDOrderable = getValueAsDVD(cds[i].getUUID());
+			conglomIDOrderable = getIDValueAsCHAR(cds[i].getUUID());
 
 			/* Set up the start/stop position for the scan */
 			keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -5839,7 +5840,7 @@
 		TabInfoImpl					ti = getNonCoreTI(SYSDEPENDS_CATALOG_NUM);
 
 		/* Use dependentIDOrderable in both start and stop positions for scan */
-		dependentIDOrderable = dvf.getCharDataValue(dependentID);
+		dependentIDOrderable = new SQLChar(dependentID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -5876,7 +5877,7 @@
 		TabInfoImpl					ti = getNonCoreTI(SYSDEPENDS_CATALOG_NUM);
 
 		/* Use providerIDOrderable in both start and stop positions for scan */
-		providerIDOrderable = dvf.getCharDataValue(providerID);
+		providerIDOrderable = new SQLChar(providerID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -5967,7 +5968,7 @@
 		ExecIndexRow			keyRow1 = null;
 		UUID					dependentID = dd.getUUID();
 		UUID					providerID = dd.getProviderID();
-		DataValueDescriptor		dependentIDOrderable = getValueAsDVD(dependentID);
+		DataValueDescriptor		dependentIDOrderable = getIDValueAsCHAR(dependentID);
 		TabInfoImpl					ti = getNonCoreTI(SYSDEPENDS_CATALOG_NUM);
 
 		/* Use dependentIDOrderable in both start 
@@ -6022,7 +6023,7 @@
 		/* Use dependentIDOrderable in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		dependentIDOrderable = getValueAsDVD(dependentsUUID);
+		dependentIDOrderable = getIDValueAsCHAR(dependentsUUID);
 
 		/* Set up the start/stop position for the scan */
 		keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(1);
@@ -6063,7 +6064,7 @@
 		rf = (SYSALIASESRowFactory) ti.getCatalogRowFactory();
 
 		/* Use UUIDStringOrderable in both start and stop positions for scan */
-		UUIDStringOrderable = dvf.getCharDataValue(uuid.toString());
+		UUIDStringOrderable = getIDValueAsCHAR(uuid);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(1);
@@ -6103,14 +6104,14 @@
 		/* Use aliasNameOrderable and aliasTypeOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		aliasNameOrderable = dvf.getVarcharDataValue(aliasName);
+		aliasNameOrderable = new SQLVarchar(aliasName);
 		char[] charArray = new char[1];
 		charArray[0] = nameSpace;
-		nameSpaceOrderable = dvf.getCharDataValue(new String(charArray));
+		nameSpaceOrderable = new SQLChar(new String(charArray));
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(3);
-		keyRow.setColumn(1, dvf.getCharDataValue(schemaId));
+		keyRow.setColumn(1, new SQLChar(schemaId));
 		keyRow.setColumn(2, aliasNameOrderable);
 		keyRow.setColumn(3, nameSpaceOrderable);
 
@@ -6221,24 +6222,20 @@
 									TransactionController tc)
 			throws StandardException
 	{	
-		ExecIndexRow			keyRow1 = null;
-		DataValueDescriptor		aliasNameOrderable;
-		DataValueDescriptor		nameSpaceOrderable;
 		TabInfoImpl					ti = getNonCoreTI(SYSALIASES_CATALOG_NUM);
 
 		/* Use aliasNameOrderable and nameSpaceOrderable in both start 
 		 * and stop position for index 1 scan. 
 		 */
-		aliasNameOrderable = dvf.getVarcharDataValue(ad.getDescriptorName());
+
 		char[] charArray = new char[1];
 		charArray[0] = ad.getNameSpace();
-		nameSpaceOrderable = dvf.getCharDataValue(new String(charArray));
 
 		/* Set up the start/stop position for the scan */
-		keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(3);
-		keyRow1.setColumn(1, dvf.getCharDataValue(ad.getSchemaUUID().toString()));
-		keyRow1.setColumn(2, aliasNameOrderable);
-		keyRow1.setColumn(3, nameSpaceOrderable);
+        ExecIndexRow keyRow1 = (ExecIndexRow) exFactory.getIndexableRow(3);
+		keyRow1.setColumn(1, getIDValueAsCHAR(ad.getSchemaUUID()));
+		keyRow1.setColumn(2, new SQLVarchar(ad.getDescriptorName()));
+		keyRow1.setColumn(3, new SQLChar(new String(charArray)));
 
 		ti.deleteRow( tc, keyRow1, SYSALIASESRowFactory.SYSALIASES_INDEX1_ID );
 
@@ -6865,8 +6862,8 @@
 		/* Use tableNameOrderable and schemaIdOrderable in both start 
 		 * and stop position for scan. 
 		 */
-		tableNameOrderable = dvf.getVarcharDataValue(tableName);
-		schemaIDOrderable = dvf.getCharDataValue(schemaUUID);
+		tableNameOrderable = new SQLVarchar(tableName);
+		schemaIDOrderable = new SQLChar(schemaUUID);
 
 		/* Set up the start/stop position for the scan */
 		ExecIndexRow keyRow = exFactory.getIndexableRow(2);
@@ -6908,7 +6905,7 @@
 												indexTemplateRow.nColumns());
 	
 			/* 1st column is TABLEID (UUID - char(36)) */
-			row.setColumn(SYSTABLESRowFactory.SYSTABLES_TABLEID, dvf.getCharDataValue((String) null));
+			row.setColumn(SYSTABLESRowFactory.SYSTABLES_TABLEID, new SQLChar());
 			FormatableBitSet bi = new FormatableBitSet(1);
 			bi.set(0);
 			boolean base_row_exists = 
@@ -7432,12 +7429,11 @@
 	  *
 	  *	@return	the UUID converted to an DataValueDescriptor
 	 *
-	 * @exception StandardException		Thrown on error
 	 */
-	public DataValueDescriptor getValueAsDVD( UUID uuid ) throws StandardException
+	private static SQLChar getIDValueAsCHAR(UUID uuid)
 	{
 		String	uuidString = uuid.toString();
-		return 	dvf.getCharDataValue(uuidString);
+		return 	new SQLChar(uuidString);
 	}
 
 	/**
@@ -8285,8 +8281,8 @@
 		ExecIndexRow keyRow = null;
 
 		keyRow = (ExecIndexRow)exFactory.getIndexableRow(2);
-		keyRow.setColumn(1, dvf.getCharDataValue(tableUUID.toString()));
-  		keyRow.setColumn(2, dvf.getCharDataValue(columnName));
+		keyRow.setColumn(1, getIDValueAsCHAR(tableUUID));
+  		keyRow.setColumn(2, new SQLChar(columnName));
 		
 		SYSCOLUMNSRowFactory	rf = (SYSCOLUMNSRowFactory) ti.getCatalogRowFactory();
 		ExecRow row = rf.makeEmptyRow();
@@ -8341,8 +8337,8 @@
 		UUID tableUUID = td.getUUID();
 
 		keyRow = (ExecIndexRow)exFactory.getIndexableRow(2);
-		keyRow.setColumn(1, dvf.getCharDataValue(tableUUID.toString()));
-  		keyRow.setColumn(2, dvf.getCharDataValue(columnName));
+		keyRow.setColumn(1, getIDValueAsCHAR(tableUUID));
+  		keyRow.setColumn(2, new SQLChar(columnName));
 		return ti.getRowLocation(tc, keyRow, 
 								 SYSCOLUMNSRowFactory.SYSCOLUMNS_INDEX1_ID);
 	}
@@ -8426,13 +8422,13 @@
 	{
 		TabInfoImpl					ti = getNonCoreTI(SYSSTATISTICS_CATALOG_NUM);
 		DataValueDescriptor first, second;
-		first = dvf.getCharDataValue(tableUUID.toString());
+		first = getIDValueAsCHAR(tableUUID);
 
 		ExecIndexRow keyRow;
 		if (referenceUUID != null)
 		{
 			keyRow = exFactory.getIndexableRow(2);
-			second = dvf.getCharDataValue(referenceUUID.toString());
+			second = getIDValueAsCHAR(referenceUUID);
 			keyRow.setColumn(2, second);
 		}
 		else

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java Tue May 22 11:38:02 2007
@@ -32,6 +32,7 @@
 import org.apache.derby.iapi.types.DataValueDescriptor;
 import org.apache.derby.iapi.types.DataValueFactory;
 import org.apache.derby.iapi.types.RowLocation;
+import org.apache.derby.iapi.types.SQLVarchar;
 import org.apache.derby.iapi.types.StringDataValue;
 
 abstract class PermissionsCatalogRowFactory extends CatalogRowFactory
@@ -48,12 +49,12 @@
 
     DataValueDescriptor getAuthorizationID( String value)
     {
-        return getDataValueFactory().getVarcharDataValue( value);
+        return new SQLVarchar(value);
     }
 
     DataValueDescriptor getNullAuthorizationID()
     {
-        return getDataValueFactory().getNullVarchar( (StringDataValue) null);
+        return new SQLVarchar();
     }
 
     /**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java Tue May 22 11:38:02 2007
@@ -36,6 +36,8 @@
 import org.apache.derby.iapi.sql.execute.ExecutionFactory;
 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.SQLVarchar;
 
 
 /**
@@ -188,26 +190,26 @@
 		ExecRow row = getExecutionFactory().getValueRow(SYSALIASES_COLUMN_COUNT);
 
 		/* 1st column is ALIASID (UUID - char(36)) */
-		row.setColumn(SYSALIASES_ALIASID, dvf.getCharDataValue(aliasID));
+		row.setColumn(SYSALIASES_ALIASID, new SQLChar(aliasID));
 
 		/* 2nd column is ALIAS (varchar(128))) */
-		row.setColumn(SYSALIASES_ALIAS, dvf.getVarcharDataValue(aliasName));
+		row.setColumn(SYSALIASES_ALIAS, new SQLVarchar(aliasName));
 		//		System.out.println(" added row-- " + aliasName);
 
 		/* 3rd column is SCHEMAID (UUID - char(36)) */
-		row.setColumn(SYSALIASES_SCHEMAID, dvf.getCharDataValue(schemaID));
+		row.setColumn(SYSALIASES_SCHEMAID, new SQLChar(schemaID));
 
 		/* 4th column is JAVACLASSNAME (longvarchar) */
 		row.setColumn(SYSALIASES_JAVACLASSNAME, dvf.getLongvarcharDataValue(javaClassName));
 
 		/* 5th column is ALIASTYPE (char(1)) */
-		row.setColumn(SYSALIASES_ALIASTYPE, dvf.getCharDataValue(sAliasType));
+		row.setColumn(SYSALIASES_ALIASTYPE, new SQLChar(sAliasType));
 
 		/* 6th column is NAMESPACE (char(1)) */
 		String sNameSpace = new String(new char[] { cNameSpace });
 
 		row.setColumn
-			(SYSALIASES_NAMESPACE, dvf.getCharDataValue(sNameSpace));
+			(SYSALIASES_NAMESPACE, new SQLChar(sNameSpace));
 
 
 		/* 7th column is SYSTEMALIAS (boolean) */
@@ -220,7 +222,7 @@
 
 		/* 9th column is specific name */
 		row.setColumn
-			(SYSALIASES_SPECIFIC_NAME, dvf.getVarcharDataValue(specificName));
+			(SYSALIASES_SPECIFIC_NAME, new SQLVarchar(specificName));
 
 
 		return row;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java Tue May 22 11:38:02 2007
@@ -40,6 +40,7 @@
 import org.apache.derby.iapi.sql.execute.ExecutionFactory;
 import org.apache.derby.iapi.types.DataValueDescriptor;
 import org.apache.derby.iapi.types.DataValueFactory;
+import org.apache.derby.iapi.types.SQLChar;
 
 /**
  * Factory for creating a SYSCHECKS row.
@@ -129,7 +130,7 @@
 		row = getExecutionFactory().getIndexableRow(SYSCHECKS_COLUMN_COUNT);
 
 		/* 1st column is CONSTRAINTID (UUID - char(36)) */
-		row.setColumn(SYSCHECKS_CONSTRAINTID, dvf.getCharDataValue(constraintID));
+		row.setColumn(SYSCHECKS_CONSTRAINTID, new SQLChar(constraintID));
 
 		/* 2nd column is CHECKDEFINITION */
 		row.setColumn(SYSCHECKS_CHECKDEFINITION,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java Tue May 22 11:38:02 2007
@@ -35,6 +35,7 @@
 import org.apache.derby.iapi.sql.execute.ExecRow;
 import org.apache.derby.iapi.sql.execute.ExecIndexRow;
 import org.apache.derby.iapi.sql.execute.ExecutionFactory;
+import org.apache.derby.iapi.types.SQLChar;
 import org.apache.derby.iapi.types.TypeId;
 import org.apache.derby.iapi.types.DataValueFactory;
 import org.apache.derby.iapi.types.RowLocation;
@@ -130,11 +131,11 @@
             columns = cpd.getColumns();
         }
         ExecRow row = getExecutionFactory().getValueRow( COLUMN_COUNT);
-        row.setColumn( COLPERMSID_COL_NUM, dvf.getCharDataValue(colPermID));
+        row.setColumn( COLPERMSID_COL_NUM, new SQLChar(colPermID));
         row.setColumn( GRANTEE_COL_NUM, grantee);
         row.setColumn( GRANTOR_COL_NUM, grantor);
-        row.setColumn( TABLEID_COL_NUM, dvf.getCharDataValue( tableID));
-        row.setColumn( TYPE_COL_NUM, dvf.getCharDataValue( type));
+        row.setColumn( TABLEID_COL_NUM, new SQLChar(tableID));
+        row.setColumn( TYPE_COL_NUM, new SQLChar(type));
         row.setColumn( COLUMNS_COL_NUM, dvf.getDataValue( (Object) columns));
         return row;
     } // end of makeRow
@@ -209,19 +210,19 @@
             row.setColumn(1, getAuthorizationID( perm.getGrantee()));
             ColPermsDescriptor colPerms = (ColPermsDescriptor) perm;
             String tableUUIDStr = colPerms.getTableUUID().toString();
-            row.setColumn(2, getDataValueFactory().getCharDataValue( tableUUIDStr));
-            row.setColumn(3, getDataValueFactory().getCharDataValue( colPerms.getType()));
+            row.setColumn(2, new SQLChar(tableUUIDStr));
+            row.setColumn(3, new SQLChar(colPerms.getType()));
             break;
         case COLPERMSID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             String colPermsUUIDStr = perm.getObjectID().toString();
-            row.setColumn(1, getDataValueFactory().getCharDataValue( colPermsUUIDStr));
+            row.setColumn(1, new SQLChar(colPermsUUIDStr));
             break;
         case TABLEID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             colPerms = (ColPermsDescriptor) perm;
             tableUUIDStr = colPerms.getTableUUID().toString();
-            row.setColumn(1, getDataValueFactory().getCharDataValue( tableUUIDStr));
+            row.setColumn(1, new SQLChar(tableUUIDStr));
             break;
         }
         return row;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java Tue May 22 11:38:02 2007
@@ -36,6 +36,7 @@
 
 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;
@@ -237,10 +238,10 @@
 		row = getExecutionFactory().getValueRow(SYSCOLUMNS_COLUMN_COUNT);
 
 		/* 1st column is REFERENCEID (UUID - char(36)) */
-		row.setColumn(SYSCOLUMNS_REFERENCEID, dvf.getCharDataValue(tabID));
+		row.setColumn(SYSCOLUMNS_REFERENCEID, new SQLChar(tabID));
 
 		/* 2nd column is COLUMNNAME (varchar(128)) */
-		row.setColumn(SYSCOLUMNS_COLUMNNAME, dvf.getVarcharDataValue(colName));
+		row.setColumn(SYSCOLUMNS_COLUMNNAME, new SQLVarchar(colName));
 
 		/* 3rd column is COLUMNNUMBER (int) */
 		row.setColumn(SYSCOLUMNS_COLUMNNUMBER, dvf.getDataValue(colID));
@@ -254,7 +255,7 @@
 					  dvf.getDataValue(defaultSerializable));
 
 		/* 6th column is DEFAULTID (UUID - char(36)) */
-		row.setColumn(SYSCOLUMNS_COLUMNDEFAULTID, dvf.getCharDataValue(defaultID));
+		row.setColumn(SYSCOLUMNS_COLUMNDEFAULTID, new SQLChar(defaultID));
 
 		if (autoinc_create_or_modify_Start_Increment == ColumnDefinitionNode.CREATE_AUTOINCREMENT ||
 				autoinc_create_or_modify_Start_Increment == ColumnDefinitionNode.MODIFY_AUTOINCREMENT_INC_VALUE)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java Tue May 22 11:38:02 2007
@@ -23,6 +23,8 @@
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
+import org.apache.derby.iapi.types.SQLChar;
+import org.apache.derby.iapi.types.SQLVarchar;
 import org.apache.derby.iapi.types.TypeId;
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
 import org.apache.derby.catalog.TypeDescriptor;
@@ -167,10 +169,10 @@
 		row = getExecutionFactory().getValueRow(SYSCONGLOMERATES_COLUMN_COUNT);
 
 		/* 1st column is SCHEMAID (UUID - char(36)) */
-		row.setColumn(1, dvf.getCharDataValue(schemaID));
+		row.setColumn(1, new SQLChar(schemaID));
 
 		/* 2nd column is TABLEID (UUID - char(36)) */
-		row.setColumn(2, dvf.getCharDataValue(tabID));
+		row.setColumn(2, new SQLChar(tabID));
 
 		/* 3rd column is CONGLOMERATENUMBER (long) */
 		row.setColumn(3, dvf.getDataValue(conglomNumber));
@@ -180,8 +182,7 @@
 		** have a unique column
 		*/
 		row.setColumn(4, (conglomName == null) ?
-				dvf.getVarcharDataValue(tabID):
-				dvf.getVarcharDataValue(conglomName));
+                new SQLVarchar(tabID): new SQLVarchar(conglomName));
 
 		/* 5th  column is ISINDEX (boolean) */
 		row.setColumn(5, dvf.getDataValue(supportsIndex));
@@ -202,7 +203,7 @@
 		row.setColumn(7, dvf.getDataValue(supportsConstraint));
 
 		/* 8th column is CONGLOMERATEID (UUID - char(36)) */
-		row.setColumn(8, dvf.getCharDataValue(conglomUUIDString));
+		row.setColumn(8, new SQLChar(conglomUUIDString));
 
 		return row;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java Tue May 22 11:38:02 2007
@@ -41,6 +41,8 @@
 import org.apache.derby.iapi.sql.execute.ExecutionFactory;
 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.SQLVarchar;
 
 /**
  * Factory for creating a SYSCONTRAINTS row.
@@ -184,22 +186,22 @@
 		row = getExecutionFactory().getValueRow(SYSCONSTRAINTS_COLUMN_COUNT);
 
 		/* 1st column is CONSTRAINTID (UUID - char(36)) */
-		row.setColumn(SYSCONSTRAINTS_CONSTRAINTID, dvf.getCharDataValue(constraintID));
+		row.setColumn(SYSCONSTRAINTS_CONSTRAINTID, new SQLChar(constraintID));
 
 		/* 2nd column is TABLEID (UUID - char(36)) */
-		row.setColumn(SYSCONSTRAINTS_TABLEID, dvf.getCharDataValue(tableID));
+		row.setColumn(SYSCONSTRAINTS_TABLEID, new SQLChar(tableID));
 
 		/* 3rd column is NAME (varchar(128)) */
-		row.setColumn(SYSCONSTRAINTS_CONSTRAINTNAME, dvf.getVarcharDataValue(constraintName));
+		row.setColumn(SYSCONSTRAINTS_CONSTRAINTNAME, new SQLVarchar(constraintName));
 
 		/* 4th column is TYPE (char(1)) */
-		row.setColumn(SYSCONSTRAINTS_TYPE, dvf.getCharDataValue(constraintSType));
+		row.setColumn(SYSCONSTRAINTS_TYPE, new SQLChar(constraintSType));
 
 		/* 5th column is SCHEMAID (UUID - char(36)) */
-		row.setColumn(SYSCONSTRAINTS_SCHEMAID, dvf.getCharDataValue(schemaID));
+		row.setColumn(SYSCONSTRAINTS_SCHEMAID, new SQLChar(schemaID));
 
 		/* 6th column is STATE (char(1)) */
-		row.setColumn(SYSCONSTRAINTS_STATE, dvf.getCharDataValue(isEnabled ? "E" : "D"));
+		row.setColumn(SYSCONSTRAINTS_STATE, new SQLChar(isEnabled ? "E" : "D"));
 
 		/* 7th column is REFERENCED */
 		row.setColumn(SYSCONSTRAINTS_REFERENCECOUNT, dvf.getDataValue(referenceCount));

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java Tue May 22 11:38:02 2007
@@ -37,6 +37,7 @@
 import org.apache.derby.iapi.sql.execute.ExecutionFactory;
 import org.apache.derby.iapi.types.DataValueDescriptor;
 import org.apache.derby.iapi.types.DataValueFactory;
+import org.apache.derby.iapi.types.SQLChar;
 
 /**
  * Factory for creating a SYSDEPENDSS row.
@@ -145,14 +146,14 @@
 		row = getExecutionFactory().getValueRow(SYSDEPENDS_COLUMN_COUNT);
 
 		/* 1st column is DEPENDENTID (UUID - char(36)) */
-		row.setColumn(SYSDEPENDS_DEPENDENTID, dvf.getCharDataValue(dependentID));
+		row.setColumn(SYSDEPENDS_DEPENDENTID, new SQLChar(dependentID));
 
 		/* 2nd column is DEPENDENTFINDER */
 		row.setColumn(SYSDEPENDS_DEPENDENTTYPE,
 				dvf.getDataValue(dependentBloodhound));
 
 		/* 3rd column is PROVIDERID (UUID - char(36)) */
-		row.setColumn(SYSDEPENDS_PROVIDERID, dvf.getCharDataValue(providerID));
+		row.setColumn(SYSDEPENDS_PROVIDERID, new SQLChar(providerID));
 
 		/* 4th column is PROVIDERFINDER */
 		row.setColumn(SYSDEPENDS_PROVIDERTYPE,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java Tue May 22 11:38:02 2007
@@ -38,6 +38,7 @@
 import org.apache.derby.iapi.types.DataValueFactory;
 import org.apache.derby.iapi.types.RowLocation;
 import org.apache.derby.iapi.types.DataValueDescriptor;
+import org.apache.derby.iapi.types.SQLChar;
 import org.apache.derby.iapi.services.uuid.UUIDFactory;
 import org.apache.derby.catalog.UUID;
 
@@ -87,7 +88,7 @@
 	{
 		ExecRow row = getExecutionFactory().getValueRow(SYSDUMMY1_COLUMN_COUNT);
 		
-		row.setColumn(1, dvf.getCharDataValue("Y"));
+		row.setColumn(1, new SQLChar("Y"));
 		return row;
 	}
 	

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java Tue May 22 11:38:02 2007
@@ -33,6 +33,8 @@
 import org.apache.derby.iapi.sql.dictionary.FileInfoDescriptor;
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
 import org.apache.derby.iapi.sql.dictionary.TupleDescriptor;
+import org.apache.derby.iapi.types.SQLChar;
+import org.apache.derby.iapi.types.SQLVarchar;
 import org.apache.derby.iapi.types.TypeId;
 import org.apache.derby.iapi.types.DataValueFactory;
 import org.apache.derby.iapi.types.RowLocation;
@@ -146,13 +148,13 @@
 		row = getExecutionFactory().getValueRow(SYSFILES_COLUMN_COUNT);
 
 		/* 1st column is ID (UUID - char(36)) */
-		row.setColumn(ID_COL_NUM, dvf.getCharDataValue(id_S));
+		row.setColumn(ID_COL_NUM, new SQLChar(id_S));
 
 		/* 2nd column is SCHEMAID (UUID - char(36)) */
-		row.setColumn(SCHEMA_ID_COL_NUM, dvf.getCharDataValue(schemaId_S));
+		row.setColumn(SCHEMA_ID_COL_NUM, new SQLChar(schemaId_S));
 
 		/* 3rd column is NAME (varchar(30)) */
-		row.setColumn(NAME_COL_NUM, dvf.getVarcharDataValue(SQLname));
+		row.setColumn(NAME_COL_NUM, new SQLVarchar(SQLname));
 
 		/* 4th column is GENERATIONID (long) */
 		row.setColumn(GENERATION_ID_COL_NUM, dvf.getDataValue(generationId));

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java Tue May 22 11:38:02 2007
@@ -39,6 +39,7 @@
 import org.apache.derby.iapi.sql.execute.ExecutionFactory;
 import org.apache.derby.iapi.types.DataValueDescriptor;
 import org.apache.derby.iapi.types.DataValueFactory;
+import org.apache.derby.iapi.types.SQLChar;
 
 /**
  * Factory for creating a SYSFOREIGNKEYS row.
@@ -141,20 +142,20 @@
 		row = getExecutionFactory().getIndexableRow(SYSFOREIGNKEYS_COLUMN_COUNT);
 
 		/* 1st column is CONSTRAINTID (UUID - char(36)) */
-		row.setColumn(SYSFOREIGNKEYS_CONSTRAINTID, dvf.getCharDataValue(constraintId));
+		row.setColumn(SYSFOREIGNKEYS_CONSTRAINTID, new SQLChar(constraintId));
 
 		/* 2nd column is CONGLOMERATEID (UUID - char(36)) */
-		row.setColumn(SYSFOREIGNKEYS_CONGLOMERATEID, dvf.getCharDataValue(conglomId));
+		row.setColumn(SYSFOREIGNKEYS_CONGLOMERATEID, new SQLChar(conglomId));
 
 		/* 3rd column is KEYCONSTRAINTID (UUID - char(36)) */
-		row.setColumn(SYSFOREIGNKEYS_KEYCONSTRAINTID, dvf.getCharDataValue(keyConstraintId));
+		row.setColumn(SYSFOREIGNKEYS_KEYCONSTRAINTID, new SQLChar(keyConstraintId));
 
 		// currently, DELETERULE and UPDATERULE are always "R" for restrict
 		/* 4th column is DELETERULE char(1) */
-		row.setColumn(SYSFOREIGNKEYS_DELETERULE, dvf.getCharDataValue(raDeleteRule));
+		row.setColumn(SYSFOREIGNKEYS_DELETERULE, new SQLChar(raDeleteRule));
 
 		/* 5th column is UPDATERULE char(1) */
-		row.setColumn(SYSFOREIGNKEYS_UPDATERULE, dvf.getCharDataValue(raUpdateRule));
+		row.setColumn(SYSFOREIGNKEYS_UPDATERULE, new SQLChar(raUpdateRule));
 
 		return row;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java Tue May 22 11:38:02 2007
@@ -36,6 +36,7 @@
 import org.apache.derby.iapi.sql.execute.ExecutionFactory;
 import org.apache.derby.iapi.types.DataValueDescriptor;
 import org.apache.derby.iapi.types.DataValueFactory;
+import org.apache.derby.iapi.types.SQLChar;
 
 /**
  * Factory for creating a SYSKEYS row.
@@ -125,9 +126,9 @@
 		row = getExecutionFactory().getValueRow(SYSKEYS_COLUMN_COUNT);
 
 		/* 1st column is CONSTRAINTID (UUID - char(36)) */
-		row.setColumn(SYSKEYS_CONSTRAINTID, dvf.getCharDataValue(constraintID));
+		row.setColumn(SYSKEYS_CONSTRAINTID, new SQLChar(constraintID));
 		/* 2nd column is CONGLOMERATEID (UUID - char(36)) */
-		row.setColumn(SYSKEYS_CONGLOMERATEID, dvf.getCharDataValue(conglomerateID));
+		row.setColumn(SYSKEYS_CONGLOMERATEID, new SQLChar(conglomerateID));
 
 		return row;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java Tue May 22 11:38:02 2007
@@ -36,6 +36,7 @@
 import org.apache.derby.iapi.types.DataValueFactory;
 import org.apache.derby.iapi.types.RowLocation;
 import org.apache.derby.iapi.types.DataValueDescriptor;
+import org.apache.derby.iapi.types.SQLChar;
 import org.apache.derby.iapi.types.StringDataValue;
 import org.apache.derby.iapi.services.uuid.UUIDFactory;
 import org.apache.derby.catalog.UUID;
@@ -117,11 +118,11 @@
                 routineID = rpd.getRoutineUUID().toString();
         }
 		ExecRow row = getExecutionFactory().getValueRow( COLUMN_COUNT);
-		row.setColumn( ROUTINEPERMSID_COL_NUM, dvf.getCharDataValue(routinePermID));
+		row.setColumn( ROUTINEPERMSID_COL_NUM, new SQLChar(routinePermID));
         row.setColumn( GRANTEE_COL_NUM, grantee);
         row.setColumn( GRANTOR_COL_NUM, grantor);
-        row.setColumn( ALIASID_COL_NUM, dvf.getCharDataValue( routineID));
-        row.setColumn( GRANTOPTION_COL_NUM, dvf.getCharDataValue( "N"));
+        row.setColumn( ALIASID_COL_NUM, new SQLChar(routineID));
+        row.setColumn( GRANTOPTION_COL_NUM, new SQLChar("N"));
         return row;
     } // end of makeRow
             
@@ -231,17 +232,17 @@
             row = getExecutionFactory().getIndexableRow( 2);
             row.setColumn(1, getAuthorizationID( perm.getGrantee()));
             String routineUUIDStr = ((RoutinePermsDescriptor) perm).getRoutineUUID().toString();
-            row.setColumn(2, getDataValueFactory().getCharDataValue( routineUUIDStr));
+            row.setColumn(2, new SQLChar(routineUUIDStr));
             break;
         case ROUTINEPERMSID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             String routinePermsUUIDStr = perm.getObjectID().toString();
-            row.setColumn(1, getDataValueFactory().getCharDataValue( routinePermsUUIDStr));
+            row.setColumn(1, new SQLChar(routinePermsUUIDStr));
             break;
         case ALIASID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             routineUUIDStr = ((RoutinePermsDescriptor) perm).getRoutineUUID().toString();
-            row.setColumn(1, getDataValueFactory().getCharDataValue( routineUUIDStr));
+            row.setColumn(1, new SQLChar(routineUUIDStr));
             break;
         }
         return row;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java Tue May 22 11:38:02 2007
@@ -22,6 +22,8 @@
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
+import org.apache.derby.iapi.types.SQLChar;
+import org.apache.derby.iapi.types.SQLVarchar;
 import org.apache.derby.iapi.types.TypeId;
 import org.apache.derby.iapi.types.DataValueDescriptor;
 
@@ -146,13 +148,13 @@
 		row = getExecutionFactory().getValueRow(SYSSCHEMAS_COLUMN_COUNT);
 
 		/* 1st column is SCHEMAID */
-		row.setColumn(1, dvf.getCharDataValue(uuid));
+		row.setColumn(1, new SQLChar(uuid));
 
 		/* 2nd column is SCHEMANAME */
-		row.setColumn(2, dvf.getVarcharDataValue(name));
+		row.setColumn(2, new SQLVarchar(name));
 
 		/* 3rd column is SCHEMAAID */
-		row.setColumn(3, dvf.getVarcharDataValue(aid));
+		row.setColumn(3, new SQLVarchar(aid));
 
 		return row;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java Tue May 22 11:38:02 2007
@@ -24,6 +24,7 @@
 import org.apache.derby.iapi.reference.Property;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
+import org.apache.derby.iapi.types.SQLVarchar;
 import org.apache.derby.iapi.types.TypeId;
 import org.apache.derby.iapi.types.DataValueDescriptor;
 
@@ -195,16 +196,16 @@
 		row = getExecutionFactory().getValueRow(SYSSTATEMENTS_COLUMN_COUNT);
 
 		/* 1st column is STMTID */
-		row.setColumn(1, dvf.getCharDataValue(uuidStr));
+		row.setColumn(1, new SQLChar(uuidStr));
 
 		/* 2nd column is STMTNAME */
-		row.setColumn(2, dvf.getVarcharDataValue(name));
+		row.setColumn(2, new SQLVarchar(name));
 
 		/* 3rd column is SCHEMAID */
-		row.setColumn(3, dvf.getCharDataValue(suuidStr));
+		row.setColumn(3, new SQLChar(suuidStr));
 
 		/* 4th column is TYPE */
-		row.setColumn(4, dvf.getCharDataValue(typeStr));
+		row.setColumn(4, new SQLChar(typeStr));
 
 		/* 5th column is VALID */
 		row.setColumn(5, dvf.getDataValue(valid));
@@ -216,7 +217,7 @@
 		row.setColumn(7, new SQLTimestamp(time));
 
 		/* 8th column is COMPILATIONSCHEMAID */
-		row.setColumn(8, dvf.getCharDataValue(compUuidStr));
+		row.setColumn(8, new SQLChar(compUuidStr));
 
 		/* 9th column is USINGTEXT */
 		row.setColumn(9, dvf.getLongvarcharDataValue(usingText));

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java Tue May 22 11:38:02 2007
@@ -160,11 +160,11 @@
 			columnCount = statDesc.getColumnCount();
 		}
 
-		row.setColumn(1, dvf.getCharDataValue(myID));
-		row.setColumn(2, dvf.getCharDataValue(referenceID));
-		row.setColumn(3, dvf.getCharDataValue(tableID));
+		row.setColumn(1, new SQLChar(myID));
+		row.setColumn(2, new SQLChar(referenceID));
+		row.setColumn(3, new SQLChar(tableID));
 		row.setColumn(4, new SQLTimestamp(updateTime));
-		row.setColumn(5, dvf.getCharDataValue(statType));
+		row.setColumn(5, new SQLChar(statType));
   		row.setColumn(6, dvf.getDataValue(validStat));
 		row.setColumn(7, dvf.getDataValue(columnCount));
 		row.setColumn(8, dvf.getDataValue(statisticsObject));

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java Tue May 22 11:38:02 2007
@@ -38,6 +38,7 @@
 import org.apache.derby.iapi.types.DataValueDescriptor;
 import org.apache.derby.iapi.types.DataValueFactory;
 import org.apache.derby.iapi.types.RowLocation;
+import org.apache.derby.iapi.types.SQLChar;
 import org.apache.derby.iapi.types.StringDataValue;
 
 /**
@@ -133,16 +134,16 @@
             triggerPriv = tpd.getTriggerPriv();
         }
         ExecRow row = getExecutionFactory().getValueRow( COLUMN_COUNT);
-        row.setColumn( TABLEPERMSID_COL_NUM, dvf.getCharDataValue(tablePermID));
+        row.setColumn( TABLEPERMSID_COL_NUM, new SQLChar(tablePermID));
         row.setColumn( GRANTEE_COL_NUM, grantee);
         row.setColumn( GRANTOR_COL_NUM, grantor);
-        row.setColumn( TABLEID_COL_NUM, dvf.getCharDataValue( tableID));
-        row.setColumn( SELECTPRIV_COL_NUM, dvf.getCharDataValue( selectPriv));
-        row.setColumn( DELETEPRIV_COL_NUM, dvf.getCharDataValue( deletePriv));
-        row.setColumn( INSERTPRIV_COL_NUM, dvf.getCharDataValue( insertPriv));
-        row.setColumn( UPDATEPRIV_COL_NUM, dvf.getCharDataValue( updatePriv));
-        row.setColumn( REFERENCESPRIV_COL_NUM,dvf.getCharDataValue(  referencesPriv));
-        row.setColumn( TRIGGERPRIV_COL_NUM, dvf.getCharDataValue( triggerPriv));
+        row.setColumn( TABLEID_COL_NUM, new SQLChar(tableID));
+        row.setColumn( SELECTPRIV_COL_NUM, new SQLChar(selectPriv));
+        row.setColumn( DELETEPRIV_COL_NUM, new SQLChar(deletePriv));
+        row.setColumn( INSERTPRIV_COL_NUM, new SQLChar(insertPriv));
+        row.setColumn( UPDATEPRIV_COL_NUM, new SQLChar(updatePriv));
+        row.setColumn( REFERENCESPRIV_COL_NUM, new SQLChar( referencesPriv));
+        row.setColumn( TRIGGERPRIV_COL_NUM, new SQLChar(triggerPriv));
 
         return row;
     } // end of makeRow
@@ -319,17 +320,17 @@
             row = getExecutionFactory().getIndexableRow( 2);
             row.setColumn(1, getAuthorizationID( perm.getGrantee()));
             String tableUUIDStr = ((TablePermsDescriptor) perm).getTableUUID().toString();
-            row.setColumn(2, getDataValueFactory().getCharDataValue( tableUUIDStr));
+            row.setColumn(2, new SQLChar(tableUUIDStr));
             break;
         case TABLEPERMSID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             String tablePermsUUIDStr = perm.getObjectID().toString();
-            row.setColumn(1, getDataValueFactory().getCharDataValue( tablePermsUUIDStr));
+            row.setColumn(1, new SQLChar(tablePermsUUIDStr));
             break;
         case TABLEID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             tableUUIDStr = ((TablePermsDescriptor) perm).getTableUUID().toString();
-            row.setColumn(1, getDataValueFactory().getCharDataValue( tableUUIDStr));
+            row.setColumn(1, new SQLChar(tableUUIDStr));
             break;
         }
         return row;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java Tue May 22 11:38:02 2007
@@ -27,6 +27,8 @@
 
 import org.apache.derby.iapi.types.DataValueFactory;
 import org.apache.derby.iapi.types.RowLocation;
+import org.apache.derby.iapi.types.SQLChar;
+import org.apache.derby.iapi.types.SQLVarchar;
 
 import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory;
 import org.apache.derby.iapi.sql.dictionary.TupleDescriptor;
@@ -200,19 +202,19 @@
 		row = getExecutionFactory().getValueRow(SYSTABLES_COLUMN_COUNT);
 
 		/* 1st column is TABLEID (UUID - char(36)) */
-		row.setColumn(SYSTABLES_TABLEID, dvf.getCharDataValue(tableID));
+		row.setColumn(SYSTABLES_TABLEID, new SQLChar(tableID));
 
 		/* 2nd column is NAME (varchar(30)) */
-		row.setColumn(SYSTABLES_TABLENAME, dvf.getVarcharDataValue(tableName));
+		row.setColumn(SYSTABLES_TABLENAME, new SQLVarchar(tableName));
 
 		/* 3rd column is TABLETYPE (char(1)) */
-		row.setColumn(SYSTABLES_TABLETYPE, dvf.getCharDataValue(tabSType));
+		row.setColumn(SYSTABLES_TABLETYPE, new SQLChar(tabSType));
 
 		/* 4th column is SCHEMAID (UUID - char(36)) */
-		row.setColumn(SYSTABLES_SCHEMAID, dvf.getCharDataValue(schemaID));
+		row.setColumn(SYSTABLES_SCHEMAID, new SQLChar(schemaID));
 
 		/* 5th column is LOCKGRANULARITY (char(1)) */
-		row.setColumn(SYSTABLES_LOCKGRANULARITY, dvf.getCharDataValue(lockGranularity));
+		row.setColumn(SYSTABLES_LOCKGRANULARITY, new SQLChar(lockGranularity));
 
 		return row;
 	}
@@ -239,16 +241,16 @@
 		{
 		    case SYSTABLES_INDEX1_ID:
 				/* 1st column is TABLENAME (varchar(128)) */
-				row.setColumn(1, getDataValueFactory().getVarcharDataValue((String) null));
+				row.setColumn(1, new SQLVarchar());
 
 				/* 2nd column is SCHEMAID (UUID - char(36)) */
-				row.setColumn(2, getDataValueFactory().getCharDataValue((String) null));
+				row.setColumn(2, new SQLChar());
 
 				break;
 
 		    case SYSTABLES_INDEX2_ID:
 				/* 1st column is TABLEID (UUID - char(36)) */
-				row.setColumn(1, getDataValueFactory().getCharDataValue((String) null));
+				row.setColumn(1,new SQLChar());
 				break;
 		}	// end switch
 

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?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- 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 Tue May 22 11:38:02 2007
@@ -23,6 +23,8 @@
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
 import org.apache.derby.iapi.types.DataValueDescriptor;
+import org.apache.derby.iapi.types.SQLChar;
+import org.apache.derby.iapi.types.SQLVarchar;
 import org.apache.derby.iapi.types.TypeId;
 
 import org.apache.derby.iapi.types.TypeId;
@@ -192,37 +194,37 @@
 		row = getExecutionFactory().getValueRow(SYSTRIGGERS_COLUMN_COUNT);
 
 		/* 1st column is TRIGGERID */
-		row.setColumn(1, dvf.getCharDataValue((uuid == null) ? null : uuid.toString()));
+		row.setColumn(1, new SQLChar((uuid == null) ? null : uuid.toString()));
 
 		/* 2nd column is TRIGGERNAME */
-		row.setColumn(2, dvf.getVarcharDataValue(name));
+		row.setColumn(2, new SQLVarchar(name));
 
 		/* 3rd column is SCHEMAID */
-		row.setColumn(3, dvf.getCharDataValue((suuid == null) ? null : suuid.toString()));
+		row.setColumn(3, new SQLChar((suuid == null) ? null : suuid.toString()));
 
 		/* 4th column is CREATIONTIMESTAMP */
 		row.setColumn(4, dvf.getDataValue(createTime));
 
 		/* 5th column is EVENT */
-		row.setColumn(5, dvf.getCharDataValue(event));
+		row.setColumn(5, new SQLChar(event));
 
 		/* 6th column is FIRINGTIME */
-		row.setColumn(6, dvf.getCharDataValue(time));
+		row.setColumn(6, new SQLChar(time));
 
 		/* 7th column is TYPE */
-		row.setColumn(7, dvf.getCharDataValue(type));
+		row.setColumn(7, new SQLChar(type));
 
 		/* 8th column is STATE */
-		row.setColumn(8, dvf.getCharDataValue(enabled));
+		row.setColumn(8, new SQLChar(enabled));
 
 		/* 9th column is TABLEID */
-		row.setColumn(9, dvf.getCharDataValue((tuuid == null) ? null : tuuid.toString()));
+		row.setColumn(9, new SQLChar((tuuid == null) ? null : tuuid.toString()));
 
 		/* 10th column is WHENSTMTID */
-		row.setColumn(10, dvf.getCharDataValue((whenSPSID == null) ? null : whenSPSID.toString()));
+		row.setColumn(10, new SQLChar((whenSPSID == null) ? null : whenSPSID.toString()));
 
 		/* 11th column is ACTIONSTMTID */
-		row.setColumn(11, dvf.getCharDataValue((actionSPSID == null) ? null : actionSPSID.toString()));
+		row.setColumn(11, new SQLChar((actionSPSID == null) ? null : actionSPSID.toString()));
 
 		/* 12th column is REFERENCEDCOLUMNS 
 		 *  (user type org.apache.derby.catalog.ReferencedColumns)
@@ -239,10 +241,10 @@
 		row.setColumn(15, dvf.getDataValue(referencingNew));
 
 		/* 16th column is OLDREFERENCINGNAME */
-		row.setColumn(16, dvf.getVarcharDataValue(oldReferencingName));
+		row.setColumn(16, new SQLVarchar(oldReferencingName));
 
 		/* 17th column is NEWREFERENCINGNAME */
-		row.setColumn(17, dvf.getVarcharDataValue(newReferencingName));
+		row.setColumn(17, new SQLVarchar(newReferencingName));
 
 		return row;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java?view=diff&rev=540689&r1=540688&r2=540689
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java Tue May 22 11:38:02 2007
@@ -35,6 +35,7 @@
 import org.apache.derby.iapi.sql.execute.ExecutionFactory;
 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.TypeId;
 
 /**
@@ -157,17 +158,17 @@
 		row = getExecutionFactory().getValueRow(SYSVIEWS_COLUMN_COUNT);
 
 		/* 1st column is TABLEID (UUID - char(36)) */
-		row.setColumn(SYSVIEWS_TABLEID, dvf.getCharDataValue(tableID));
+		row.setColumn(SYSVIEWS_TABLEID, new SQLChar(tableID));
 
 		/* 2nd column is VIEWDEFINITION */
 		row.setColumn(SYSVIEWS_VIEWDEFINITION,
 				dvf.getLongvarcharDataValue(viewText));
 
 		/* 3rd column is CHECKOPTION (char(1)) */
-		row.setColumn(SYSVIEWS_CHECKOPTION, dvf.getCharDataValue(checkSType));
+		row.setColumn(SYSVIEWS_CHECKOPTION, new SQLChar(checkSType));
 
 		/* 4th column is COMPILATIONSCHEMAID (UUID - char(36)) */
-		row.setColumn(SYSVIEWS_COMPILATION_SCHEMAID, dvf.getCharDataValue(compSchemaId));
+		row.setColumn(SYSVIEWS_COMPILATION_SCHEMAID, new SQLChar(compSchemaId));
 
 		return row;
 	}



Mime
View raw message