add foreign key constraint annotation

add unique constraint annotation
fix small bug in build.xml for java source destination

4 files changed, 238 insertions, 1 deletions

diff --git a/tests/com/iciql/test/ForeignKeyTest.java b/tests/com/iciql/test/ForeignKeyTest.java
new file mode 100644
index 0000000..0941516
--- /dev/null
+++ b/tests/com/iciql/test/ForeignKeyTest.java
@@ -0,0 +1,64 @@
+/*

+ * Copyright 2012 Frédéric Gaillard.

+ *

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *     http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+package com.iciql.test;

+

+import static org.junit.Assert.assertEquals;

+

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+import com.iciql.Db;

+import com.iciql.test.models.CategoryAnnotationOnly;

+import com.iciql.test.models.ProductAnnotationOnlyWithForeignKey;

+

+public class ForeignKeyTest {

+

+	/**

+	 * This object represents a database (actually a connection to the

+	 * database).

+	 */

+

+	private Db db;

+

+	@Before

+	public void setUp() {

+		db = IciqlSuite.openNewDb();

+		db.insertAll(CategoryAnnotationOnly.getList());

+		db.insertAll(ProductAnnotationOnlyWithForeignKey.getList());

+	}

+

+	@After

+	public void tearDown() {

+		db.close();

+	}

+

+	@Test

+	public void testForeignKeyWithOnDeleteCascade() {

+		ProductAnnotationOnlyWithForeignKey p = new ProductAnnotationOnlyWithForeignKey();

+		long count1 = db.from(p).selectCount();

+		

+		// should remove 2 associated products

+		CategoryAnnotationOnly c = new CategoryAnnotationOnly();

+		db.from(c).where(c.categoryId).is(1L).delete();

+		

+		long count2 = db.from(p).selectCount();

+		

+		assertEquals(count1, count2 + 2L);

+	}

+

+

+}

