From 8ab95ec10e75d7904e12f117d4ac335fa72ee179 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Tue, 25 Nov 2008 20:53:33 +0000
Subject: [PATCH] Unconcretification of QueryClause. I concreted it a while
 back when it did something and then those needs went away and now it's just a
 marker that differentiates arbitrary SQLExpression instances from those that
 represent clauses of a query.

---
 src/java/com/samskivert/depot/clause/DeleteClause.java    | 2 +-
 src/java/com/samskivert/depot/clause/FieldDefinition.java | 2 +-
 src/java/com/samskivert/depot/clause/ForUpdate.java       | 2 +-
 src/java/com/samskivert/depot/clause/FromOverride.java    | 2 +-
 src/java/com/samskivert/depot/clause/GroupBy.java         | 2 +-
 src/java/com/samskivert/depot/clause/InsertClause.java    | 2 +-
 src/java/com/samskivert/depot/clause/Join.java            | 2 +-
 src/java/com/samskivert/depot/clause/Limit.java           | 2 +-
 src/java/com/samskivert/depot/clause/OrderBy.java         | 2 +-
 src/java/com/samskivert/depot/clause/QueryClause.java     | 2 +-
 src/java/com/samskivert/depot/clause/SelectClause.java    | 2 +-
 src/java/com/samskivert/depot/clause/UpdateClause.java    | 2 +-
 src/java/com/samskivert/depot/clause/WhereClause.java     | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/java/com/samskivert/depot/clause/DeleteClause.java b/src/java/com/samskivert/depot/clause/DeleteClause.java
index ab03dbb..dce3792 100644
--- a/src/java/com/samskivert/depot/clause/DeleteClause.java
+++ b/src/java/com/samskivert/depot/clause/DeleteClause.java
@@ -28,7 +28,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.
  */
