From 5c97482f4c2957e3a96df3a4f91d04773f2ba113 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 4 Jan 2013 14:44:26 +0100
Subject: [PATCH] [#1887] Remove all deprecated code

---
 .../test/_/testcases/RoutineAndUDTTests.java  | 19 ++++++++----
 jOOQ/src/main/java/org/jooq/StoreQuery.java   | 25 ----------------
 .../org/jooq/impl/AbstractStoreQuery.java     | 30 -------------------
 3 files changed, 13 insertions(+), 61 deletions(-)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
index ed8540ede5..e9590f2f7f 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
@@ -376,6 +376,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725,
     }
 
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void testARRAYType() throws Exception {
         if (TArrays() == null) {
@@ -414,9 +415,12 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725,
 
             InsertQuery<?> insert = create().insertQuery(TArrays());
             insert.addValue(TArrays_ID(), 5);
-            insert.addValueAsArray(TArrays_NUMBER_R(), 1, 2, 3);
-            insert.addValueAsArray(TArrays_STRING_R(), "a", "b", "c", "d\"\\d");
-            insert.addValueAsArray(TArrays_DATE_R(), new Date(0), new Date(84600 * 1000), new Date(84600 * 2000));
+            insert.addValue((Field) TArrays_NUMBER_R(),
+                on(TArrays_NUMBER_R().getType()).create(create(), new Integer[] { 1, 2, 3 }).get());
+            insert.addValue((Field) TArrays_STRING_R(),
+                on(TArrays_STRING_R().getType()).create(create(), new String[] { "a", "b", "c", "d\"\\d" }).get());
+            insert.addValue((Field) TArrays_DATE_R(),
+                on(TArrays_DATE_R().getType()).create(create(), new Date[] { new Date(0), new Date(84600 * 1000), new Date(84600 * 2000) }).get());
             insert.execute();
 
             Record array = create().select(
@@ -434,9 +438,12 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725,
 
 
             UpdateQuery<X> update = create().updateQuery(TArrays());
-            update.addValueAsArray(TArrays_NUMBER_R(), 3, 2, 1);
-            update.addValueAsArray(TArrays_STRING_R(), "d\"\\d", "c", "b", "a");
-            update.addValueAsArray(TArrays_DATE_R(), new Date(84600 * 2000), new Date(84600 * 1000), new Date(0));
+            update.addValue((Field) TArrays_NUMBER_R(),
+                on(TArrays_NUMBER_R().getType()).create(create(), new Integer[] { 3, 2, 1 }).get());
+            update.addValue((Field) TArrays_STRING_R(),
+                on(TArrays_STRING_R().getType()).create(create(), new String[] { "d\"\\d", "c", "b", "a" }).get());
+            update.addValue((Field) TArrays_DATE_R(),
+                on(TArrays_DATE_R().getType()).create(create(), new Date[] { new Date(84600 * 2000), new Date(84600 * 1000), new Date(0) }).get());
             update.addConditions(TArrays_ID().equal(5));
             update.execute();
 
diff --git a/jOOQ/src/main/java/org/jooq/StoreQuery.java b/jOOQ/src/main/java/org/jooq/StoreQuery.java
index 465e1e8aa6..e8b8f0354b 100644
--- a/jOOQ/src/main/java/org/jooq/StoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/StoreQuery.java
@@ -35,9 +35,6 @@
  */
 package org.jooq;
 
-import static org.jooq.SQLDialect.ORACLE;
-
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -86,26 +83,4 @@ public interface StoreQuery<R extends Record> extends Query {
     @Support
     void addValues(Map<? extends Field<?>, ?> map);
 
-    /**
-     * Add a value to the store statement
-     *
-     * @param <A> The field type
-     * @param <T> The array type
-     * @param field The field
-     * @param value The value
-     */
-    @Support(ORACLE)
-    <A extends ArrayRecord<T>, T> void addValueAsArray(Field<A> field, T... value);
-
-    /**
-     * Add a value to the store statement
-     *
-     * @param <A> The field type
-     * @param <T> The array type
-     * @param field The field
-     * @param value The value
-     */
-    @Support(ORACLE)
-    <A extends ArrayRecord<T>, T> void addValueAsArray(Field<A> field, List<T> value);
-
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
index 93bdc31dd2..e186a1fe4e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
@@ -37,11 +37,8 @@ package org.jooq.impl;
 
 import static org.jooq.impl.Factory.val;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 
-import org.jooq.ArrayRecord;
 import org.jooq.Configuration;
 import org.jooq.Field;
 import org.jooq.Record;
@@ -92,31 +89,4 @@ abstract class AbstractStoreQuery<R extends Record> extends AbstractQuery implem
             getValues().put(field, value);
         }
     }
-
-    @Override
-    public final <A extends ArrayRecord<T>, T> void addValueAsArray(Field<A> field, T... value) {
-        if (value == null) {
-            getValues().put(field, val(null, field));
-        }
-        else {
-            addValueAsArray(field, Arrays.asList(value));
-        }
-    }
-
-    @Override
-    public final <A extends ArrayRecord<T>, T> void addValueAsArray(Field<A> field, List<T> value) {
-        if (value == null) {
-            getValues().put(field, val(null, field));
-        }
-        else {
-            try {
-                A record = Utils.newArrayRecord(field.getType(), getConfiguration());
-                record.setList(value);
-                addValue(field, record);
-            }
-            catch (Exception e) {
-                throw new IllegalArgumentException("Field is not a valid ArrayRecord field: " + field);
-            }
-        }
-    }
 }