diff --git a/tests/com/iciql/test/IciqlSuite.java b/tests/com/iciql/test/IciqlSuite.java
index 68156f8..f888a8c 100644
--- a/tests/com/iciql/test/IciqlSuite.java
+++ b/tests/com/iciql/test/IciqlSuite.java
@@ -1,5 +1,6 @@
 /*

  * Copyright 2011 James Moger.

+ * Copyright 2012 Frédéric Gaillard.

  *

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

@@ -89,7 +90,7 @@ import com.iciql.util.Utils;
 @SuiteClasses({ AliasMapTest.class, AnnotationsTest.class, BooleanModelTest.class, ClobTest.class,

 		ConcurrencyTest.class, EnumsTest.class, ModelsTest.class, PrimitivesTest.class,

 		RuntimeQueryTest.class, SamplesTest.class, UpdateTest.class, UpgradesTest.class, JoinTest.class,

-		UUIDTest.class, ViewsTest.class })

+		UUIDTest.class, ViewsTest.class, ForeignKeyTest.class })

 public class IciqlSuite {

 

 	private static final TestDb[] TEST_DBS = {

diff --git a/tests/com/iciql/test/models/CategoryAnnotationOnly.java b/tests/com/iciql/test/models/CategoryAnnotationOnly.java
new file mode 100644
index 0000000..7bccfe7
--- /dev/null
+++ b/tests/com/iciql/test/models/CategoryAnnotationOnly.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2012 Frédéric Gaillard.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.iciql.test.models;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.iciql.Iciql.IQColumn;
+import com.iciql.Iciql.IQContraintUnique;
+import com.iciql.Iciql.IQTable;
+
+/**
+ * A table containing category data.
+ */
+
+@IQTable(name = "AnnotatedCatagory", primaryKey = "id")
+// @IQIndex(value = "categ", type=IndexType.UNIQUE)
+@IQContraintUnique(uniqueColumns = { "categ" })
+public class CategoryAnnotationOnly {
+
+	@IQColumn(name = "id", autoIncrement = true)
+	public Long categoryId;
+
+	@IQColumn(name = "categ", length = 15, trim = true)
+	public String category;
+
+	public CategoryAnnotationOnly() {
+		// public constructor
+	}
+
+	private CategoryAnnotationOnly(long categoryId, String category) {
+		this.categoryId = categoryId;
+		this.category = category;
+	}
+
+	private static CategoryAnnotationOnly create(int categoryId, String category) {
+		return new CategoryAnnotationOnly(categoryId, category);
+	}
+
+	public static List<CategoryAnnotationOnly> getList() {
+		CategoryAnnotationOnly[] list = { 
+				create(1, "Beverages"),
+				create(2, "Condiments"),
+				create(3, "Produce"),
+				create(4, "Meat/Poultry"),
+				create(5,"Seafood")
+		};
+		return Arrays.asList(list);
+	}
+
+	public String toString() {
+		return category;
+	}
+
+}
diff --git a/tests/com/iciql/test/models/ProductAnnotationOnlyWithForeignKey.java b/tests/com/iciql/test/models/ProductAnnotationOnlyWithForeignKey.java
new file mode 100644
index 0000000..b0e5837
--- /dev/null
+++ b/tests/com/iciql/test/models/ProductAnnotationOnlyWithForeignKey.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2004-2011 H2 Group.
+ * Copyright 2011 James Moger.
+ * Copyright 2012 Frédéric Gaillard.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.iciql.test.models;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.iciql.Iciql.ConstraintDeleteType;
+import com.iciql.Iciql.IQColumn;
+import com.iciql.Iciql.IQContraintForeignKey;
+import com.iciql.Iciql.IQIndex;
+import com.iciql.Iciql.IQIndexes;
+import com.iciql.Iciql.IQTable;
+import com.iciql.Iciql.IndexType;
+
+/**
+ * A table containing product data.
+ */
+
+@IQTable(name = "AnnotatedProduct", primaryKey = "id")
+@IQIndexes({ @IQIndex({ "name", "cat" }), @IQIndex(name = "nameidx", type = IndexType.HASH, value = "name") })
+@IQContraintForeignKey(
+		foreignColumns= { "cat" }, 
+		referenceName = "AnnotatedCatagory",
+		referenceColumns = { "categ" },
+		deleteType = ConstraintDeleteType.CASCADE
+)
+public class ProductAnnotationOnlyWithForeignKey {
+
+	public String unmappedField;
+
+	@IQColumn(name = "id", autoIncrement = true)
+	public Long productId;
+
+	@IQColumn(name = "cat", length = 15, trim = true)
+	public String category;
+
+	@IQColumn(name = "name", length = 50)
+	public String productName;
+
+	@SuppressWarnings("unused")
+	@IQColumn
+	private Double unitPrice;
+
+	@IQColumn
+	private Integer unitsInStock;
+
+	public ProductAnnotationOnlyWithForeignKey() {
+		// public constructor
+	}
+
+	private ProductAnnotationOnlyWithForeignKey(long productId, String productName, String category, double unitPrice,
+			int unitsInStock, String unmappedField) {
+		this.productId = productId;
+		this.productName = productName;
+		this.category = category;
+		this.unitPrice = unitPrice;
+		this.unitsInStock = unitsInStock;
+		this.unmappedField = unmappedField;
+	}
+
+	private static ProductAnnotationOnlyWithForeignKey create(int productId, String productName, String category,
+			double unitPrice, int unitsInStock, String unmappedField) {
+		return new ProductAnnotationOnlyWithForeignKey(productId, productName, category, unitPrice, unitsInStock,
+				unmappedField);
+	}
+
+	public static List<ProductAnnotationOnlyWithForeignKey> getList() {
+		String unmappedField = "unmapped";
+		ProductAnnotationOnlyWithForeignKey[] list = { create(1, "Chai", "Beverages", 18, 39, unmappedField),
+				create(2, "Chang", "Beverages", 19.0, 17, unmappedField),
+				create(3, "Aniseed Syrup", "Condiments", 10.0, 13, unmappedField),
+				create(4, "Chef Anton's Cajun Seasoning", "Condiments", 22.0, 53, unmappedField),
+				create(5, "Chef Anton's Gumbo Mix", "Condiments", 21.3500, 0, unmappedField),
+				create(6, "Grandma's Boysenberry Spread", "Condiments", 25.0, 120, unmappedField),
+				create(7, "Uncle Bob's Organic Dried Pears", "Produce", 30.0, 15, unmappedField),
+				create(8, "Northwoods Cranberry Sauce", "Condiments", 40.0, 6, unmappedField),
+				create(9, "Mishi Kobe Niku", "Meat/Poultry", 97.0, 29, unmappedField),
+				create(10, "Ikura", "Seafood", 31.0, 31, unmappedField), };
+		return Arrays.asList(list);
+	}
+
+	public String toString() {
+		return productName + ": " + unitsInStock;
+	}
+
+}