diff --git a/src/adql/translator/JDBCTranslator.java b/src/adql/translator/JDBCTranslator.java index aecda78f27ccd25a24b4ec472d1f2b67e711971d..274be1e700379d876263fe78cc04877371b68465 100644 --- a/src/adql/translator/JDBCTranslator.java +++ b/src/adql/translator/JDBCTranslator.java @@ -162,7 +162,7 @@ import adql.query.operand.function.geometry.RegionFunction; * </p> * * @author Grégory Mantelet (ARI) - * @version 2.0 (08/2014) + * @version 2.0 (09/2014) * @since 2.0 * * @see PostgreSQLTranslator @@ -688,7 +688,7 @@ public abstract class JDBCTranslator implements ADQLTranslator { @Override public String translate(Between comp) throws TranslationException{ - return translate(comp.getLeftOperand()) + " BETWEEN " + translate(comp.getMinOperand()) + " AND " + translate(comp.getMaxOperand()); + return translate(comp.getLeftOperand()) + " " + comp.getName() + " " + translate(comp.getMinOperand()) + " AND " + translate(comp.getMaxOperand()); } @Override @@ -703,7 +703,7 @@ public abstract class JDBCTranslator implements ADQLTranslator { @Override public String translate(IsNull isNull) throws TranslationException{ - return translate(isNull.getColumn()) + " IS " + (isNull.isNotNull() ? "NOT " : "") + "NULL"; + return translate(isNull.getColumn()) + " " + isNull.getName(); } @Override