Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Alias.java
===================================================================
--- Z:/src/derby-dev/java/tools/org/apache/derby/impl/tools/dblook/DB_Alias.java	(revision 630969)
+++ Z:/src/derby-dev/java/tools/org/apache/derby/impl/tools/dblook/DB_Alias.java	(working copy)
@@ -50,13 +50,13 @@
 		Statement stmt = conn.createStatement();
 		ResultSet rs = stmt.executeQuery("SELECT ALIAS, ALIASINFO, " +
 			"ALIASID, SCHEMAID, JAVACLASSNAME, SYSTEMALIAS FROM SYS.SYSALIASES " +
-			"WHERE ALIASTYPE='P'");
+			"WHERE CAST(ALIASTYPE AS CHAR(1)) = 'P'");
 		generateDDL(rs, 'P');	// 'P' => for PROCEDURES
 
 		// Now do functions.
 		rs = stmt.executeQuery("SELECT ALIAS, ALIASINFO, " +
 			"ALIASID, SCHEMAID, JAVACLASSNAME, SYSTEMALIAS FROM SYS.SYSALIASES " +
-			"WHERE ALIASTYPE='F'");
+			"WHERE CAST(ALIASTYPE AS CHAR(1)) = 'F'");
 		generateDDL(rs, 'F');	// 'F' => for FUNCTIONS
 
 		rs.close();