-public class DeleteClause<T extends PersistentRecord> extends QueryClause
+public class DeleteClause<T extends PersistentRecord> implements QueryClause
 {
     public DeleteClause (Class<? extends PersistentRecord> pClass, WhereClause where)
     {
diff --git a/src/java/com/samskivert/depot/clause/FieldDefinition.java b/src/java/com/samskivert/depot/clause/FieldDefinition.java
index 360c8be..533a16f 100644
--- a/src/java/com/samskivert/depot/clause/FieldDefinition.java
+++ b/src/java/com/samskivert/depot/clause/FieldDefinition.java
@@ -37,7 +37,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
  *
  * @see FieldOverride
  */
-public class FieldDefinition extends QueryClause
+public class FieldDefinition implements QueryClause
 {
     public FieldDefinition (String field, String str)
     {
diff --git a/src/java/com/samskivert/depot/clause/ForUpdate.java b/src/java/com/samskivert/depot/clause/ForUpdate.java
index cb32e1f..de5c972 100644
--- a/src/java/com/samskivert/depot/clause/ForUpdate.java
+++ b/src/java/com/samskivert/depot/clause/ForUpdate.java
@@ -28,7 +28,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  *  Represents a FOR UPDATE clause.
  */
-public class ForUpdate extends QueryClause
+public class ForUpdate implements QueryClause
 {
     // from SQLExpression
     public void accept (ExpressionVisitor builder)
diff --git a/src/java/com/samskivert/depot/clause/FromOverride.java b/src/java/com/samskivert/depot/clause/FromOverride.java
index f66479c..9bb8d5c 100644
--- a/src/java/com/samskivert/depot/clause/FromOverride.java
+++ b/src/java/com/samskivert/depot/clause/FromOverride.java
@@ -32,7 +32,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  *  Completely overrides the FROM clause, if it exists.
  */
-public class FromOverride extends QueryClause
+public class FromOverride implements QueryClause
 {
     public FromOverride (Class<? extends PersistentRecord> fromClass)
     {
diff --git a/src/java/com/samskivert/depot/clause/GroupBy.java b/src/java/com/samskivert/depot/clause/GroupBy.java
index 4605afd..4eeaf6a 100644
--- a/src/java/com/samskivert/depot/clause/GroupBy.java
+++ b/src/java/com/samskivert/depot/clause/GroupBy.java
@@ -29,7 +29,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  *  Represents a GROUP BY clause.
  */
-public class GroupBy extends QueryClause
+public class GroupBy implements QueryClause
 {
     public GroupBy (SQLExpression... values)
     {
diff --git a/src/java/com/samskivert/depot/clause/InsertClause.java b/src/java/com/samskivert/depot/clause/InsertClause.java
index fe90124..532d1d8 100644
--- a/src/java/com/samskivert/depot/clause/InsertClause.java
+++ b/src/java/com/samskivert/depot/clause/InsertClause.java
@@ -29,7 +29,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.
  */
-public class InsertClause<T extends PersistentRecord> extends QueryClause
+public class InsertClause<T extends PersistentRecord> implements QueryClause
 {
     public InsertClause (
         Class<? extends PersistentRecord> pClass, Object pojo, Set<String> identityFields)
diff --git a/src/java/com/samskivert/depot/clause/Join.java b/src/java/com/samskivert/depot/clause/Join.java
index dc557d8..0e52969 100644
--- a/src/java/com/samskivert/depot/clause/Join.java
+++ b/src/java/com/samskivert/depot/clause/Join.java
@@ -32,7 +32,7 @@ import com.samskivert.depot.operator.Conditionals.Equals;
 /**
  *  Represents a JOIN.
  */
-public class Join extends QueryClause
+public class Join implements QueryClause
 {
     /** Indicates the join type to be used. The default is INNER. */
     public static enum Type { INNER, LEFT_OUTER, RIGHT_OUTER };
diff --git a/src/java/com/samskivert/depot/clause/Limit.java b/src/java/com/samskivert/depot/clause/Limit.java
index 4088326..8b10149 100644
--- a/src/java/com/samskivert/depot/clause/Limit.java
+++ b/src/java/com/samskivert/depot/clause/Limit.java
@@ -28,7 +28,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  *  Represents a LIMIT/OFFSET clause, for pagination.
  */
-public class Limit extends QueryClause
+public class Limit implements QueryClause
 {
     public Limit (int offset, int count)
     {
diff --git a/src/java/com/samskivert/depot/clause/OrderBy.java b/src/java/com/samskivert/depot/clause/OrderBy.java
index f52b0ba..1313b67 100644
--- a/src/java/com/samskivert/depot/clause/OrderBy.java
+++ b/src/java/com/samskivert/depot/clause/OrderBy.java
@@ -30,7 +30,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  *  Represents an ORDER BY clause.
  */
-public class OrderBy extends QueryClause
+public class OrderBy implements QueryClause
 {
     /** Indicates the order of the clause. */
     public enum Order { ASC, DESC };
diff --git a/src/java/com/samskivert/depot/clause/QueryClause.java b/src/java/com/samskivert/depot/clause/QueryClause.java
index 5f225c7..95cea46 100644
--- a/src/java/com/samskivert/depot/clause/QueryClause.java
+++ b/src/java/com/samskivert/depot/clause/QueryClause.java
@@ -25,6 +25,6 @@ import com.samskivert.depot.expression.SQLExpression;
 /**
  * Represents a piece or modifier of an SQL query.
  */
-public abstract class QueryClause implements SQLExpression
+public interface QueryClause extends SQLExpression
 {
 }
diff --git a/src/java/com/samskivert/depot/clause/SelectClause.java b/src/java/com/samskivert/depot/clause/SelectClause.java
index 3526825..ef88e3b 100644
--- a/src/java/com/samskivert/depot/clause/SelectClause.java
+++ b/src/java/com/samskivert/depot/clause/SelectClause.java
@@ -34,7 +34,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.
  */
-public class SelectClause<T extends PersistentRecord> extends QueryClause
+public class SelectClause<T extends PersistentRecord> implements QueryClause
 {
     /**
      * Creates a new Query object to generate one or more instances of the specified persistent
diff --git a/src/java/com/samskivert/depot/clause/UpdateClause.java b/src/java/com/samskivert/depot/clause/UpdateClause.java
index ae46f0a..e8be8a6 100644
--- a/src/java/com/samskivert/depot/clause/UpdateClause.java
+++ b/src/java/com/samskivert/depot/clause/UpdateClause.java
@@ -29,7 +29,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.
  */
-public class UpdateClause<T extends PersistentRecord> extends QueryClause
+public class UpdateClause<T extends PersistentRecord> implements QueryClause
 {
     public UpdateClause (Class<? extends PersistentRecord> pClass, WhereClause where,
                          String[] fields, T pojo)
diff --git a/src/java/com/samskivert/depot/clause/WhereClause.java b/src/java/com/samskivert/depot/clause/WhereClause.java
index bd97225..f66a004 100644
--- a/src/java/com/samskivert/depot/clause/WhereClause.java
+++ b/src/java/com/samskivert/depot/clause/WhereClause.java
@@ -25,7 +25,7 @@ import com.samskivert.depot.expression.SQLExpression;
 /**
  * Currently only exists as a type without any functionality of its own.
  */
-public abstract class WhereClause extends QueryClause
+public abstract class WhereClause implements QueryClause
 {
     /**
      * Returns the condition associated with this where clause.