From a2a8dc0412fe1fed7d8af290a800302467a1c38d Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 4 Aug 2014 17:55:36 +0200
Subject: [PATCH] [#561] More fixes

---
 .../java/org/jooq/impl/SelectQueryImpl.java   | 28 +++++++++++++++++--
 jOOQ/src/main/java/org/jooq/impl/Val.java     |  8 ++++--
 .../test/java/org/jooq/test/BasicTest.java    |  8 +++---
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 6836d5932e..22e801ee96 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -279,8 +279,10 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
                     xxxxxx
                 x
 
-                xx xxxxxx xxx xxx xx xxxxx xx xxxxxxx xxx xxxx xxxxxxx
+                xx xxxxxxxx xxx xxxx xx xxxxx xxxxxxx
                 xxxx xxxxxxxxx
+
+                xx xxxxxx xxx xxx xx xxxxx xx xxxxxxx xxx xxxx xxxxxxx
                 xxxx xxxxxxx x
 
                     xx xxxxxx xxx xxxxxxxx xxxxxxx xxxxxx xxx xxxxxxx xxxx xxxxxx
@@ -558,6 +560,21 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
         SQLDialect dialect = context.dialect();
         SQLDialect family = dialect.family();
 
+        /* [pro] xx
+
+        xx xxxxxxxx xxxxxxx xxxxx xxxx xx xxxxx xx xxxxxxxxxx xxxxxxxxxxx xxx xx xxx
+        xx xxxxxxxxx xxx xxxxxxxx xxxx x xxxxxxx xxxxxx xxxxx xxxx xx xxxxx xxx xxxxxxxxxx
+        xxxxxxx xxxxxxxxxxxxxxxxxx x xxxxxx xx xxxxxxxx xx xxxxxxxxxxxxxxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxx
+
+        xx xxxxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx
+                   xxxxxxxxxxxxxxxxxx
+                   xxxxxxxxxxxxxxxxxxxxxx xxx
+                   xxxxxxxxxxxxxxxxxxxx
+                   xxxxxxxxxxxxxxxxx
+
+        xx [/pro] */
+
         // SELECT clause
         // -------------
         context.start(SELECT_SELECT)
@@ -571,7 +588,7 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
 
         /* [pro] xx
         xx xxxxxxxx xxxxxxxx xxxx xx xxxxx xx xx xx xxxxxx xxxxxx xxxxxxxx
-        xx xxxxxxxx xx xxxxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxx x
+        xx xxxxxxx xx xxxxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxx x
             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx
         x
         xx [/pro] */
@@ -852,6 +869,13 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
         xx [/pro] */
 
         context.end(SELECT_ORDER_BY);
+
+        /* [pro] xx
+        xx xxxxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxxxxxxxxxxxxxx
+                   xxxxxxxxxxxxxxxx
+                   xxxxxxxxxx
+        xx [/pro] */
     }
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/Val.java b/jOOQ/src/main/java/org/jooq/impl/Val.java
index 411cdc7c18..97efbccf72 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Val.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Val.java
@@ -350,11 +350,15 @@ class Val<T> extends AbstractParam<T> {
             }
             else if (type == Boolean.class) {
 
-                // [#1153] Some dialects don't support boolean literals
-                // TRUE and FALSE
+                // [#1153] Some dialects don't support boolean literals TRUE and FALSE
                 if (asList(FIREBIRD, SQLITE).contains(family)) {
                     context.sql(((Boolean) val) ? "1" : "0");
                 }
+                /* [pro] xx
+                xxxx xx xxxxxxx xx xxxxxxxxx x
+                    xxxxxxxxxxxxxxxxxxxxxx xxxx x xxxxx x xxxxxxx
+                x
+                xx [/pro] */
                 else {
                     context.keyword(((Boolean) val).toString());
                 }
diff --git a/jOOQ/src/test/java/org/jooq/test/BasicTest.java b/jOOQ/src/test/java/org/jooq/test/BasicTest.java
index 1855474a4f..65dca09ed4 100644
--- a/jOOQ/src/test/java/org/jooq/test/BasicTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/BasicTest.java
@@ -597,8 +597,8 @@ public class BasicTest extends AbstractTest {
         assertEquals(val("8"), t8.field8());
 
         // Rendering
-        assertEquals("(?)", r_ref().render(t1));
-        assertEquals("(1)", r_refI().render(t1));
+        assertEquals("?", r_ref().render(t1));
+        assertEquals("1", r_refI().render(t1));
         assertEquals("(?, ?)", r_ref().render(t2));
         assertEquals("(1, '2')", r_refI().render(t2));
         assertEquals("(?, ?, ?)", r_ref().render(t3));
@@ -631,8 +631,8 @@ public class BasicTest extends AbstractTest {
 
     @Test
     public void testRowCompareConditions() throws Exception {
-        assertEquals("(?) = (?)", r_ref().render(row(1).eq(row(1))));
-        assertEquals("(1) = (1)", r_refI().render(row(1).eq(row(1))));
+        assertEquals("? = ?", r_ref().render(row(1).eq(row(1))));
+        assertEquals("1 = 1", r_refI().render(row(1).eq(row(1))));
         assertEquals("(?, ?) = (?, ?)", r_ref().render(row(1, "2").eq(row(1, "2"))));
         assertEquals("(1, '2') = (1, '2')", r_refI().render(row(1, "2").eq(row(1, "2"))));
         assertEquals("(?, ?, ?) = (?, ?, ?)", r_ref().render(row(1, "2", 3).eq(row(1, "2", 3))));