From 3bbd66ca7cb90109721a47b0bb6145f31a3d4340 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Tue, 29 May 2018 10:03:28 +0200 Subject: [PATCH] [#7358] Add support for SQL Data Warehouse --- jOOQ/src/main/java/org/jooq/SQLDialect.java | 2 ++ jOOQ/src/main/java/org/jooq/impl/AbstractContext.java | 1 + jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java | 4 ++++ jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java index ecc0b1246f..8496a156e7 100644 --- a/jOOQ/src/main/java/org/jooq/SQLDialect.java +++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java @@ -607,6 +607,7 @@ public enum SQLDialect { + case DERBY: return "Derby"; case H2: return "H2"; case HSQLDB: return "HSQL"; @@ -654,6 +655,7 @@ public enum SQLDialect { + case CUBRID: return "org.hibernate.dialect.CUBRIDDialect"; diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java index 44cd9c2045..f3b596fba2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java @@ -42,6 +42,7 @@ import static java.lang.Boolean.TRUE; // ... // ... // ... +// ... import static org.jooq.conf.ParamType.INDEXED; import static org.jooq.impl.Tools.EMPTY_CLAUSE; import static org.jooq.impl.Tools.EMPTY_QUERYPART; diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java index 8e4ca20de3..ed5fb3593a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java @@ -377,6 +377,10 @@ public abstract class AbstractRoutine extends AbstractNamed implements Routin + + + + return executeSelect(); // [#773] If JDBC escape syntax is available for functions, use diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java index b5c0e1cda2..8154788597 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java @@ -267,7 +267,7 @@ final class CreateIndexImpl extends AbstractQuery implements ctx.visit(generatedName()) .sql(' '); - boolean supportsInclude = false ; + boolean supportsInclude = false ; boolean supportsFieldsBeforeTable = false ; QueryPartList list = new QueryPartList();