@@ -165,7 +165,7 @@
 	{
 		Statement stmt = conn.createStatement();
 		ResultSet rs = stmt.executeQuery("SELECT ALIAS, SCHEMAID, " +
-			"ALIASINFO, SYSTEMALIAS FROM SYS.SYSALIASES A WHERE ALIASTYPE='S'");
+			"ALIASINFO, SYSTEMALIAS FROM SYS.SYSALIASES A WHERE CAST(ALIASTYPE AS CHAR(1)) = 'S'");
 
 		boolean firstTime = true;
 		while (rs.next()) {
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java
===================================================================
--- Z:/src/derby-dev/java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java	(revision 630969)
+++ Z:/src/derby-dev/java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java	(working copy)
@@ -51,7 +51,7 @@
 		ResultSet rs = stmt.executeQuery("SELECT CS.CONSTRAINTNAME, " +
 			"CS.TABLEID, CS.SCHEMAID, CK.CHECKDEFINITION FROM SYS.SYSCONSTRAINTS CS, " +
 			"SYS.SYSCHECKS CK WHERE CS.CONSTRAINTID = " +
-			"CK.CONSTRAINTID AND CS.STATE != 'D' ORDER BY CS.TABLEID");
+			"CK.CONSTRAINTID AND CAST(CS.STATE AS CHAR(1)) != 'D' ORDER BY CS.TABLEID");
 
 		boolean firstTime = true;
 		while (rs.next()) {
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
===================================================================
--- Z:/src/derby-dev/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java	(revision 630969)
+++ Z:/src/derby-dev/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java	(working copy)
@@ -186,9 +186,9 @@
 			Statement stmtCols = conn.createStatement();
 			String queryCols = "SELECT COLUMNNUMBER, COLUMNNAME " +
 				"FROM SYS.SYSCOLUMNS C, SYS.SYSTABLES T, SYS.SYSSCHEMAS S " +
-				"WHERE T.TABLEID = C.REFERENCEID and S.SCHEMAID = T.SCHEMAID "+
-				"and T.TABLENAME = '"+tableName+"' AND SCHEMANAME = '"+schemaName +
-				"' ORDER BY COLUMNNUMBER";
+				"WHERE T.TABLEID = C.REFERENCEID and S.SCHEMAID = T.SCHEMAID " +
+				"and CAST(T.TABLENAME AS VARCHAR(128)) = '" + tableName + "' " +
+				"AND CAST(SCHEMANAME AS VARCHAR(128)) = '" + schemaName + "' ORDER BY COLUMNNUMBER";
 
 			ResultSet rsCols= stmtCols.executeQuery(queryCols);
 			String fullName = dblook.addQuotes(schemaName) + "." + dblook.addQuotes(tableName);
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java
===================================================================
--- Z:/src/derby-dev/java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java	(revision 630969)
+++ Z:/src/derby-dev/java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java	(working copy)
@@ -62,7 +62,7 @@
 		ResultSet rs = stmt.executeQuery("SELECT CS.CONSTRAINTNAME, CS.TYPE, " +
 			"CS.TABLEID, CS.CONSTRAINTID, CS.SCHEMAID, CG.DESCRIPTOR, CG.ISCONSTRAINT " +
 			"FROM SYS.SYSCONSTRAINTS CS, SYS.SYSCONGLOMERATES CG, SYS.SYSKEYS K " +
-			"WHERE CS.STATE != 'D' AND CS.CONSTRAINTID = K.CONSTRAINTID AND " +
+			"WHERE CAST(CS.STATE AS CHAR(1)) != 'D' AND CS.CONSTRAINTID = K.CONSTRAINTID AND " +
 			"CG.CONGLOMERATEID = K.CONGLOMERATEID ORDER BY CS.TABLEID");
 		createKeysFrom(rs);
 
@@ -70,7 +70,7 @@
 		rs = stmt.executeQuery("SELECT CS.CONSTRAINTNAME, CS.TYPE, CS.TABLEID, " +
 			"CS.CONSTRAINTID, CS.SCHEMAID, CG.DESCRIPTOR, CG.ISCONSTRAINT, " +
 			"K.DELETERULE, K.UPDATERULE, K.KEYCONSTRAINTID FROM SYS.SYSCONSTRAINTS CS, " +
-			"SYS.SYSCONGLOMERATES CG, SYS.SYSFOREIGNKEYS K WHERE CS.STATE != 'D' " +
+			"SYS.SYSCONGLOMERATES CG, SYS.SYSFOREIGNKEYS K WHERE CAST(CS.STATE AS CHAR(1)) != 'D' " +
 			"AND CS.CONSTRAINTID = K.CONSTRAINTID AND CG.CONGLOMERATEID = " +
 			"K.CONGLOMERATEID ORDER BY CS.TABLEID");
 		createKeysFrom(rs);
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java
===================================================================
--- Z:/src/derby-dev/java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java	(revision 630969)
+++ Z:/src/derby-dev/java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java	(working copy)
@@ -50,7 +50,7 @@
 		ResultSet rs = stmt.executeQuery("SELECT TRIGGERNAME, SCHEMAID, " +
 			"EVENT, FIRINGTIME, TYPE, TABLEID, REFERENCEDCOLUMNS, " + 
 			"TRIGGERDEFINITION, REFERENCINGOLD, REFERENCINGNEW, OLDREFERENCINGNAME, " +
-			"NEWREFERENCINGNAME FROM SYS.SYSTRIGGERS WHERE STATE != 'D'");
+			"NEWREFERENCINGNAME FROM SYS.SYSTRIGGERS WHERE CAST(STATE AS CHAR(1)) != 'D'");
 
 		boolean firstTime = true;
 		while (rs.next()) {
Index: java/tools/org/apache/derby/tools/dblook.java
===================================================================
--- Z:/src/derby-dev/java/tools/org/apache/derby/tools/dblook.java	(revision 630969)
+++ Z:/src/derby-dev/java/tools/org/apache/derby/tools/dblook.java	(working copy)
@@ -593,7 +593,7 @@
 		Statement stmt = conn.createStatement();
 		ResultSet rs = stmt.executeQuery("SELECT T.TABLEID, T.TABLENAME, " +
 				"S.SCHEMANAME FROM SYS.SYSTABLES T, SYS.SYSSCHEMAS S " + 
-				"WHERE T.TABLETYPE = 'T' AND T.SCHEMAID = S.SCHEMAID");
+				"WHERE CAST(T.TABLETYPE AS CHAR(1)) = 'T' AND T.SCHEMAID = S.SCHEMAID");
 
 		while (rs.next()) {
 			String tableName = addQuotes(expandDoubleQuotes(rs.getString(2)));