From fc70742ee1ebf411bdca5f5233a532f8a15b566b Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 26 Oct 2012 20:48:52 +0200
Subject: [PATCH] [#1880] Let SelectQuery extend SimpleSelectQuery to avoid
 redundancy

---
 jOOQ/src/main/java/org/jooq/SelectQuery.java | 179 +------------------
 1 file changed, 1 insertion(+), 178 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/SelectQuery.java b/jOOQ/src/main/java/org/jooq/SelectQuery.java
index 188b9af278..5f44648864 100644
--- a/jOOQ/src/main/java/org/jooq/SelectQuery.java
+++ b/jOOQ/src/main/java/org/jooq/SelectQuery.java
@@ -36,20 +36,8 @@
 
 package org.jooq;
 
-import static org.jooq.SQLDialect.ASE;
 import static org.jooq.SQLDialect.CUBRID;
-import static org.jooq.SQLDialect.DB2;
-import static org.jooq.SQLDialect.DERBY;
-import static org.jooq.SQLDialect.FIREBIRD;
-import static org.jooq.SQLDialect.H2;
-import static org.jooq.SQLDialect.HSQLDB;
-import static org.jooq.SQLDialect.INGRES;
-import static org.jooq.SQLDialect.MYSQL;
 import static org.jooq.SQLDialect.ORACLE;
-import static org.jooq.SQLDialect.POSTGRES;
-import static org.jooq.SQLDialect.SQLITE;
-import static org.jooq.SQLDialect.SQLSERVER;
-import static org.jooq.SQLDialect.SYBASE;
 
 import java.util.Collection;
 
@@ -60,8 +48,7 @@ import org.jooq.exception.DataAccessException;
  *
  * @author Lukas Eder
  */
-@SuppressWarnings("deprecation")
-public interface SelectQuery extends Select<Record>, ConditionProvider, OrderProvider, LockProvider {
+public interface SelectQuery extends SimpleSelectQuery<Record> {
 
     /**
      * Add a list of select fields
@@ -295,168 +282,4 @@ public interface SelectQuery extends Select<Record>, ConditionProvider, OrderPro
     @Support({ CUBRID, ORACLE })
     void setConnectByStartWith(Condition condition);
 
-    // ------------------------------------------------------------------------
-    // Methods from ConditionProvider, OrderProvider, LockProvider
-    // ------------------------------------------------------------------------
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support
-    void addConditions(Condition... conditions);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support
-    void addConditions(Collection<Condition> conditions);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support
-    void addConditions(Operator operator, Condition... conditions);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support
-    void addConditions(Operator operator, Collection<Condition> conditions);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support
-    void addOrderBy(Field<?>... fields);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support
-    void addOrderBy(SortField<?>... fields);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support
-    void addOrderBy(Collection<SortField<?>> fields);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support
-    void addOrderBy(int... fieldIndexes);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ CUBRID, ORACLE })
-    void setOrderBySiblings(boolean orderBySiblings);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support
-    void addLimit(int numberOfRows);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, MYSQL, ORACLE, POSTGRES, SQLITE, SQLSERVER, SYBASE })
-    void addLimit(Param<Integer> numberOfRows);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLITE, SQLSERVER, SYBASE })
-    void addLimit(int offset, int numberOfRows);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, MYSQL, ORACLE, POSTGRES, SQLITE, SQLSERVER, SYBASE })
-    void addLimit(Param<Integer> offset, int numberOfRows);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, MYSQL, ORACLE, POSTGRES, SQLITE, SQLSERVER, SYBASE })
-    void addLimit(int offset, Param<Integer> numberOfRows);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, MYSQL, ORACLE, POSTGRES, SQLITE, SQLSERVER, SYBASE })
-    void addLimit(Param<Integer> offset, Param<Integer> numberOfRows);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
-    void setForUpdate(boolean forUpdate);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, ORACLE, SYBASE })
-    void setForUpdateOf(Field<?>... fields);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, ORACLE, SYBASE })
-    void setForUpdateOf(Collection<? extends Field<?>> fields);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, POSTGRES, ORACLE, SYBASE })
-    void setForUpdateOf(Table<?>... tables);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support(ORACLE)
-    void setForUpdateWait(int seconds);
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support(ORACLE)
-    void setForUpdateNoWait();
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support(ORACLE)
-    void setForUpdateSkipLocked();
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Support({ MYSQL, POSTGRES })
-    void setForShare(boolean forShare);
 }