diff --git a/src/java/com/samskivert/depot/impl/operator/BaseOperator.java b/src/java/com/samskivert/depot/impl/operator/BaseOperator.java index 7d0e066..99dbd31 100644 --- a/src/java/com/samskivert/depot/impl/operator/BaseOperator.java +++ b/src/java/com/samskivert/depot/impl/operator/BaseOperator.java @@ -16,7 +16,6 @@ import com.samskivert.depot.impl.expression.ArgumentExp; * A base class for all operators. */ public abstract class BaseOperator extends ArgumentExp - implements SQLOperator { public static Function INTEGRAL = new Function() { public Long apply (Object o) { diff --git a/src/java/com/samskivert/depot/impl/operator/Exists.java b/src/java/com/samskivert/depot/impl/operator/Exists.java index bc67193..5235a71 100644 --- a/src/java/com/samskivert/depot/impl/operator/Exists.java +++ b/src/java/com/samskivert/depot/impl/operator/Exists.java @@ -24,13 +24,14 @@ import java.util.Collection; import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.clause.SelectClause; +import com.samskivert.depot.expression.SQLExpression; import com.samskivert.depot.impl.ExpressionVisitor; /** * The SQL 'exists' operator. */ public class Exists - implements SQLOperator + implements SQLExpression { public Exists (SelectClause clause) { diff --git a/src/java/com/samskivert/depot/impl/operator/In.java b/src/java/com/samskivert/depot/impl/operator/In.java index 10a7b35..3148352 100644 --- a/src/java/com/samskivert/depot/impl/operator/In.java +++ b/src/java/com/samskivert/depot/impl/operator/In.java @@ -24,13 +24,14 @@ import java.util.Collection; import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.expression.ColumnExp; +import com.samskivert.depot.expression.SQLExpression; import com.samskivert.depot.impl.ExpressionVisitor; /** * The SQL 'in (...)' operator. */ public class In - implements SQLOperator + implements SQLExpression { /** The maximum number of keys allowed in an IN() clause. */ public static final int MAX_KEYS = Short.MAX_VALUE; diff --git a/src/java/com/samskivert/depot/impl/operator/IsNull.java b/src/java/com/samskivert/depot/impl/operator/IsNull.java index 7f3d937..0358ec5 100644 --- a/src/java/com/samskivert/depot/impl/operator/IsNull.java +++ b/src/java/com/samskivert/depot/impl/operator/IsNull.java @@ -24,13 +24,14 @@ import java.util.Collection; import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.expression.ColumnExp; +import com.samskivert.depot.expression.SQLExpression; import com.samskivert.depot.impl.ExpressionVisitor; /** * The SQL 'is null' operator. */ public class IsNull - implements SQLOperator + implements SQLExpression { public IsNull (ColumnExp column) { diff --git a/src/java/com/samskivert/depot/impl/operator/Not.java b/src/java/com/samskivert/depot/impl/operator/Not.java index e7e7587..8c56ea7 100644 --- a/src/java/com/samskivert/depot/impl/operator/Not.java +++ b/src/java/com/samskivert/depot/impl/operator/Not.java @@ -30,7 +30,7 @@ import com.samskivert.depot.impl.ExpressionVisitor; * Represents the truth negation of another conditon. */ public class Not - implements SQLOperator + implements SQLExpression { public Not (SQLExpression condition) { diff --git a/src/java/com/samskivert/depot/impl/operator/SQLOperator.java b/src/java/com/samskivert/depot/impl/operator/SQLOperator.java deleted file mode 100644 index d8200ac..0000000 --- a/src/java/com/samskivert/depot/impl/operator/SQLOperator.java +++ /dev/null @@ -1,33 +0,0 @@ -// -// $Id$ -// -// Depot library - a Java relational persistence library -// Copyright (C) 2006-2008 Michael Bayne and Pär Winzell -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Lesser General Public License as published -// by the Free Software Foundation; either version 2.1 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -package com.samskivert.depot.impl.operator; - - -import com.samskivert.depot.expression.SQLExpression; - -/** - * A common interface for operator hierarchies in SQL. The main purpose of breaking this out from - * SQLExpression is to capture the recursive nature of e.g. the logical operators, which work on - * other SQLOperators but not general SQLExpressions. - */ -public interface SQLOperator extends SQLExpression -{ -} diff --git a/src/java/com/samskivert/depot/operator/Case.java b/src/java/com/samskivert/depot/operator/Case.java index d309296..a0a0c35 100644 --- a/src/java/com/samskivert/depot/operator/Case.java +++ b/src/java/com/samskivert/depot/operator/Case.java @@ -28,13 +28,13 @@ import com.google.common.collect.Lists; import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.expression.SQLExpression; import com.samskivert.depot.impl.ExpressionVisitor; -import com.samskivert.depot.impl.operator.SQLOperator; import com.samskivert.util.Tuple; /** * The SQL 'case' operator. */ -public class Case implements SQLOperator +public class Case + implements SQLExpression { public Case (SQLExpression... exps) { diff --git a/src/java/com/samskivert/depot/operator/FullText.java b/src/java/com/samskivert/depot/operator/FullText.java index 9a5bc3b..c9e8240 100644 --- a/src/java/com/samskivert/depot/operator/FullText.java +++ b/src/java/com/samskivert/depot/operator/FullText.java @@ -24,8 +24,8 @@ import java.util.Collection; import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.expression.FluentExp; +import com.samskivert.depot.expression.SQLExpression; import com.samskivert.depot.impl.ExpressionVisitor; -import com.samskivert.depot.impl.operator.SQLOperator; /** * An attempt at a dialect-agnostic full-text search condition, such as MySQL's MATCH() and @@ -34,7 +34,7 @@ import com.samskivert.depot.impl.operator.SQLOperator; public class FullText { public class Rank extends FluentExp - implements SQLOperator + implements SQLExpression { // from SQLExpression public Object accept (ExpressionVisitor builder) @@ -60,7 +60,7 @@ public class FullText } public class Match extends FluentExp - implements SQLOperator + implements SQLExpression { // from SQLExpression public Object accept (ExpressionVisitor builder)