From c51ed4d5df0a8fd6fd54f078e48daf1be8ca20eb Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 2 Jan 2013 17:31:03 +0100 Subject: [PATCH] [#2056] Add Field.[not]Between[Symmetric](Select>) methods to allow for specifying subselects as arguments to the BETWEEN predicate - Added fix for SQLite --- jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend | 4 ++-- jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend b/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend index dbeba28b66..d9458cee14 100644 --- a/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend +++ b/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend @@ -253,7 +253,7 @@ class BetweenAndSteps extends Generators { RowN max = (RowN) maxValue; // These dialects don't support the SYMMETRIC keyword at all - if (symmetric && asList(ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, MYSQL, ORACLE, SQLSERVER, SQLITE, SYBASE).contains(configuration.getDialect())) { + if (symmetric && asList(ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, MYSQL, ORACLE, SQLITE, SQLSERVER, SYBASE).contains(configuration.getDialect())) { if (not) { return (QueryPartInternal) r.notBetween(min, max).and(r.notBetween(max, min)); } @@ -264,7 +264,7 @@ class BetweenAndSteps extends Generators { // These dialects either don't support row value expressions, or they // Can't handle row value expressions with the BETWEEN predicate - else if (row.getDegree() > 1 && asList(CUBRID, DERBY, FIREBIRD, ORACLE, SQLSERVER, SYBASE).contains(configuration.getDialect())) { + else if (row.getDegree() > 1 && asList(CUBRID, DERBY, FIREBIRD, ORACLE, SQLITE, SQLSERVER, SYBASE).contains(configuration.getDialect())) { Condition result = r.ge(min).and(r.le(max)); if (not) { diff --git a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java index 6a56e669cc..3609a58c36 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java @@ -690,7 +690,7 @@ implements RowN max = (RowN) maxValue; // These dialects don't support the SYMMETRIC keyword at all - if (symmetric && asList(ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, MYSQL, ORACLE, SQLSERVER, SQLITE, SYBASE).contains(configuration.getDialect())) { + if (symmetric && asList(ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, MYSQL, ORACLE, SQLITE, SQLSERVER, SYBASE).contains(configuration.getDialect())) { if (not) { return (QueryPartInternal) r.notBetween(min, max).and(r.notBetween(max, min)); } @@ -701,7 +701,7 @@ implements // These dialects either don't support row value expressions, or they // Can't handle row value expressions with the BETWEEN predicate - else if (row.getDegree() > 1 && asList(CUBRID, DERBY, FIREBIRD, ORACLE, SQLSERVER, SYBASE).contains(configuration.getDialect())) { + else if (row.getDegree() > 1 && asList(CUBRID, DERBY, FIREBIRD, ORACLE, SQLITE, SQLSERVER, SYBASE).contains(configuration.getDialect())) { Condition result = r.ge(min).and(r.le(max)); if (not) {