From 116679ebfec550a717909c4132776fb2d4417cff Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Thu, 29 Oct 2009 16:33:34 +0000 Subject: [PATCH] Get rid of @Column(type=...) which was always an abomination. --- src/java/com/samskivert/depot/annotation/Column.java | 5 ----- src/java/com/samskivert/depot/impl/SQLBuilder.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/java/com/samskivert/depot/annotation/Column.java b/src/java/com/samskivert/depot/annotation/Column.java index 524edeb..497961e 100644 --- a/src/java/com/samskivert/depot/annotation/Column.java +++ b/src/java/com/samskivert/depot/annotation/Column.java @@ -52,11 +52,6 @@ public @interface Column */ boolean nullable () default false; - /** - * The SQL type that is used when generating the DDL for the column. - */ - String type() default ""; - /** * The column length. (Applies to String and byte[] columns.) */ diff --git a/src/java/com/samskivert/depot/impl/SQLBuilder.java b/src/java/com/samskivert/depot/impl/SQLBuilder.java index 7ea24a4..adaad73 100644 --- a/src/java/com/samskivert/depot/impl/SQLBuilder.java +++ b/src/java/com/samskivert/depot/impl/SQLBuilder.java @@ -119,7 +119,7 @@ public abstract class SQLBuilder Column column = field.getAnnotation(Column.class); ColumnDefinition coldef = (column != null) ? - new ColumnDefinition(nullify(column.type()), column.nullable(), + new ColumnDefinition(null, column.nullable(), column.unique(), nullify(column.defaultValue())) : new ColumnDefinition();