You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2001/12/19 19:59:27 UTC
cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/types SQLType.java
hammant 01/12/19 10:59:27
Modified: apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql
BasicLXSQLSelectSimpleHandler.java
SelectColumnHelper.java
apps/db/src/java/org/apache/avalon/db/data Column.java
apps/db/src/java/org/apache/avalon/db/data/impl
AbstractAggregateFunctionColumn.java
AbstractColumn.java AbstractContrivedColumn.java
AbstractDelegatedColumn.java
AbstractWritableColumn.java
DefaultAggregateAveColumn.java
DefaultAggregateCountColumn.java
DefaultAggregateMaxColumn.java
DefaultAggregateMinColumn.java
DefaultAggregateSumColumn.java
DefaultAggregateVarcharKeyColumn.java
DefaultBigIntColumn.java
DefaultContrivedIntegerFunctionColumn.java
DefaultDateColumn.java DefaultDecimalColumn.java
DefaultDelegatedIntegerColumn.java
DefaultDelegatedVarcharColumn.java
DefaultIntegerColumn.java
DefaultIntegerConstantColumn.java
DefaultNumericConstantColumn.java
DefaultRealColumn.java DefaultSmallIntColumn.java
DefaultStringConstantColumn.java
DefaultTimeColumn.java DefaultTimestampColumn.java
DefaultVarCharColumn.java
Added: apps/db/src/java/org/apache/avalon/db/data/impl
DefaultContrivedVarcharFunctionColumn.java
DefaultDelegatedBigintColumn.java
DefaultDelegatedSmallIntColumn.java
apps/db/src/java/org/apache/avalon/db/data/types
SQLType.java
Removed: apps/db/src/java/org/apache/avalon/db/data/impl
DefaultContrivedStringFunctionColumn.java
Log:
Column abstraction rework
Revision Changes Path
1.15 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLSelectSimpleHandler.java
Index: BasicLXSQLSelectSimpleHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLSelectSimpleHandler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BasicLXSQLSelectSimpleHandler.java 2001/12/19 10:45:46 1.14
+++ BasicLXSQLSelectSimpleHandler.java 2001/12/19 18:59:26 1.15
@@ -22,7 +22,7 @@
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.db.data.impl.AbstractQueryable;
-import org.apache.avalon.db.data.impl.DefaultContrivedStringFunctionColumn;
+import org.apache.avalon.db.data.impl.DefaultContrivedVarcharFunctionColumn;
import org.apache.avalon.db.data.impl.DefaultStringConstantColumn;
import org.apache.avalon.db.data.impl.DefaultContrivedIntegerFunctionColumn;
import org.apache.avalon.db.data.impl.DefaultIntegerConstantColumn;
@@ -53,7 +53,7 @@
*
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public class BasicLXSQLSelectSimpleHandler extends BasicLXSQLHandler {
1.2 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/SelectColumnHelper.java
Index: SelectColumnHelper.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/SelectColumnHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SelectColumnHelper.java 2001/12/19 10:45:46 1.1
+++ SelectColumnHelper.java 2001/12/19 18:59:26 1.2
@@ -18,7 +18,7 @@
import org.apache.avalon.db.data.impl.AbstractQueryable;
import org.apache.avalon.db.data.impl.DefaultIntegerConstantColumn;
import org.apache.avalon.db.data.impl.DefaultStringConstantColumn;
-import org.apache.avalon.db.data.impl.DefaultContrivedStringFunctionColumn;
+import org.apache.avalon.db.data.impl.DefaultContrivedVarcharFunctionColumn;
import org.apache.avalon.db.data.impl.DefaultContrivedIntegerFunctionColumn;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.functions.impl.IntegerDivisionFunction;
@@ -44,7 +44,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class SelectColumnHelper {
@@ -146,7 +146,7 @@
Column[] cols = new Column[colVec.size()];
colVec.copyInto(cols);
function.initialize(cols);
- return new DefaultContrivedStringFunctionColumn(as,function);
+ return new DefaultContrivedVarcharFunctionColumn(as,function);
} else {
throw new ActionException("String function "+aElem.getNodeName()+" must have child column");
}
1.12 +4 -3 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Column.java 2001/12/02 14:46:26 1.11
+++ Column.java 2001/12/19 18:59:26 1.12
@@ -8,6 +8,8 @@
*/
package org.apache.avalon.db.data;
+import org.apache.avalon.db.data.types.SQLType;
+
import java.math.BigDecimal;
/**
@@ -16,7 +18,7 @@
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>
- * @version * $Revision: 1.11 $
+ * @version * $Revision: 1.12 $
*/
public interface Column extends Nameable {
@@ -25,8 +27,7 @@
// methods of use in metadata
- String getSQLType();
- String getJavaType();
+ SQLType getSQLType();
int getColumnDisplaySize();
String getColumnLabel();
String getColumnName();
1.3 +4 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractAggregateFunctionColumn.java 2001/12/01 10:49:43 1.2
+++ AbstractAggregateFunctionColumn.java 2001/12/19 18:59:26 1.3
@@ -10,6 +10,7 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.AggregateFunctionColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.actions.ActionException;
@@ -18,7 +19,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public abstract class AbstractAggregateFunctionColumn extends AbstractContrivedColumn
implements AggregateFunctionColumn {
@@ -32,8 +33,8 @@
* @param javaType
*
*/
- public AbstractAggregateFunctionColumn(String name, String sqltype, Class javaType) throws ActionException {
- super(getNameOfColumn(name),sqltype,String.class.getName());
+ public AbstractAggregateFunctionColumn(String name, SQLType sqltype) throws ActionException {
+ super(getNameOfColumn(name),sqltype);
}
}
1.6 +6 -17 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractColumn.java
Index: AbstractColumn.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractColumn.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractColumn.java 2001/12/17 16:00:17 1.5
+++ AbstractColumn.java 2001/12/19 18:59:26 1.6
@@ -14,6 +14,7 @@
import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Row;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.utils.StringUtils;
@@ -23,13 +24,12 @@
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public abstract class AbstractColumn implements Column {
protected String mName;
- protected String mSqlType;
- protected String mJavaType;
+ protected SQLType mSqlType;
protected int mIndex = -1;
protected String mPrecision;
@@ -42,10 +42,9 @@
* @param javaType
*
*/
- public AbstractColumn(String name, String sqlType, String javaType) {
+ public AbstractColumn(String name, SQLType sqlType) {
mName = StringUtils.normalize(name);
mSqlType = sqlType;
- mJavaType = javaType;
}
// TODO can be overriden, or should be overridden
@@ -62,7 +61,7 @@
* @return
*
*/
- public String getSQLType() {
+ public SQLType getSQLType() {
return mSqlType;
}
@@ -77,16 +76,6 @@
return mName;
}
- /**
- * Method getJavaType
- *
- *
- * @return
- *
- */
- public String getJavaType() {
- return mJavaType;
- }
/** methods for the metadata */
public int getColumnDisplaySize() {
@@ -108,7 +97,7 @@
}
public String getColumnTypeName() {
- return mSqlType;
+ return mSqlType.getSQLType();
}
public int getPrecision() {
1.2 +4 -3 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractContrivedColumn.java
Index: AbstractContrivedColumn.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractContrivedColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractContrivedColumn.java 2001/11/17 08:52:56 1.1
+++ AbstractContrivedColumn.java 2001/12/19 18:59:26 1.2
@@ -14,6 +14,7 @@
import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Row;
+import org.apache.avalon.db.data.types.SQLType;
/**
@@ -22,14 +23,14 @@
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class AbstractContrivedColumn extends AbstractColumn {
public static int MGENCOL = 0;
- public AbstractContrivedColumn(String name, String sqlType, String javaType) {
- super(name,sqlType,javaType);
+ public AbstractContrivedColumn(String name, SQLType sqlType) {
+ super(name,sqlType);
}
protected static String getNameOfColumn(String namePassedIn) {
1.2 +4 -3 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractDelegatedColumn.java
Index: AbstractDelegatedColumn.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractDelegatedColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractDelegatedColumn.java 2001/12/06 00:54:45 1.1
+++ AbstractDelegatedColumn.java 2001/12/19 18:59:26 1.2
@@ -10,6 +10,7 @@
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Row;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.actions.ActionException;
import java.math.BigDecimal;
@@ -20,7 +21,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class AbstractDelegatedColumn extends AbstractColumn {
@@ -34,8 +35,8 @@
* @param name
*
*/
- public AbstractDelegatedColumn(Column column, String alias, String sqlType, String javaType) throws ActionException {
- super(column.getName(), sqlType, javaType);
+ public AbstractDelegatedColumn(Column column, String alias, SQLType sqlType) throws ActionException {
+ super(column.getName(), sqlType);
mAlias = alias;
mColumn = column;
}
1.2 +3 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractWritableColumn.java
Index: AbstractWritableColumn.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractWritableColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractWritableColumn.java 2001/11/17 10:12:09 1.1
+++ AbstractWritableColumn.java 2001/12/19 18:59:26 1.2
@@ -15,6 +15,7 @@
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.WritableColumn;
+import org.apache.avalon.db.data.types.SQLType;
/**
@@ -23,11 +24,11 @@
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class AbstractWritableColumn extends AbstractColumn implements WritableColumn {
- public AbstractWritableColumn(String name, String sqlType, String javaType) {
- super(name,sqlType,javaType);
+ public AbstractWritableColumn(String name, SQLType sqlType) {
+ super(name,sqlType);
}
}
1.5 +3 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultAggregateAveColumn.java 2001/12/04 06:35:43 1.4
+++ DefaultAggregateAveColumn.java 2001/12/19 18:59:26 1.5
@@ -9,6 +9,7 @@
package org.apache.avalon.db.data.impl;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Queryable;
@@ -22,7 +23,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class DefaultAggregateAveColumn extends AbstractAggregateFunctionColumn implements NumericColumn {
@@ -40,7 +41,7 @@
*
*/
public DefaultAggregateAveColumn(Queryable onQueryable, String name, String on) throws ActionException {
- super(getNameOfColumn(name),"integer",Integer.class);
+ super(getNameOfColumn(name),SQLType.INTEGER);
mOnColumn = onQueryable.getColumns()[onQueryable.getColumnIndex(on)];
}
1.6 +3 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultAggregateCountColumn.java 2001/12/04 06:35:43 1.5
+++ DefaultAggregateCountColumn.java 2001/12/19 18:59:26 1.6
@@ -9,6 +9,7 @@
package org.apache.avalon.db.data.impl;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.actions.ActionException;
@@ -21,7 +22,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class DefaultAggregateCountColumn extends AbstractAggregateFunctionColumn {
@@ -37,7 +38,7 @@
*
*/
public DefaultAggregateCountColumn(String name) throws ActionException {
- super(getNameOfColumn(name),"integer",Integer.class);
+ super(getNameOfColumn(name),SQLType.INTEGER);
}
public Object getValue(Row row) {
1.5 +3 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultAggregateMaxColumn.java 2001/12/04 06:35:43 1.4
+++ DefaultAggregateMaxColumn.java 2001/12/19 18:59:26 1.5
@@ -9,6 +9,7 @@
package org.apache.avalon.db.data.impl;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Queryable;
@@ -22,7 +23,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class DefaultAggregateMaxColumn extends AbstractAggregateFunctionColumn implements NumericColumn {
@@ -39,7 +40,7 @@
*
*/
public DefaultAggregateMaxColumn(Queryable onQueryable, String name, String on) throws ActionException {
- super(getNameOfColumn(name),"integer",Integer.class);
+ super(getNameOfColumn(name),SQLType.INTEGER);
mOnColumn = onQueryable.getColumns()[onQueryable.getColumnIndex(on)];
}
1.5 +3 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultAggregateMinColumn.java 2001/12/04 06:35:43 1.4
+++ DefaultAggregateMinColumn.java 2001/12/19 18:59:26 1.5
@@ -9,6 +9,7 @@
package org.apache.avalon.db.data.impl;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Queryable;
@@ -22,7 +23,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class DefaultAggregateMinColumn extends AbstractAggregateFunctionColumn implements NumericColumn {
@@ -39,7 +40,7 @@
*
*/
public DefaultAggregateMinColumn(Queryable onQueryable, String name, String on) throws ActionException {
- super(getNameOfColumn(name),"integer",Integer.class);
+ super(getNameOfColumn(name),SQLType.INTEGER);
mOnColumn = onQueryable.getColumns()[onQueryable.getColumnIndex(on)];
}
1.5 +3 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultAggregateSumColumn.java 2001/12/04 06:35:43 1.4
+++ DefaultAggregateSumColumn.java 2001/12/19 18:59:26 1.5
@@ -9,6 +9,7 @@
package org.apache.avalon.db.data.impl;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Queryable;
@@ -22,7 +23,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class DefaultAggregateSumColumn extends AbstractAggregateFunctionColumn implements NumericColumn {
@@ -39,7 +40,7 @@
*
*/
public DefaultAggregateSumColumn(Queryable onQueryable, String name, String on) throws ActionException {
- super(getNameOfColumn(name),"integer",Integer.class);
+ super(getNameOfColumn(name),SQLType.INTEGER);
mOnColumn = onQueryable.getColumns()[onQueryable.getColumnIndex(on)];
}
1.6 +3 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultAggregateVarcharKeyColumn.java 2001/12/01 17:50:27 1.5
+++ DefaultAggregateVarcharKeyColumn.java 2001/12/19 18:59:26 1.6
@@ -12,6 +12,7 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.types.StringColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.actions.ActionException;
import java.math.BigDecimal;
@@ -22,7 +23,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class DefaultAggregateVarcharKeyColumn extends AbstractColumn implements AggregateKeyColumn, StringColumn {
@@ -37,7 +38,7 @@
*
*/
public DefaultAggregateVarcharKeyColumn(StringColumn stringColumn, String alias) throws ActionException {
- super(stringColumn.getName(), "varchar", String.class.getName());
+ super(stringColumn.getName(), SQLType.VARCHAR);
mAlias = alias;
mStringColumn = stringColumn;
}
1.4 +3 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultBigIntColumn.java 2001/12/01 17:50:27 1.3
+++ DefaultBigIntColumn.java 2001/12/19 18:59:26 1.4
@@ -9,6 +9,7 @@
import org.apache.avalon.db.data.ValidationException;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
@@ -18,7 +19,7 @@
* Class DefaultBigIntColumn
*
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DefaultBigIntColumn extends AbstractWritableColumn implements NumericColumn {
@@ -27,7 +28,7 @@
* @param name
*/
public DefaultBigIntColumn(String name) {
- super(name,"bigint",Long.class.getName());
+ super(name, SQLType.BIGINT);
}
public Object convertFromObject(Object obj) throws ValidationException {
1.2 +3 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultContrivedIntegerFunctionColumn.java
Index: DefaultContrivedIntegerFunctionColumn.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultContrivedIntegerFunctionColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultContrivedIntegerFunctionColumn.java 2001/12/18 19:25:24 1.1
+++ DefaultContrivedIntegerFunctionColumn.java 2001/12/19 18:59:26 1.2
@@ -9,6 +9,7 @@
package org.apache.avalon.db.data.impl;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.ValidationException;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
@@ -23,7 +24,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class DefaultContrivedIntegerFunctionColumn extends AbstractContrivedColumn implements NumericColumn {
@@ -38,7 +39,7 @@
*
*/
public DefaultContrivedIntegerFunctionColumn(String name, NumericFunction numericFunction) throws ActionException {
- super(getNameOfColumn(name),"integer",Integer.class.getName());
+ super(getNameOfColumn(name), SQLType.INTEGER);
mNumericFunction = numericFunction;
}
1.4 +3 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultDateColumn.java 2001/12/01 17:50:27 1.3
+++ DefaultDateColumn.java 2001/12/19 18:59:26 1.4
@@ -11,6 +11,7 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.types.TemporalColumn;
+import org.apache.avalon.db.data.types.SQLType;
import java.sql.Date;
import java.math.BigDecimal;
@@ -20,7 +21,7 @@
* Class DefaultDateColumn
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DefaultDateColumn extends AbstractWritableColumn implements TemporalColumn {
@@ -29,7 +30,7 @@
* @param name
*/
public DefaultDateColumn(String name) {
- super(name,"date", Date.class.getName());
+ super(name, SQLType.DATE);
}
public Object convertFromObject(Object obj) throws ValidationException {
1.4 +3 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultDecimalColumn.java 2001/12/01 17:50:27 1.3
+++ DefaultDecimalColumn.java 2001/12/19 18:59:26 1.4
@@ -9,6 +9,7 @@
import org.apache.avalon.db.data.ValidationException;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
@@ -18,7 +19,7 @@
* Class DefaultDecimalColumn
*
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DefaultDecimalColumn extends AbstractWritableColumn implements NumericColumn {
@@ -27,7 +28,7 @@
* @param name
*/
public DefaultDecimalColumn(String name) {
- super(name,"decimal",BigDecimal.class.getName());
+ super(name, SQLType.DECIMAL);
}
public Object convertFromObject(Object obj) throws ValidationException {
1.2 +3 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDelegatedIntegerColumn.java
Index: DefaultDelegatedIntegerColumn.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDelegatedIntegerColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultDelegatedIntegerColumn.java 2001/12/06 00:54:45 1.1
+++ DefaultDelegatedIntegerColumn.java 2001/12/19 18:59:26 1.2
@@ -9,6 +9,7 @@
package org.apache.avalon.db.data.impl;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.actions.ActionException;
/**
@@ -16,7 +17,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class DefaultDelegatedIntegerColumn extends AbstractDelegatedColumn implements NumericColumn {
@@ -29,7 +30,7 @@
*
*/
public DefaultDelegatedIntegerColumn(NumericColumn numericColumn, String alias) throws ActionException {
- super(numericColumn, alias, "integer", Integer.class.getName());
+ super(numericColumn, alias, SQLType.INTEGER);
}
}
1.2 +3 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDelegatedVarcharColumn.java
Index: DefaultDelegatedVarcharColumn.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDelegatedVarcharColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultDelegatedVarcharColumn.java 2001/12/06 00:54:45 1.1
+++ DefaultDelegatedVarcharColumn.java 2001/12/19 18:59:26 1.2
@@ -9,6 +9,7 @@
package org.apache.avalon.db.data.impl;
import org.apache.avalon.db.data.types.StringColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.actions.ActionException;
/**
@@ -16,7 +17,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class DefaultDelegatedVarcharColumn extends AbstractDelegatedColumn implements StringColumn {
@@ -29,7 +30,7 @@
*
*/
public DefaultDelegatedVarcharColumn(StringColumn stringColumn, String alias) throws ActionException {
- super(stringColumn, alias, "varchar", String.class.getName());
+ super(stringColumn, alias, SQLType.VARCHAR);
}
public int getMaxLength() {
1.4 +3 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultIntegerColumn.java 2001/12/01 17:50:27 1.3
+++ DefaultIntegerColumn.java 2001/12/19 18:59:26 1.4
@@ -10,6 +10,7 @@
import org.apache.avalon.db.data.ValidationException;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
@@ -21,7 +22,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DefaultIntegerColumn extends AbstractWritableColumn implements NumericColumn {
@@ -33,7 +34,7 @@
*
*/
public DefaultIntegerColumn(String name) {
- super(name,"integer",Integer.class.getName());
+ super(name,SQLType.INTEGER);
}
public Object convertFromObject(Object obj) throws ValidationException {
1.2 +3 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultIntegerConstantColumn.java
Index: DefaultIntegerConstantColumn.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultIntegerConstantColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultIntegerConstantColumn.java 2001/12/18 20:21:26 1.1
+++ DefaultIntegerConstantColumn.java 2001/12/19 18:59:26 1.2
@@ -12,6 +12,7 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.types.NumericConstantColumn;
+import org.apache.avalon.db.data.types.SQLType;
import java.math.BigDecimal;
@@ -21,7 +22,7 @@
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class DefaultIntegerConstantColumn extends AbstractColumn implements NumericConstantColumn {
@@ -37,7 +38,7 @@
*
*/
public DefaultIntegerConstantColumn(String name, int intConstant) {
- super(name,"integer",Integer.class.getName());
+ super(name, SQLType.INTEGER);
mIntConstant = intConstant;
mIntegerConstant = new Integer(mIntConstant);
}
1.2 +3 -1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultNumericConstantColumn.java
Index: DefaultNumericConstantColumn.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultNumericConstantColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultNumericConstantColumn.java 2001/12/02 14:47:02 1.1
+++ DefaultNumericConstantColumn.java 2001/12/19 18:59:26 1.2
@@ -12,6 +12,8 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.types.NumericConstantColumn;
+import org.apache.avalon.db.data.types.SQLType;
+
import java.math.BigDecimal;
/**
@@ -33,7 +35,7 @@
*
*/
public DefaultNumericConstantColumn(String name, String numConstant) {
- super(name,"numeric",String.class.getName());
+ super(name, SQLType.NUMERIC);
mNumConstant = numConstant;
}
1.4 +3 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultRealColumn.java 2001/12/01 17:50:27 1.3
+++ DefaultRealColumn.java 2001/12/19 18:59:26 1.4
@@ -9,6 +9,7 @@
import org.apache.avalon.db.data.ValidationException;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
@@ -18,7 +19,7 @@
* Class DefaultRealColumn
*
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DefaultRealColumn extends AbstractWritableColumn implements NumericColumn {
@@ -27,7 +28,7 @@
* @param name
*/
public DefaultRealColumn(String name) {
- super(name,"real",Float.class.getName());
+ super(name,SQLType.REAL);
}
public Object convertFromObject(Object obj) throws ValidationException {
1.4 +3 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultSmallIntColumn.java 2001/12/01 17:50:27 1.3
+++ DefaultSmallIntColumn.java 2001/12/19 18:59:26 1.4
@@ -9,6 +9,7 @@
import org.apache.avalon.db.data.ValidationException;
import org.apache.avalon.db.data.types.NumericColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
@@ -18,7 +19,7 @@
* Class DefaultSmallIntColumn
*
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DefaultSmallIntColumn extends AbstractWritableColumn implements NumericColumn {
@@ -27,7 +28,7 @@
* @param name
*/
public DefaultSmallIntColumn(String name) {
- super(name,"smallint",Short.class.getName());
+ super(name,SQLType.SMALLINT);
}
public Object convertFromObject(Object obj) throws ValidationException {
1.5 +4 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultStringConstantColumn.java 2001/12/03 00:44:26 1.4
+++ DefaultStringConstantColumn.java 2001/12/19 18:59:26 1.5
@@ -12,6 +12,8 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.types.StringConstantColumn;
+import org.apache.avalon.db.data.types.SQLType;
+
import java.math.BigDecimal;
/**
@@ -20,7 +22,7 @@
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>*
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class DefaultStringConstantColumn extends AbstractColumn implements StringConstantColumn {
@@ -35,7 +37,7 @@
*
*/
public DefaultStringConstantColumn(String name, String strConstant) {
- super(name,"varchar",String.class.getName());
+ super(name,SQLType.VARCHAR);
mStrConstant = strConstant;
}
1.4 +4 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultTimeColumn.java 2001/12/01 17:50:27 1.3
+++ DefaultTimeColumn.java 2001/12/19 18:59:26 1.4
@@ -11,6 +11,8 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.types.TemporalColumn;
+import org.apache.avalon.db.data.types.SQLType;
+
import java.sql.Time;
import java.math.BigDecimal;
@@ -18,7 +20,7 @@
* Class DefaultTimeColumn
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DefaultTimeColumn extends AbstractWritableColumn implements TemporalColumn {
@@ -27,7 +29,7 @@
* @param name
*/
public DefaultTimeColumn(String name) {
- super(name,"time", Time.class.getName());
+ super(name, SQLType.TIME);
}
public Object convertFromObject(Object obj) throws ValidationException {
1.4 +4 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultTimestampColumn.java 2001/12/01 17:50:27 1.3
+++ DefaultTimestampColumn.java 2001/12/19 18:59:26 1.4
@@ -11,6 +11,8 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.types.TemporalColumn;
+import org.apache.avalon.db.data.types.SQLType;
+
import java.sql.Timestamp;
import java.math.BigDecimal;
@@ -18,7 +20,7 @@
* Class DefaultTimestampColumn
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DefaultTimestampColumn extends AbstractWritableColumn implements TemporalColumn {
@@ -27,7 +29,7 @@
* @param name
*/
public DefaultTimestampColumn(String name) {
- super(name,"timestamp", Timestamp.class.getName());
+ super(name, SQLType.TIMESTAMP);
}
public Object convertFromObject(Object obj) throws ValidationException {
1.5 +3 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultVarCharColumn.java 2001/12/17 16:00:17 1.4
+++ DefaultVarCharColumn.java 2001/12/19 18:59:26 1.5
@@ -12,6 +12,7 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.types.StringColumn;
+import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.utils.StringUtils;
import java.math.BigDecimal;
@@ -22,7 +23,7 @@
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>*
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class DefaultVarCharColumn extends AbstractWritableColumn implements StringColumn {
@@ -37,7 +38,7 @@
*
*/
public DefaultVarCharColumn(String name, int maxLength) {
- super(name,"varchar",String.class.getName());
+ super(name, SQLType.VARCHAR);
mMaxLength = maxLength;
}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultContrivedVarcharFunctionColumn.java
Index: DefaultContrivedVarcharFunctionColumn.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.impl;
import org.apache.avalon.db.data.types.StringColumn;
import org.apache.avalon.db.data.types.SQLType;
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;
import java.math.BigDecimal;
/**
* Class DefaultContrivedVarcharFunctionColumn
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class DefaultContrivedVarcharFunctionColumn extends AbstractContrivedColumn implements StringColumn {
StringFunction mStringFunction;
/**
* Constructor DefaultContrivedVarcharFunctionColumn
*
*
* @param name
* @param stringFunction
*
*/
public DefaultContrivedVarcharFunctionColumn(String name, StringFunction stringFunction) throws ActionException {
super(getNameOfColumn(name),SQLType.VARCHAR);
mStringFunction = stringFunction;
}
public Object getValue(Row row) {
return mStringFunction.getValue(row);
}
public String toString(Row row) {
return (String)mStringFunction.getValue(row);
}
public int getPrecesion() {
return Column.PREC_STRING;
}
public Integer toInteger(Row row) {
return new Integer((String)mStringFunction.getValue(row));
}
public Long toLong(Row row) {
return new Long((String)mStringFunction.getValue(row));
}
public BigDecimal toBigDecimal(Row row) {
return new BigDecimal((String)mStringFunction.getValue(row));
}
public Float toFloat(Row row) {
return new Float((String)mStringFunction.getValue(row));
}
public Short toShort(Row row) {
return new Short((String)mStringFunction.getValue(row));
}
public int getMaxLength() {
return mStringFunction.getMaxLength();
}
}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDelegatedBigintColumn.java
Index: DefaultDelegatedBigintColumn.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.impl;
import org.apache.avalon.db.data.types.NumericColumn;
import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.actions.ActionException;
import java.math.BigDecimal;
/**
* Class DefaultDelegatedBigintColumn
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class DefaultDelegatedBigintColumn extends AbstractDelegatedColumn implements NumericColumn {
/**
* Constructor DefaultDelegatedBigintColumn
*
*
* @param name
*
*/
public DefaultDelegatedBigintColumn(NumericColumn numericColumn, String alias) throws ActionException {
super(numericColumn, alias, SQLType.BIGINT);
}
}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDelegatedSmallIntColumn.java
Index: DefaultDelegatedSmallIntColumn.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.impl;
import org.apache.avalon.db.data.types.NumericColumn;
import org.apache.avalon.db.data.types.SQLType;
import org.apache.avalon.db.actions.ActionException;
/**
* Class DefaultDelegatedSmallIntColumn
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class DefaultDelegatedSmallIntColumn extends AbstractDelegatedColumn implements NumericColumn {
/**
* Constructor DefaultDelegatedSmallIntColumn
*
*
* @param name
*
*/
public DefaultDelegatedSmallIntColumn(NumericColumn numericColumn, String alias) throws ActionException {
super(numericColumn, alias, SQLType.SMALLINT);
}
}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/types/SQLType.java
Index: SQLType.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 java.math.BigDecimal;
import java.sql.Types;
import java.sql.Date;
import java.sql.Time;
import java.sql.Timestamp;
public class SQLType {
// From Fig 2.1 O'Reilly "SQL in a nutshell"
// numeric types
public static final SQLType INTEGER = new SQLType("integer", Integer.class, Types.INTEGER);
public static final SQLType SMALLINT = new SQLType("smallint", Short.class, Types.SMALLINT);
public static final SQLType BIGINT = new SQLType("bigint", Long.class, Types.BIGINT);
public static final SQLType NUMERIC = new SQLType("numeric", Integer.class, Types.NUMERIC);
public static final SQLType DECIMAL = new SQLType("decimal", BigDecimal.class, Types.DECIMAL);
public static final SQLType FLOAT = new SQLType("float", Float.class, Types.FLOAT);
public static final SQLType REAL = new SQLType("real", Float.class, Types.REAL);
public static final SQLType DOUBLE = new SQLType("double", Double.class, Types.DOUBLE);
// string types
public static final SQLType VARCHAR = new SQLType("varchar", String.class, Types.VARCHAR);
// date types
public static final SQLType DATE = new SQLType("date", Date.class, Types.DATE);
public static final SQLType TIME = new SQLType("time", Time.class, Types.TIME);
public static final SQLType TIMESTAMP = new SQLType("timestamp", Timestamp.class, Types.TIMESTAMP);
private String mSqlType;
private Class mJavaType;
private int mJdbcType;
private SQLType(String sqlType, Class javaType, int jdbcType) {
mSqlType = sqlType;
mJavaType = javaType;
mJdbcType = jdbcType;
}
public String getSQLType() {
return mSqlType;
}
public Class getJavaType() {
return mJavaType;
}
public int getJDBCType() {
return mJdbcType;
}
public String toString() {
return mSqlType;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>