Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 22552 invoked from network); 1 Dec 2001 11:07:22 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 1 Dec 2001 11:07:22 -0000 Received: (qmail 16217 invoked by uid 97); 1 Dec 2001 11:07:34 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 16162 invoked by uid 97); 1 Dec 2001 11:07:33 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 16151 invoked by uid 97); 1 Dec 2001 11:07:33 -0000 Date: 1 Dec 2001 10:49:44 -0000 Message-ID: <20011201104944.8284.qmail@icarus.apache.org> From: hammant@apache.org To: jakarta-avalon-cornerstone-cvs@apache.org Subject: cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl ConcatFunction.java LowerCaseStringFunction.java SubStringFunction.java TrimStringFunction.java UpperCaseStringFunction.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N hammant 01/12/01 02:49:44 Modified: apps/db/src/java/org/apache/avalon/db/basic/actions TestHelper.java apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql BasicLXSQLAggregateHandler.java apps/db/src/java/org/apache/avalon/db/data Column.java apps/db/src/java/org/apache/avalon/db/data/impl AbstractAggregateFunctionColumn.java DefaultAggregateAveColumn.java DefaultAggregateCountColumn.java DefaultAggregateMaxColumn.java DefaultAggregateMinColumn.java DefaultAggregateSumColumn.java DefaultAggregateVarcharKeyColumn.java DefaultBigIntColumn.java DefaultContrivedStringFunctionColumn.java DefaultDateColumn.java DefaultDecimalColumn.java DefaultIntegerColumn.java DefaultRealColumn.java DefaultSmallIntColumn.java DefaultStringConstantColumn.java DefaultTimeColumn.java DefaultTimestampColumn.java DefaultVarCharColumn.java apps/db/src/java/org/apache/avalon/db/functions/impl ConcatFunction.java LowerCaseStringFunction.java SubStringFunction.java TrimStringFunction.java UpperCaseStringFunction.java Added: apps/db/src/java/org/apache/avalon/db/data/types NumericColumn.java StringColumn.java StringConstantColumn.java TemporalColumn.java Removed: apps/db/src/java/org/apache/avalon/db/data/types NumericType.java StringConstantType.java StringType.java TemporalType.java Type.java Log: Type parent moved into Column (redundancy) Revision Changes Path 1.4 +103 -104 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/TestHelper.java Index: TestHelper.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/TestHelper.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestHelper.java 2001/11/20 16:43:38 1.3 +++ TestHelper.java 2001/12/01 10:49:43 1.4 @@ -12,10 +12,9 @@ import org.apache.avalon.db.data.Column; import org.apache.avalon.db.data.ValidationException; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.StringType; -import org.apache.avalon.db.data.types.NumericType; -import org.apache.avalon.db.data.types.StringConstantType; -import org.apache.avalon.db.data.types.Type; +import org.apache.avalon.db.data.types.StringColumn; +import org.apache.avalon.db.data.types.NumericColumn; +import org.apache.avalon.db.data.types.StringConstantColumn; /** * Helper class for BSF @@ -25,44 +24,44 @@ public class TestHelper { public boolean testEqual(Column lCol,Column rCol,Row row) throws ActionException { - if(lCol instanceof NumericType && rCol instanceof NumericType + if(lCol instanceof NumericColumn && rCol instanceof NumericColumn || oneIsNumericType(lCol,rCol)) { - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; System.out.println("lNumCol.getPrecesion()=" + lNumCol.getPrecesion()); System.out.println("rNumCol.getPrecesion()=" + rNumCol.getPrecesion()); - if(lNumCol.getPrecesion() == Type.PREC_INT - || rNumCol.getPrecesion() == Type.PREC_INT) { + if(lNumCol.getPrecesion() == Column.PREC_INT + || rNumCol.getPrecesion() == Column.PREC_INT) { if(lNumCol.toInteger(row).compareTo(rNumCol.toInteger(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_BIGDEC - || rNumCol.getPrecesion() == Type.PREC_BIGDEC) { + } else if(lNumCol.getPrecesion() == Column.PREC_BIGDEC + || rNumCol.getPrecesion() == Column.PREC_BIGDEC) { if(lNumCol.toBigDecimal(row).compareTo(rNumCol.toBigDecimal(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_FLOAT - || rNumCol.getPrecesion() == Type.PREC_FLOAT) { + } else if(lNumCol.getPrecesion() == Column.PREC_FLOAT + || rNumCol.getPrecesion() == Column.PREC_FLOAT) { if(lNumCol.toFloat(row).compareTo(rNumCol.toFloat(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_LONG - || rNumCol.getPrecesion() == Type.PREC_LONG) { + } else if(lNumCol.getPrecesion() == Column.PREC_LONG + || rNumCol.getPrecesion() == Column.PREC_LONG) { if(lNumCol.toLong(row).compareTo(rNumCol.toLong(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_SHORT - || rNumCol.getPrecesion() == Type.PREC_SHORT) { + } else if(lNumCol.getPrecesion() == Column.PREC_SHORT + || rNumCol.getPrecesion() == Column.PREC_SHORT) { if(lNumCol.toShort(row).compareTo(rNumCol.toShort(row)) == 0) { return true; } else { @@ -71,10 +70,10 @@ } else { throw new ActionException("Type not supported, yet"); } - } else if(lCol instanceof StringType && rCol instanceof StringType + } else if(lCol instanceof StringColumn && rCol instanceof StringColumn || oneIsStringType(lCol,rCol)){ - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; return lNumCol.toString(row).equals(rNumCol.toString(row)); } else { throw new ActionException("Type not supported, yet"); @@ -82,41 +81,41 @@ } public boolean SmallerThan(Column lCol,Column rCol,Row row) throws ActionException { - if(lCol instanceof NumericType && rCol instanceof NumericType + if(lCol instanceof NumericColumn && rCol instanceof NumericColumn || oneIsNumericType(lCol,rCol)) { - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; - if(lNumCol.getPrecesion() == Type.PREC_INT - || rNumCol.getPrecesion() == Type.PREC_INT) { + if(lNumCol.getPrecesion() == Column.PREC_INT + || rNumCol.getPrecesion() == Column.PREC_INT) { if(lNumCol.toInteger(row).compareTo(rNumCol.toInteger(row)) < 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_BIGDEC - || rNumCol.getPrecesion() == Type.PREC_BIGDEC) { + } else if(lNumCol.getPrecesion() == Column.PREC_BIGDEC + || rNumCol.getPrecesion() == Column.PREC_BIGDEC) { if(lNumCol.toBigDecimal(row).compareTo(rNumCol.toBigDecimal(row)) < 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_FLOAT - || rNumCol.getPrecesion() == Type.PREC_FLOAT) { + } else if(lNumCol.getPrecesion() == Column.PREC_FLOAT + || rNumCol.getPrecesion() == Column.PREC_FLOAT) { if(lNumCol.toFloat(row).compareTo(rNumCol.toFloat(row)) < 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_LONG - || rNumCol.getPrecesion() == Type.PREC_LONG) { + } else if(lNumCol.getPrecesion() == Column.PREC_LONG + || rNumCol.getPrecesion() == Column.PREC_LONG) { if(lNumCol.toLong(row).compareTo(rNumCol.toLong(row)) < 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_SHORT - || rNumCol.getPrecesion() == Type.PREC_SHORT) { + } else if(lNumCol.getPrecesion() == Column.PREC_SHORT + || rNumCol.getPrecesion() == Column.PREC_SHORT) { if(lNumCol.toShort(row).compareTo(rNumCol.toShort(row)) < 0) { return true; } else { @@ -125,10 +124,10 @@ } else { throw new ActionException("Type not supported, yet"); } - } else if(lCol instanceof StringType && rCol instanceof StringType + } else if(lCol instanceof StringColumn && rCol instanceof StringColumn || oneIsStringType(lCol,rCol)){ - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; if(lNumCol.toString(row).compareTo(rNumCol.toString(row)) < 0) { return true; @@ -141,41 +140,41 @@ } public boolean testGreaterThan(Column lCol,Column rCol,Row row) throws ActionException { - if(lCol instanceof NumericType && rCol instanceof NumericType + if(lCol instanceof NumericColumn && rCol instanceof NumericColumn || oneIsNumericType(lCol,rCol)) { - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; - if(lNumCol.getPrecesion() == Type.PREC_INT - || rNumCol.getPrecesion() == Type.PREC_INT) { + if(lNumCol.getPrecesion() == Column.PREC_INT + || rNumCol.getPrecesion() == Column.PREC_INT) { if(lNumCol.toInteger(row).compareTo(rNumCol.toInteger(row)) > 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_BIGDEC - || rNumCol.getPrecesion() == Type.PREC_BIGDEC) { + } else if(lNumCol.getPrecesion() == Column.PREC_BIGDEC + || rNumCol.getPrecesion() == Column.PREC_BIGDEC) { if(lNumCol.toBigDecimal(row).compareTo(rNumCol.toBigDecimal(row)) > 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_FLOAT - || rNumCol.getPrecesion() == Type.PREC_FLOAT) { + } else if(lNumCol.getPrecesion() == Column.PREC_FLOAT + || rNumCol.getPrecesion() == Column.PREC_FLOAT) { if(lNumCol.toFloat(row).compareTo(rNumCol.toFloat(row)) > 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_LONG - || rNumCol.getPrecesion() == Type.PREC_LONG) { + } else if(lNumCol.getPrecesion() == Column.PREC_LONG + || rNumCol.getPrecesion() == Column.PREC_LONG) { if(lNumCol.toLong(row).compareTo(rNumCol.toLong(row)) > 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_SHORT - || rNumCol.getPrecesion() == Type.PREC_SHORT) { + } else if(lNumCol.getPrecesion() == Column.PREC_SHORT + || rNumCol.getPrecesion() == Column.PREC_SHORT) { if(lNumCol.toShort(row).compareTo(rNumCol.toShort(row)) > 0) { return true; } else { @@ -184,10 +183,10 @@ } else { throw new ActionException("Type not supported, yet"); } - } else if(lCol instanceof StringType && rCol instanceof StringType + } else if(lCol instanceof StringColumn && rCol instanceof StringColumn || oneIsStringType(lCol,rCol)){ - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; if(lNumCol.toString(row).compareTo(rNumCol.toString(row)) < 0) { return true; @@ -200,41 +199,41 @@ } public boolean testNotEqual(Column lCol,Column rCol,Row row) throws ActionException { - if(lCol instanceof NumericType && rCol instanceof NumericType + if(lCol instanceof NumericColumn && rCol instanceof NumericColumn || oneIsNumericType(lCol,rCol)) { - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; - if(lNumCol.getPrecesion() == Type.PREC_INT - || rNumCol.getPrecesion() == Type.PREC_INT) { + if(lNumCol.getPrecesion() == Column.PREC_INT + || rNumCol.getPrecesion() == Column.PREC_INT) { if(lNumCol.toInteger(row).compareTo(rNumCol.toInteger(row)) != 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_BIGDEC - || rNumCol.getPrecesion() == Type.PREC_BIGDEC) { + } else if(lNumCol.getPrecesion() == Column.PREC_BIGDEC + || rNumCol.getPrecesion() == Column.PREC_BIGDEC) { if(lNumCol.toBigDecimal(row).compareTo(rNumCol.toBigDecimal(row)) != 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_FLOAT - || rNumCol.getPrecesion() == Type.PREC_FLOAT) { + } else if(lNumCol.getPrecesion() == Column.PREC_FLOAT + || rNumCol.getPrecesion() == Column.PREC_FLOAT) { if(lNumCol.toFloat(row).compareTo(rNumCol.toFloat(row)) != 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_LONG - || rNumCol.getPrecesion() == Type.PREC_LONG) { + } else if(lNumCol.getPrecesion() == Column.PREC_LONG + || rNumCol.getPrecesion() == Column.PREC_LONG) { if(lNumCol.toLong(row).compareTo(rNumCol.toLong(row)) != 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_SHORT - || rNumCol.getPrecesion() == Type.PREC_SHORT) { + } else if(lNumCol.getPrecesion() == Column.PREC_SHORT + || rNumCol.getPrecesion() == Column.PREC_SHORT) { if(lNumCol.toShort(row).compareTo(rNumCol.toShort(row)) != 0) { return true; } else { @@ -243,10 +242,10 @@ } else { throw new ActionException("Type not supported, yet"); } - } else if(lCol instanceof StringType && rCol instanceof StringType + } else if(lCol instanceof StringColumn && rCol instanceof StringColumn || oneIsStringType(lCol,rCol)){ - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; return !lNumCol.toString(row).equals(rNumCol.toString(row)); } else { @@ -259,45 +258,45 @@ } public boolean testGreaterThanOrEqual(Column lCol,Column rCol,Row row) throws ActionException { - if(lCol instanceof NumericType && rCol instanceof NumericType + if(lCol instanceof NumericColumn && rCol instanceof NumericColumn || oneIsNumericType(lCol,rCol)) { - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; - if(lNumCol.getPrecesion() == Type.PREC_INT - || rNumCol.getPrecesion() == Type.PREC_INT) { + if(lNumCol.getPrecesion() == Column.PREC_INT + || rNumCol.getPrecesion() == Column.PREC_INT) { if(lNumCol.toInteger(row).compareTo(rNumCol.toInteger(row)) > 0 || lNumCol.toInteger(row).compareTo(rNumCol.toInteger(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_BIGDEC - || rNumCol.getPrecesion() == Type.PREC_BIGDEC) { + } else if(lNumCol.getPrecesion() == Column.PREC_BIGDEC + || rNumCol.getPrecesion() == Column.PREC_BIGDEC) { if(lNumCol.toBigDecimal(row).compareTo(rNumCol.toBigDecimal(row)) > 0 || lNumCol.toBigDecimal(row).compareTo(rNumCol.toBigDecimal(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_FLOAT - || rNumCol.getPrecesion() == Type.PREC_FLOAT) { + } else if(lNumCol.getPrecesion() == Column.PREC_FLOAT + || rNumCol.getPrecesion() == Column.PREC_FLOAT) { if(lNumCol.toFloat(row).compareTo(rNumCol.toFloat(row)) > 0 || lNumCol.toFloat(row).compareTo(rNumCol.toFloat(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_LONG - || rNumCol.getPrecesion() == Type.PREC_LONG) { + } else if(lNumCol.getPrecesion() == Column.PREC_LONG + || rNumCol.getPrecesion() == Column.PREC_LONG) { if(lNumCol.toLong(row).compareTo(rNumCol.toLong(row)) > 0 || lNumCol.toLong(row).compareTo(rNumCol.toLong(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_SHORT - || rNumCol.getPrecesion() == Type.PREC_SHORT) { + } else if(lNumCol.getPrecesion() == Column.PREC_SHORT + || rNumCol.getPrecesion() == Column.PREC_SHORT) { if(lNumCol.toShort(row).compareTo(rNumCol.toShort(row)) > 0 || lNumCol.toLong(row).compareTo(rNumCol.toLong(row)) == 0) { return true; @@ -307,10 +306,10 @@ } else { throw new ActionException("Type not supported, yet"); } - } else if(lCol instanceof StringType && rCol instanceof StringType + } else if(lCol instanceof StringColumn && rCol instanceof StringColumn || oneIsStringType(lCol,rCol)){ - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; if(lNumCol.toString(row).compareTo(rNumCol.toString(row)) > 0 || lNumCol.toString(row).compareTo(rNumCol.toString(row)) == 0) { @@ -324,45 +323,45 @@ } public boolean testSmallerThanOrEqual(Column lCol,Column rCol,Row row) throws ActionException { - if(lCol instanceof NumericType && rCol instanceof NumericType + if(lCol instanceof NumericColumn && rCol instanceof NumericColumn || oneIsNumericType(lCol,rCol)) { - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; - if(lNumCol.getPrecesion() == Type.PREC_INT - || rNumCol.getPrecesion() == Type.PREC_INT) { + if(lNumCol.getPrecesion() == Column.PREC_INT + || rNumCol.getPrecesion() == Column.PREC_INT) { if(lNumCol.toInteger(row).compareTo(rNumCol.toInteger(row)) < 0 || lNumCol.toInteger(row).compareTo(rNumCol.toInteger(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_BIGDEC - || rNumCol.getPrecesion() == Type.PREC_BIGDEC) { + } else if(lNumCol.getPrecesion() == Column.PREC_BIGDEC + || rNumCol.getPrecesion() == Column.PREC_BIGDEC) { if(lNumCol.toBigDecimal(row).compareTo(rNumCol.toBigDecimal(row)) < 0 || lNumCol.toBigDecimal(row).compareTo(rNumCol.toBigDecimal(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_FLOAT - || rNumCol.getPrecesion() == Type.PREC_FLOAT) { + } else if(lNumCol.getPrecesion() == Column.PREC_FLOAT + || rNumCol.getPrecesion() == Column.PREC_FLOAT) { if(lNumCol.toFloat(row).compareTo(rNumCol.toFloat(row)) < 0 || lNumCol.toFloat(row).compareTo(rNumCol.toFloat(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_LONG - || rNumCol.getPrecesion() == Type.PREC_LONG) { + } else if(lNumCol.getPrecesion() == Column.PREC_LONG + || rNumCol.getPrecesion() == Column.PREC_LONG) { if(lNumCol.toLong(row).compareTo(rNumCol.toLong(row)) < 0 || lNumCol.toLong(row).compareTo(rNumCol.toLong(row)) == 0) { return true; } else { return false; } - } else if(lNumCol.getPrecesion() == Type.PREC_SHORT - || rNumCol.getPrecesion() == Type.PREC_SHORT) { + } else if(lNumCol.getPrecesion() == Column.PREC_SHORT + || rNumCol.getPrecesion() == Column.PREC_SHORT) { if(lNumCol.toShort(row).compareTo(rNumCol.toShort(row)) < 0 || lNumCol.toLong(row).compareTo(rNumCol.toLong(row)) == 0) { return true; @@ -372,10 +371,10 @@ } else { throw new ActionException("Type not supported, yet"); } - } else if(lCol instanceof StringType && rCol instanceof StringType + } else if(lCol instanceof StringColumn && rCol instanceof StringColumn || oneIsStringType(lCol,rCol)){ - Type lNumCol = (Type)lCol; - Type rNumCol = (Type)rCol; + Column lNumCol = (Column)lCol; + Column rNumCol = (Column)rCol; if(lNumCol.toString(row).compareTo(rNumCol.toString(row)) < 0 || lNumCol.toString(row).compareTo(rNumCol.toString(row)) == 0) { @@ -389,8 +388,8 @@ } private boolean oneIsNumericType(Column lCol, Column rCol) { - if ((lCol instanceof NumericType && rCol instanceof StringConstantType) - || (lCol instanceof StringConstantType && rCol instanceof NumericType)) { + if ((lCol instanceof NumericColumn && rCol instanceof StringConstantColumn) + || (lCol instanceof StringConstantColumn && rCol instanceof NumericColumn)) { return true; } else { return false; @@ -398,8 +397,8 @@ } private boolean oneIsStringType(Column lCol, Column rCol) { - if ((lCol instanceof StringType && rCol instanceof StringConstantType) - || (lCol instanceof StringConstantType && rCol instanceof StringType)) { + if ((lCol instanceof StringColumn && rCol instanceof StringConstantColumn) + || (lCol instanceof StringConstantColumn && rCol instanceof StringColumn)) { return true; } else { return false; 1.5 +4 -5 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLAggregateHandler.java Index: BasicLXSQLAggregateHandler.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLAggregateHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BasicLXSQLAggregateHandler.java 2001/11/29 00:50:02 1.4 +++ BasicLXSQLAggregateHandler.java 2001/12/01 10:49:43 1.5 @@ -12,8 +12,7 @@ import org.apache.avalon.db.services.DatabasePersistor; import org.apache.avalon.db.data.Column; import org.apache.avalon.db.data.Queryable; -import org.apache.avalon.db.data.types.Type; -import org.apache.avalon.db.data.types.StringType; +import org.apache.avalon.db.data.types.StringColumn; import org.apache.avalon.db.data.impl.DefaultVarCharColumn; import org.apache.avalon.db.data.impl.DefaultIntegerColumn; import org.apache.avalon.db.data.impl.DefaultDateColumn; @@ -43,7 +42,7 @@ * * @author Paul Hammant Paul_Hammant@yahoo.com * @author Gerhard Froehlich g-froehlich@gmx.de - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ */ public abstract class BasicLXSQLAggregateHandler extends BasicLXSQLQueryableHandler { @@ -184,8 +183,8 @@ for (int i = 0; i < columns.length; i++) { Column col = columns[i]; if (col.getName().equals(fieldName)) { - if (col instanceof StringType) { - StringType sCol = (StringType) col; + if (col instanceof StringColumn) { + StringColumn sCol = (StringColumn) col; return new DefaultAggregateVarcharKeyColumn(fieldName, aliasName, sCol.getMaxLength()); } } 1.10 +29 -1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Column.java Index: Column.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Column.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Column.java 2001/11/17 10:12:09 1.9 +++ Column.java 2001/12/01 10:49:43 1.10 @@ -8,19 +8,23 @@ */ package org.apache.avalon.db.data; +import java.math.BigDecimal; + /** * Interface Column * * * @author Paul Hammant Paul_Hammant@yahoo.com * @author Gerhard Froehlich g-froehlich@gmx.de - * @version * $Revision: 1.9 $ + * @version * $Revision: 1.10 $ */ public interface Column extends Nameable { Object getValue(Row row); void setIndex(int ix); + // methods of use in metadata + String getSQLType(); String getJavaType(); int getColumnDisplaySize(); @@ -43,4 +47,28 @@ boolean isSearchable(); boolean isSigned(); boolean isWritable(); + + + // methods of use in server side manipulation + + int PREC_INT = 1; + int PREC_LONG = 2; + int PREC_BIGDEC = 3; + int PREC_FLOAT = 4; + int PREC_SHORT = 5; + int PREC_CONST = 6; + int PREC_STRING = 7; + int PREC_TIME = 8; + int PREC_TIMESTAMP = 9; + int PREC_DATE = 10; + + Integer toInteger(Row row); + Long toLong(Row row); + BigDecimal toBigDecimal(Row row); + Float toFloat(Row row); + Short toShort(Row row); + String toString(Row row); + int getPrecesion(); + + } 1.2 +1 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractAggregateFunctionColumn.java Index: AbstractAggregateFunctionColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractAggregateFunctionColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractAggregateFunctionColumn.java 2001/11/27 21:18:22 1.1 +++ AbstractAggregateFunctionColumn.java 2001/12/01 10:49:43 1.2 @@ -8,7 +8,6 @@ */ package org.apache.avalon.db.data.impl; -import org.apache.avalon.db.data.types.Type; import org.apache.avalon.db.data.Row; import org.apache.avalon.db.data.AggregateFunctionColumn; import org.apache.avalon.db.actions.ActionException; @@ -19,7 +18,7 @@ * * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public abstract class AbstractAggregateFunctionColumn extends AbstractContrivedColumn implements AggregateFunctionColumn { 1.2 +4 -4 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateAveColumn.java Index: DefaultAggregateAveColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateAveColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultAggregateAveColumn.java 2001/11/27 23:01:31 1.1 +++ DefaultAggregateAveColumn.java 2001/12/01 10:49:43 1.2 @@ -8,9 +8,9 @@ */ package org.apache.avalon.db.data.impl; -import org.apache.avalon.db.data.types.Type; -import org.apache.avalon.db.data.types.NumericType; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import org.apache.avalon.db.actions.ActionException; import java.math.BigDecimal; @@ -21,9 +21,9 @@ * * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultAggregateAveColumn extends AbstractAggregateFunctionColumn implements NumericType { +public class DefaultAggregateAveColumn extends AbstractAggregateFunctionColumn implements NumericColumn { private int mAve; private Integer mAve2; @@ -53,7 +53,7 @@ } public int getPrecesion() { - return Type.PREC_INT; + return Column.PREC_INT; } public Integer toInteger(Row row) { 1.3 +4 -4 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateCountColumn.java Index: DefaultAggregateCountColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateCountColumn.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DefaultAggregateCountColumn.java 2001/11/27 23:01:31 1.2 +++ DefaultAggregateCountColumn.java 2001/12/01 10:49:43 1.3 @@ -8,9 +8,9 @@ */ package org.apache.avalon.db.data.impl; -import org.apache.avalon.db.data.types.Type; -import org.apache.avalon.db.data.types.NumericType; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import org.apache.avalon.db.actions.ActionException; import java.math.BigDecimal; @@ -21,7 +21,7 @@ * * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class DefaultAggregateCountColumn extends AbstractAggregateFunctionColumn { @@ -51,7 +51,7 @@ } public int getPrecesion() { - return Type.PREC_INT; + return Column.PREC_INT; } public Integer toInteger(Row row) { 1.2 +4 -4 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateMaxColumn.java Index: DefaultAggregateMaxColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateMaxColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultAggregateMaxColumn.java 2001/11/27 23:01:31 1.1 +++ DefaultAggregateMaxColumn.java 2001/12/01 10:49:43 1.2 @@ -8,9 +8,9 @@ */ package org.apache.avalon.db.data.impl; -import org.apache.avalon.db.data.types.Type; -import org.apache.avalon.db.data.types.NumericType; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import org.apache.avalon.db.actions.ActionException; import java.math.BigDecimal; @@ -21,9 +21,9 @@ * * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultAggregateMaxColumn extends AbstractAggregateFunctionColumn implements NumericType { +public class DefaultAggregateMaxColumn extends AbstractAggregateFunctionColumn implements NumericColumn { private int mMax; private Integer mMax2; @@ -53,7 +53,7 @@ } public int getPrecesion() { - return Type.PREC_INT; + return Column.PREC_INT; } public Integer toInteger(Row row) { 1.2 +4 -4 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateMinColumn.java Index: DefaultAggregateMinColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateMinColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultAggregateMinColumn.java 2001/11/27 23:01:31 1.1 +++ DefaultAggregateMinColumn.java 2001/12/01 10:49:43 1.2 @@ -8,9 +8,9 @@ */ package org.apache.avalon.db.data.impl; -import org.apache.avalon.db.data.types.Type; -import org.apache.avalon.db.data.types.NumericType; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import org.apache.avalon.db.actions.ActionException; import java.math.BigDecimal; @@ -21,9 +21,9 @@ * * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultAggregateMinColumn extends AbstractAggregateFunctionColumn implements NumericType { +public class DefaultAggregateMinColumn extends AbstractAggregateFunctionColumn implements NumericColumn { private int mMin; private Integer mMin2; @@ -53,7 +53,7 @@ } public int getPrecesion() { - return Type.PREC_INT; + return Column.PREC_INT; } public Integer toInteger(Row row) { 1.2 +4 -4 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateSumColumn.java Index: DefaultAggregateSumColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateSumColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultAggregateSumColumn.java 2001/11/27 23:01:31 1.1 +++ DefaultAggregateSumColumn.java 2001/12/01 10:49:43 1.2 @@ -8,9 +8,9 @@ */ package org.apache.avalon.db.data.impl; -import org.apache.avalon.db.data.types.Type; -import org.apache.avalon.db.data.types.NumericType; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import org.apache.avalon.db.actions.ActionException; import java.math.BigDecimal; @@ -21,9 +21,9 @@ * * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultAggregateSumColumn extends AbstractAggregateFunctionColumn implements NumericType { +public class DefaultAggregateSumColumn extends AbstractAggregateFunctionColumn implements NumericColumn { private int mSum; private Integer mSum2; @@ -53,7 +53,7 @@ } public int getPrecesion() { - return Type.PREC_INT; + return Column.PREC_INT; } public Integer toInteger(Row row) { 1.3 +2 -3 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateVarcharKeyColumn.java Index: DefaultAggregateVarcharKeyColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultAggregateVarcharKeyColumn.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DefaultAggregateVarcharKeyColumn.java 2001/11/29 00:50:03 1.2 +++ DefaultAggregateVarcharKeyColumn.java 2001/12/01 10:49:43 1.3 @@ -8,8 +8,7 @@ */ package org.apache.avalon.db.data.impl; -import org.apache.avalon.db.data.types.Type; -import org.apache.avalon.db.data.types.NumericType; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; import org.apache.avalon.db.data.AggregateKeyColumn; import org.apache.avalon.db.data.Queryable; @@ -24,7 +23,7 @@ * * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class DefaultAggregateVarcharKeyColumn extends DefaultVarCharColumn implements AggregateKeyColumn { 1.2 +5 -5 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultBigIntColumn.java Index: DefaultBigIntColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultBigIntColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultBigIntColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultBigIntColumn.java 2001/12/01 10:49:43 1.2 @@ -8,9 +8,9 @@ package org.apache.avalon.db.data.impl; import org.apache.avalon.db.data.ValidationException; -import org.apache.avalon.db.data.types.NumericType; -import org.apache.avalon.db.data.types.Type; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import java.math.BigDecimal; @@ -18,9 +18,9 @@ * Class DefaultBigIntColumn * * @author Gerhard Froehlich g-froehlich@gmx.de - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultBigIntColumn extends AbstractWritableColumn implements NumericType { +public class DefaultBigIntColumn extends AbstractWritableColumn implements NumericColumn { /** * Constructor DefaultBigIntColumn @@ -65,7 +65,7 @@ } public int getPrecesion() { - return Type.PREC_SHORT; + return Column.PREC_SHORT; } public String toString(Row row) { 1.2 +5 -5 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultContrivedStringFunctionColumn.java Index: DefaultContrivedStringFunctionColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultContrivedStringFunctionColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultContrivedStringFunctionColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultContrivedStringFunctionColumn.java 2001/12/01 10:49:43 1.2 @@ -8,10 +8,10 @@ */ package org.apache.avalon.db.data.impl; -import org.apache.avalon.db.data.types.StringType; -import org.apache.avalon.db.data.types.Type; +import org.apache.avalon.db.data.types.StringColumn; import org.apache.avalon.db.data.ValidationException; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import org.apache.avalon.db.functions.StringFunction; import org.apache.avalon.db.actions.ActionException; @@ -23,9 +23,9 @@ * * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultContrivedStringFunctionColumn extends AbstractContrivedColumn implements StringType { +public class DefaultContrivedStringFunctionColumn extends AbstractContrivedColumn implements StringColumn { StringFunction mStringFunction; @@ -51,7 +51,7 @@ } public int getPrecesion() { - return Type.PREC_STRING; + return Column.PREC_STRING; } public Integer toInteger(Row row) { 1.2 +5 -5 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDateColumn.java Index: DefaultDateColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDateColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultDateColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultDateColumn.java 2001/12/01 10:49:43 1.2 @@ -9,8 +9,8 @@ import org.apache.avalon.db.data.ValidationException; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.TemporalType; -import org.apache.avalon.db.data.types.Type; +import org.apache.avalon.db.data.Column; +import org.apache.avalon.db.data.types.TemporalColumn; import java.sql.Date; import java.math.BigDecimal; @@ -20,9 +20,9 @@ * Class DefaultDateColumn * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultDateColumn extends AbstractWritableColumn implements TemporalType { +public class DefaultDateColumn extends AbstractWritableColumn implements TemporalColumn { /** * Constructor DefaultDateColumn @@ -47,7 +47,7 @@ } public int getPrecesion() { - return Type.PREC_DATE; + return Column.PREC_DATE; } public Integer toInteger(Row row) { 1.2 +5 -5 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDecimalColumn.java Index: DefaultDecimalColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDecimalColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultDecimalColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultDecimalColumn.java 2001/12/01 10:49:43 1.2 @@ -8,9 +8,9 @@ package org.apache.avalon.db.data.impl; import org.apache.avalon.db.data.ValidationException; -import org.apache.avalon.db.data.types.NumericType; -import org.apache.avalon.db.data.types.Type; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import java.math.BigDecimal; @@ -18,9 +18,9 @@ * Class DefaultDecimalColumn * * @author Gerhard Froehlich g-froehlich@gmx.de - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultDecimalColumn extends AbstractWritableColumn implements NumericType { +public class DefaultDecimalColumn extends AbstractWritableColumn implements NumericColumn { /** * Constructor DefaultDecimalColumn @@ -65,7 +65,7 @@ } public int getPrecesion() { - return Type.PREC_BIGDEC; + return Column.PREC_BIGDEC; } public String toString(Row row) { 1.2 +5 -5 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultIntegerColumn.java Index: DefaultIntegerColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultIntegerColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultIntegerColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultIntegerColumn.java 2001/12/01 10:49:43 1.2 @@ -9,9 +9,9 @@ package org.apache.avalon.db.data.impl; import org.apache.avalon.db.data.ValidationException; -import org.apache.avalon.db.data.types.NumericType; -import org.apache.avalon.db.data.types.Type; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import java.math.BigDecimal; @@ -21,9 +21,9 @@ * * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultIntegerColumn extends AbstractWritableColumn implements NumericType { +public class DefaultIntegerColumn extends AbstractWritableColumn implements NumericColumn { /** * Constructor DefaultIntegerColumn @@ -71,7 +71,7 @@ } public int getPrecesion() { - return Type.PREC_INT; + return Column.PREC_INT; } public String toString(Row row) { 1.2 +5 -5 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultRealColumn.java Index: DefaultRealColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultRealColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultRealColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultRealColumn.java 2001/12/01 10:49:43 1.2 @@ -8,9 +8,9 @@ package org.apache.avalon.db.data.impl; import org.apache.avalon.db.data.ValidationException; -import org.apache.avalon.db.data.types.NumericType; -import org.apache.avalon.db.data.types.Type; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import java.math.BigDecimal; @@ -18,9 +18,9 @@ * Class DefaultRealColumn * * @author Gerhard Froehlich g-froehlich@gmx.de - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultRealColumn extends AbstractWritableColumn implements NumericType { +public class DefaultRealColumn extends AbstractWritableColumn implements NumericColumn { /** * Constructor DefaultRealColumn @@ -65,7 +65,7 @@ } public int getPrecesion() { - return Type.PREC_FLOAT; + return Column.PREC_FLOAT; } public String toString(Row row) { 1.2 +5 -5 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultSmallIntColumn.java Index: DefaultSmallIntColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultSmallIntColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultSmallIntColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultSmallIntColumn.java 2001/12/01 10:49:43 1.2 @@ -8,9 +8,9 @@ package org.apache.avalon.db.data.impl; import org.apache.avalon.db.data.ValidationException; -import org.apache.avalon.db.data.types.NumericType; -import org.apache.avalon.db.data.types.Type; +import org.apache.avalon.db.data.types.NumericColumn; import org.apache.avalon.db.data.Row; +import org.apache.avalon.db.data.Column; import java.math.BigDecimal; @@ -18,9 +18,9 @@ * Class DefaultSmallIntColumn * * @author Gerhard Froehlich g-froehlich@gmx.de - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultSmallIntColumn extends AbstractWritableColumn implements NumericType { +public class DefaultSmallIntColumn extends AbstractWritableColumn implements NumericColumn { /** * Constructor DefaultSmallIntColumn @@ -65,7 +65,7 @@ } public int getPrecesion() { - return Type.PREC_SHORT; + return Column.PREC_SHORT; } public String toString(Row row) { 1.2 +5 -6 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultStringConstantColumn.java Index: DefaultStringConstantColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultStringConstantColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultStringConstantColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultStringConstantColumn.java 2001/12/01 10:49:43 1.2 @@ -10,9 +10,8 @@ import org.apache.avalon.db.data.ValidationException; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.StringConstantType; -import org.apache.avalon.db.data.types.Type; - +import org.apache.avalon.db.data.Column; +import org.apache.avalon.db.data.types.StringConstantColumn; import java.math.BigDecimal; /** @@ -21,9 +20,9 @@ * * @author Paul Hammant Paul_Hammant@yahoo.com * @author Gerhard Froehlich g-froehlich@gmx.de* - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultStringConstantColumn extends AbstractColumn implements StringConstantType { +public class DefaultStringConstantColumn extends AbstractColumn implements StringConstantColumn { private String mStrConstant; @@ -69,6 +68,6 @@ } public int getPrecesion() { - return Type.PREC_CONST; + return Column.PREC_CONST; } } 1.2 +5 -6 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultTimeColumn.java Index: DefaultTimeColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultTimeColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultTimeColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultTimeColumn.java 2001/12/01 10:49:43 1.2 @@ -9,9 +9,8 @@ import org.apache.avalon.db.data.ValidationException; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.TemporalType; -import org.apache.avalon.db.data.types.Type; - +import org.apache.avalon.db.data.Column; +import org.apache.avalon.db.data.types.TemporalColumn; import java.sql.Time; import java.math.BigDecimal; @@ -19,9 +18,9 @@ * Class DefaultTimeColumn * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultTimeColumn extends AbstractWritableColumn implements TemporalType { +public class DefaultTimeColumn extends AbstractWritableColumn implements TemporalColumn { /** * Constructor DefaultTimeColumn @@ -46,7 +45,7 @@ } public int getPrecesion() { - return Type.PREC_TIME; + return Column.PREC_TIME; } public Integer toInteger(Row row) { 1.2 +5 -6 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultTimestampColumn.java Index: DefaultTimestampColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultTimestampColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultTimestampColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultTimestampColumn.java 2001/12/01 10:49:43 1.2 @@ -9,9 +9,8 @@ import org.apache.avalon.db.data.ValidationException; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.TemporalType; -import org.apache.avalon.db.data.types.Type; - +import org.apache.avalon.db.data.Column; +import org.apache.avalon.db.data.types.TemporalColumn; import java.sql.Timestamp; import java.math.BigDecimal; @@ -19,9 +18,9 @@ * Class DefaultTimestampColumn * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultTimestampColumn extends AbstractWritableColumn implements TemporalType { +public class DefaultTimestampColumn extends AbstractWritableColumn implements TemporalColumn { /** * Constructor DefaultTimestampColumn @@ -46,7 +45,7 @@ } public int getPrecesion() { - return Type.PREC_TIMESTAMP; + return Column.PREC_TIMESTAMP; } public Integer toInteger(Row row) { 1.2 +5 -6 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultVarCharColumn.java Index: DefaultVarCharColumn.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultVarCharColumn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultVarCharColumn.java 2001/11/29 00:50:03 1.1 +++ DefaultVarCharColumn.java 2001/12/01 10:49:43 1.2 @@ -10,9 +10,8 @@ import org.apache.avalon.db.data.ValidationException; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.StringType; -import org.apache.avalon.db.data.types.Type; - +import org.apache.avalon.db.data.Column; +import org.apache.avalon.db.data.types.StringColumn; import java.math.BigDecimal; @@ -22,9 +21,9 @@ * * @author Paul Hammant Paul_Hammant@yahoo.com * @author Gerhard Froehlich g-froehlich@gmx.de* - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ -public class DefaultVarCharColumn extends AbstractWritableColumn implements StringType { +public class DefaultVarCharColumn extends AbstractWritableColumn implements StringColumn { private int mMaxLength; @@ -74,7 +73,7 @@ } public int getPrecesion() { - return Type.PREC_STRING; + return Column.PREC_STRING; } public int getMaxLength() { 1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/types/NumericColumn.java Index: NumericColumn.java =================================================================== /* * Copyright (C) The Apache Software Foundation. All rights reserved. * * This software is published under the terms of the Apache Software License * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ package org.apache.avalon.db.data.types; import org.apache.avalon.db.data.Column; /** * Class NumericColumn * * * @author Paul Hammant Paul_Hammant@yahoo.com * @author Gerhard Froehlich g-froehlich@gmx.de * @version $Revision: 1.1 $ */ public interface NumericColumn extends Column { } 1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/types/StringColumn.java Index: StringColumn.java =================================================================== /* * Copyright (C) The Apache Software Foundation. All rights reserved. * * This software is published under the terms of the Apache Software License * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ package org.apache.avalon.db.data.types; import org.apache.avalon.db.data.Column; /** * Class StringColumn * * * @author Paul Hammant Paul_Hammant@yahoo.com * @version $Revision: 1.1 $ */ public interface StringColumn extends Column { int getMaxLength(); } 1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/types/StringConstantColumn.java Index: StringConstantColumn.java =================================================================== /* * Copyright (C) The Apache Software Foundation. All rights reserved. * * This software is published under the terms of the Apache Software License * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ package org.apache.avalon.db.data.types; import org.apache.avalon.db.data.Column; /** * Class StringConstantColumn * * @author Gerhard Froehlich g-froehlich@gmx.de * @version $Revision: 1.1 $ */ public interface StringConstantColumn extends Column { } 1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/types/TemporalColumn.java Index: TemporalColumn.java =================================================================== /* * Copyright (C) The Apache Software Foundation. All rights reserved. * * This software is published under the terms of the Apache Software License * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ package org.apache.avalon.db.data.types; import org.apache.avalon.db.data.Column; /** * Class TemporalColumn * * * @author Paul Hammant Paul_Hammant@yahoo.com * @version $Revision: 1.1 $ */ public interface TemporalColumn extends Column { } 1.4 +3 -3 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/ConcatFunction.java Index: ConcatFunction.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/ConcatFunction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ConcatFunction.java 2001/11/28 23:09:58 1.3 +++ ConcatFunction.java 2001/12/01 10:49:44 1.4 @@ -8,7 +8,7 @@ package org.apache.avalon.db.functions.impl; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.StringType; +import org.apache.avalon.db.data.types.StringColumn; import org.apache.avalon.db.functions.StringFunction; @@ -16,7 +16,7 @@ * Class ConcatFunction * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class ConcatFunction extends AbstractStringFunction { @@ -31,7 +31,7 @@ public int getMaxLength() { int maxLength = 0; for (int i = 0; i < mColumns.length; i++) { - StringType sTyp = (StringType) mColumns[i]; + StringColumn sTyp = (StringColumn) mColumns[i]; maxLength+= sTyp.getMaxLength(); } return maxLength; 1.3 +3 -3 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/LowerCaseStringFunction.java Index: LowerCaseStringFunction.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/LowerCaseStringFunction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LowerCaseStringFunction.java 2001/11/28 23:09:58 1.2 +++ LowerCaseStringFunction.java 2001/12/01 10:49:44 1.3 @@ -8,7 +8,7 @@ package org.apache.avalon.db.functions.impl; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.StringType; +import org.apache.avalon.db.data.types.StringColumn; import org.apache.avalon.db.functions.StringFunction; import java.util.Locale; @@ -17,7 +17,7 @@ * Class LowerCaseStringFunction * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class LowerCaseStringFunction extends AbstractStringFunction { @@ -32,7 +32,7 @@ } public int getMaxLength() { - StringType sTyp = (StringType) mColumns[0]; + StringColumn sTyp = (StringColumn) mColumns[0]; return sTyp.getMaxLength(); } } 1.3 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/SubStringFunction.java Index: SubStringFunction.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/SubStringFunction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SubStringFunction.java 2001/11/28 23:09:58 1.2 +++ SubStringFunction.java 2001/12/01 10:49:44 1.3 @@ -8,14 +8,14 @@ package org.apache.avalon.db.functions.impl; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.StringType; +import org.apache.avalon.db.data.types.StringColumn; import org.apache.avalon.db.functions.StringFunction; /** * Class SubStringFunction * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class SubStringFunction extends AbstractStringFunction { 1.3 +3 -3 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/TrimStringFunction.java Index: TrimStringFunction.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/TrimStringFunction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TrimStringFunction.java 2001/11/28 23:09:58 1.2 +++ TrimStringFunction.java 2001/12/01 10:49:44 1.3 @@ -8,7 +8,7 @@ package org.apache.avalon.db.functions.impl; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.StringType; +import org.apache.avalon.db.data.types.StringColumn; import org.apache.avalon.db.functions.StringFunction; import java.util.Locale; @@ -17,7 +17,7 @@ * Class TrimStringFunction * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class TrimStringFunction extends AbstractStringFunction { @@ -26,7 +26,7 @@ } public int getMaxLength() { - StringType sTyp = (StringType) mColumns[0]; + StringColumn sTyp = (StringColumn) mColumns[0]; return sTyp.getMaxLength(); } 1.3 +3 -3 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/UpperCaseStringFunction.java Index: UpperCaseStringFunction.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/UpperCaseStringFunction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- UpperCaseStringFunction.java 2001/11/28 23:09:58 1.2 +++ UpperCaseStringFunction.java 2001/12/01 10:49:44 1.3 @@ -8,7 +8,7 @@ package org.apache.avalon.db.functions.impl; import org.apache.avalon.db.data.Row; -import org.apache.avalon.db.data.types.StringType; +import org.apache.avalon.db.data.types.StringColumn; import org.apache.avalon.db.functions.StringFunction; import java.util.Locale; @@ -17,7 +17,7 @@ * Class UpperCaseStringFunction * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class UpperCaseStringFunction extends AbstractStringFunction { @@ -32,7 +32,7 @@ } public int getMaxLength() { - StringType sTyp = (StringType) mColumns[0]; + StringColumn sTyp = (StringColumn) mColumns[0]; return sTyp.getMaxLength(); } -- To unsubscribe, e-mail: For additional commands, e-mail: