From 9fb8f8874f461b56316a8b3a9a950ccbeffa2255 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 22 Jul 2014 15:44:58 +0200
Subject: [PATCH] [#3437] QualifiedField does not respect
 RenderContext.qualify()

---
 .../jooq/test/all/testcases/PlainSQLTests.java | 15 +++++++++++++++
 .../java/org/jooq/test/jOOQAbstractTest.java   |  5 +++++
 .../java/org/jooq/impl/QualifiedField.java     | 18 +++++++++++++-----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/PlainSQLTests.java b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/PlainSQLTests.java
index eb9ac964ba..201df11368 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/PlainSQLTests.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/PlainSQLTests.java
@@ -272,6 +272,21 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         assertEquals(Integer.valueOf(1), books.getValue(1, TBook_AUTHOR_ID()));
     }
 
+    public void testPlainSQLInsert() throws Exception {
+        jOOQAbstractTest.reset = false;
+
+        assertEquals(1, create()
+            .insertInto(
+                tableByName(TAuthor().getName()),
+                fieldByName(TAuthor().getName(), TAuthor_ID().getName()),
+                fieldByName(TAuthor().getName(), TAuthor_LAST_NAME().getName()))
+            .values(3, "X")
+            .execute()
+        );
+
+        assertEquals(3, create().fetchCount(TAuthor()));
+    }
+
     public void testPlainSQLWithSelfJoins()  throws Exception {
 
         // [#1860] In case of ambiguous field names in plain SQL, access by
diff --git a/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java
index 802172dae2..96b3673309 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java
@@ -1404,6 +1404,11 @@ public abstract class jOOQAbstractTest<
         new PlainSQLTests(this).testPlainSQL();
     }
 
+    @Test
+    public void testPlainSQLInsert() throws Exception {
+        new PlainSQLTests(this).testPlainSQLInsert();
+    }
+
     @Test
     public void testPlainSQLWithSelfJoins() throws Exception {
         new PlainSQLTests(this).testPlainSQLWithSelfJoins();
diff --git a/jOOQ/src/main/java/org/jooq/impl/QualifiedField.java b/jOOQ/src/main/java/org/jooq/impl/QualifiedField.java
index 9590f6eff2..b60dd22a01 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QualifiedField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QualifiedField.java
@@ -72,12 +72,20 @@ class QualifiedField<T> extends AbstractField<T> {
 
     @Override
     public final void accept(Context<?> ctx) {
-        String separator = "";
-        for (String string : sql) {
-            ctx.sql(separator);
-            ctx.literal(string);
 
-            separator = ".";
+        // [#3437] Fully qualify this field only if allowed in the current context
+        if (ctx.qualify()) {
+            String separator = "";
+
+            for (String string : sql) {
+                ctx.sql(separator);
+                ctx.literal(string);
+
+                separator = ".";
+            }
+        }
+        else {
+            ctx.literal(sql[sql.length - 1]);
         }
     }
 }