From 069261057aed57949f139bdcede4e4403bfdde04 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sun, 19 Aug 2012 13:51:03 +0200 Subject: [PATCH] [#430] Add support for the Firebird database - Fixed LTRIM() and RTRIM() --- jOOQ/src/main/java/org/jooq/impl/Factory.java | 6 +- jOOQ/src/main/java/org/jooq/impl/LTrim.java | 72 +++++++++++++++++++ jOOQ/src/main/java/org/jooq/impl/RTrim.java | 72 +++++++++++++++++++ 3 files changed, 147 insertions(+), 3 deletions(-) create mode 100644 jOOQ/src/main/java/org/jooq/impl/LTrim.java create mode 100644 jOOQ/src/main/java/org/jooq/impl/RTrim.java diff --git a/jOOQ/src/main/java/org/jooq/impl/Factory.java b/jOOQ/src/main/java/org/jooq/impl/Factory.java index 480a22811c..65f48faadd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Factory.java +++ b/jOOQ/src/main/java/org/jooq/impl/Factory.java @@ -2651,7 +2651,7 @@ public class Factory implements FactoryOperations { */ @Support public static Field rtrim(Field field) { - return function("rtrim", SQLDataType.VARCHAR, nullSafe(field)); + return new RTrim(nullSafe(field)); } /** @@ -2671,8 +2671,8 @@ public class Factory implements FactoryOperations { * 
ltrim([field])
 */ @Support - public static Field ltrim(Field value) { - return function("ltrim", SQLDataType.VARCHAR, nullSafe(value)); + public static Field ltrim(Field field) { + return new LTrim(nullSafe(field)); } /** diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java new file mode 100644 index 0000000000..5b4ac449a0 --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java @@ -0,0 +1,72 @@ +/** + * Copyright (c) 2009-2012, Lukas Eder, lukas.eder@gmail.com + * All rights reserved. + * + * This software is licensed to you under the Apache License, Version 2.0 + * (the "License"); You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * . Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * . Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * . Neither the name "jOOQ" nor the names of its contributors may be + * used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package org.jooq.impl; + +import static org.jooq.impl.Factory.field; +import static org.jooq.impl.Factory.function; + +import org.jooq.Configuration; +import org.jooq.Field; + +/** + * @author Lukas Eder + */ +class LTrim extends AbstractFunction { + + /** + * Generated UID + */ + private static final long serialVersionUID = -7273879239726265322L; + + private final Field argument; + + LTrim(Field argument) { + super("ltrim", SQLDataType.VARCHAR, argument); + + this.argument = argument; + } + + @Override + final Field getFunction0(Configuration configuration) { + switch (configuration.getDialect()) { + case FIREBIRD: + return field("{trim}({leading} {from} {0})", SQLDataType.VARCHAR, argument); + + default: + return function("ltrim", SQLDataType.VARCHAR, argument); + } + } +} diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java new file mode 100644 index 0000000000..33dfb641d7 --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java @@ -0,0 +1,72 @@ +/** + * Copyright (c) 2009-2012, Lukas Eder, lukas.eder@gmail.com + * All rights reserved. + * + * This software is licensed to you under the Apache License, Version 2.0 + * (the "License"); You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * . Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * . Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * . Neither the name "jOOQ" nor the names of its contributors may be + * used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package org.jooq.impl; + +import static org.jooq.impl.Factory.field; +import static org.jooq.impl.Factory.function; + +import org.jooq.Configuration; +import org.jooq.Field; + +/** + * @author Lukas Eder + */ +class RTrim extends AbstractFunction { + + /** + * Generated UID + */ + private static final long serialVersionUID = -7273879239726265322L; + + private final Field argument; + + RTrim(Field argument) { + super("rtrim", SQLDataType.VARCHAR, argument); + + this.argument = argument; + } + + @Override + final Field getFunction0(Configuration configuration) { + switch (configuration.getDialect()) { + case FIREBIRD: + return field("{trim}({trailing} {from} {0})", SQLDataType.VARCHAR, argument); + + default: + return function("rtrim", SQLDataType.VARCHAR, argument); + } + } +}