From 5bc560d4b030f94330d78a7ee205a87c0bd34d96 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Tue, 21 Apr 2015 17:26:49 +0200 Subject: [PATCH] [#4151] ... and Derby of course --- jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/TableList.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 6463f85983..b6a1d2951b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -472,7 +472,7 @@ class SelectQueryImpl extends AbstractResultQuery implement // [#4151] Some databases don't allow for qualifying column // names here. Copy also to TableList - boolean unqualified = asList(H2, HSQLDB).contains(context.family()); + boolean unqualified = asList(DERBY, H2, HSQLDB).contains(context.family()); boolean qualify = context.qualify(); if (unqualified) diff --git a/jOOQ/src/main/java/org/jooq/impl/TableList.java b/jOOQ/src/main/java/org/jooq/impl/TableList.java index fbc07a9f9f..ce2822fd35 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableList.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableList.java @@ -42,6 +42,7 @@ package org.jooq.impl; import static java.util.Arrays.asList; +import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; @@ -85,7 +86,7 @@ class TableList extends QueryPartList> { // [#4151] Some databases don't allow for qualifying column // names here. Copy also to SelectQueryImpl - boolean unqualified = asList(H2, HSQLDB).contains(ctx.family()); + boolean unqualified = asList(DERBY, H2, HSQLDB).contains(ctx.family()); boolean qualify = ctx.qualify(); if (unqualified)