From 69f2302c957a737564988aff2d9ae7b66287fe9d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Tue, 30 Aug 2011 19:26:27 -0400
Subject: Undeprecated interface configuration. Added more Define methods.

I've revised my thinking about interface configuration.  I think its a
good option and should be supported.  Field scope is now ignored across
the board.  If the developer does not want to map a field and is using
the interface configuration approach, then the field should be annotated
with IQIgnore.
---
 src/com/iciql/Define.java | 54 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 15 deletions(-)

(limited to 'src/com/iciql/Define.java')

diff --git a/src/com/iciql/Define.java b/src/com/iciql/Define.java
index 4216ea1..3b58231 100644
--- a/src/com/iciql/Define.java
+++ b/src/com/iciql/Define.java
@@ -29,29 +29,39 @@ public class Define {
 	private static TableDefinition<?> currentTableDefinition;
 	private static Iciql currentTable;
 
-	public static void primaryKey(Object... columns) {
+	public static void skipCreate() {
 		checkInDefine();
-		currentTableDefinition.definePrimaryKey(columns);
+		currentTableDefinition.defineSkipCreate();
 	}
 
-	public static void index(Object... columns) {
+	public static void index(IndexType type, Object... columns) {
 		checkInDefine();
-		currentTableDefinition.defineIndex(IndexType.STANDARD, columns);
+		currentTableDefinition.defineIndex(null, type, columns);
 	}
 
-	public static void uniqueIndex(Object... columns) {
+	public static void index(String name, IndexType type, Object... columns) {
 		checkInDefine();
-		currentTableDefinition.defineIndex(IndexType.UNIQUE, columns);
+		currentTableDefinition.defineIndex(name, type, columns);
 	}
 
-	public static void hashIndex(Object column) {
+	public static void primaryKey(Object... columns) {
+		checkInDefine();
+		currentTableDefinition.definePrimaryKey(columns);
+	}
+	
+	public static void schemaName(String schemaName) {
 		checkInDefine();
-		currentTableDefinition.defineIndex(IndexType.HASH, new Object[] { column });
+		currentTableDefinition.defineSchemaName(schemaName);
+	}
+
+	public static void tableName(String tableName) {
+		checkInDefine();
+		currentTableDefinition.defineTableName(tableName);
 	}
 
-	public static void uniqueHashIndex(Object column) {
+	public static void memoryTable() {
 		checkInDefine();
-		currentTableDefinition.defineIndex(IndexType.UNIQUE_HASH, new Object[] { column });
+		currentTableDefinition.defineMemoryTable();
 	}
 
 	public static void columnName(Object column, String columnName) {
@@ -59,6 +69,11 @@ public class Define {
 		currentTableDefinition.defineColumnName(column, columnName);
 	}
 
+	public static void autoIncrement(Object column) {
+		checkInDefine();
+		currentTableDefinition.defineAutoIncrement(column);
+	}
+
 	public static void length(Object column, int length) {
 		checkInDefine();
 		currentTableDefinition.defineLength(column, length);
@@ -68,13 +83,22 @@ public class Define {
 		checkInDefine();
 		currentTableDefinition.defineScale(column, scale);
 	}
-
-	public static void tableName(String tableName) {
+	
+	public static void trim(Object column) {
 		checkInDefine();
-		currentTableDefinition.defineTableName(tableName);
+		currentTableDefinition.defineTrim(column);
 	}
-
-	@SuppressWarnings("deprecation")
+	
+	public static void nullable(Object column, boolean isNullable) {
+		checkInDefine();
+		currentTableDefinition.defineNullable(column, isNullable);
+	}
+	
+	public static void defaultValue(Object column, String defaultValue) {
+		checkInDefine();
+		currentTableDefinition.defineDefaultValue(column, defaultValue);
+	}
+	
 	static synchronized <T> void define(TableDefinition<T> tableDefinition, Iciql table) {
 		currentTableDefinition = tableDefinition;
 		currentTable = table;
-- 
cgit v1.2.3