Merge branch 'master' of git@github.com:jOOQ/jOOQ.git

Conflicts: jOOQ/src/main/java/org/jooq/Clause.java
2013-08-08 17:54:10 +02:00 · 2013-08-08 17:54:10 +02:00 · 4a279450d5
commit 4a279450d5
parent 7d7083ada0 a79b7bfeb0
1 changed files with 2 additions and 1 deletions
--- a/jOOQ/src/main/java/org/jooq/Clause.java
+++ b/jOOQ/src/main/java/org/jooq/Clause.java
@ -138,6 +138,7 @@ public enum Clause {
     */
    CONDITION_IS_NOT_NULL,

+
    // TODO: Should operators be distinguished?
    // - LIKE predicate
    // - Subselect predicates
@ -402,4 +403,4 @@ public enum Clause {

    TRUNCATE,
    TRUNCATE_TRUNCATE,
-}
+}