From 6a95dba01e8c429879591d7c012979031817bc79 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sun, 19 Aug 2012 13:45:55 +0200
Subject: [PATCH] Extracted CHAR casting test to its own test case

---
 .../src/org/jooq/test/_/testcases/DataTypeTests.java | 12 ++++++++++++
 .../src/org/jooq/test/_/testcases/FunctionTests.java |  8 --------
 jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java    |  5 +++++
 jOOQ-test/src/org/jooq/test/jOOQFirebirdTest.java    |  3 ---
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
index 09e7e9d755..7477e9de22 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
@@ -54,6 +54,7 @@ import static org.jooq.impl.Factory.cast;
 import static org.jooq.impl.Factory.castNull;
 import static org.jooq.impl.Factory.dateAdd;
 import static org.jooq.impl.Factory.dateDiff;
+import static org.jooq.impl.Factory.field;
 import static org.jooq.impl.Factory.inline;
 import static org.jooq.impl.Factory.timestampAdd;
 import static org.jooq.impl.Factory.timestampDiff;
@@ -122,6 +123,17 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
         super(delegate);
     }
 
+    @Test
+    public void testCharCasts() throws Exception {
+
+        // [#1241] Casting to CHAR. Some dialects don't like that. They should
+        // be casting to VARCHAR instead
+        assertEquals("abc",
+        create().select(field("cast('abc' as char(3))", SQLDataType.CHAR))
+                .where(field("cast('abc' as char(3))", SQLDataType.CHAR).equal("abc"))
+                .fetchOne(0, String.class));
+    }
+
     @Test
     public void testBlobAndClob() throws Exception {
         jOOQAbstractTest.reset = false;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
index 2e0470377c..8a7930b35f 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
@@ -137,7 +137,6 @@ import org.jooq.SelectQuery;
 import org.jooq.Table;
 import org.jooq.TableRecord;
 import org.jooq.UpdatableRecord;
-import org.jooq.impl.SQLDataType;
 import org.jooq.test.BaseTest;
 import org.jooq.test.jOOQAbstractTest;
 
@@ -403,13 +402,6 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
     @Test
     public void testFunctionsOnStrings() throws Exception {
 
-        // [#1241] Casting to CHAR. Some dialects don't like that. They should
-        // be casting to VARCHAR instead
-        assertEquals("abc",
-        create().select(field("cast('abc' as char(3))", SQLDataType.CHAR))
-                .where(field("cast('abc' as char(3))", SQLDataType.CHAR).equal("abc"))
-                .fetchOne(0, String.class));
-
         // Trimming
         assertEquals("abc", create().select(trim("abc")).fetchOne(0));
         assertEquals("abc", create().select(trim("abc  ")).fetchOne(0));
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 46d8b9cc79..45c27418af 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -886,6 +886,11 @@ public abstract class jOOQAbstractTest<
         new DataTypeTests(this).testCastingToJavaClass();
     }
 
+    @Test
+    public void testCharCasts() throws Exception {
+        new DataTypeTests(this).testCharCasts();
+    }
+
     @Test
     public void testNestedCasting() throws Exception {
         new DataTypeTests(this).testNestedCasting();
diff --git a/jOOQ-test/src/org/jooq/test/jOOQFirebirdTest.java b/jOOQ-test/src/org/jooq/test/jOOQFirebirdTest.java
index 721da6d0a8..7035186bea 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQFirebirdTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQFirebirdTest.java
@@ -713,14 +713,11 @@ public class jOOQFirebirdTest extends jOOQAbstractTest<
             FirebirdDataType.INT,
             FirebirdDataType.INTEGER,
             FirebirdDataType.NUMERIC,
-            FirebirdDataType.OBJECT,
             FirebirdDataType.OTHER,
             FirebirdDataType.SMALLINT,
             FirebirdDataType.TIME,
             FirebirdDataType.TIMESTAMP,
-            FirebirdDataType.TINYINT,
             FirebirdDataType.VARCHAR,
-            FirebirdDataType.VARCHARIGNORECASE,
         };
     }
 }