From d20fe113a0975102b10b40795936c4f08d8576e7 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 5 Sep 2012 20:43:57 +0200
Subject: [PATCH] [#1800] Deprecate AliasProvider

---
 jOOQ/src/main/java/org/jooq/AliasProvider.java         |  3 +++
 jOOQ/src/main/java/org/jooq/Field.java                 |  1 +
 jOOQ/src/main/java/org/jooq/Table.java                 | 10 ++++++++++
 .../src/main/java/org/jooq/impl/AliasProviderImpl.java |  1 +
 4 files changed, 15 insertions(+)

diff --git a/jOOQ/src/main/java/org/jooq/AliasProvider.java b/jOOQ/src/main/java/org/jooq/AliasProvider.java
index 0aa5c6ddd0..7b050e58c6 100644
--- a/jOOQ/src/main/java/org/jooq/AliasProvider.java
+++ b/jOOQ/src/main/java/org/jooq/AliasProvider.java
@@ -41,7 +41,10 @@ package org.jooq;
  *
  * @param <Z> The self-binding alias provider subtype
  * @author Lukas Eder
+ * @deprecated - 2.6.0 [#1800] - This marker interface will be removed in future
+ *             versions of jOOQ
  */
+@Deprecated
 public interface AliasProvider<Z extends AliasProvider<Z>> extends QueryPart {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java
index 5ee2a4b216..be50cac9ae 100644
--- a/jOOQ/src/main/java/org/jooq/Field.java
+++ b/jOOQ/src/main/java/org/jooq/Field.java
@@ -65,6 +65,7 @@ import org.jooq.util.oracle.OracleFactory;
  * @param <T> The field type
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public interface Field<T> extends NamedTypeProviderQueryPart<T>, AliasProvider<Field<T>> {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java
index 3c489a73d5..df605bd432 100644
--- a/jOOQ/src/main/java/org/jooq/Table.java
+++ b/jOOQ/src/main/java/org/jooq/Table.java
@@ -76,6 +76,16 @@ public interface Table<R extends Record> extends org.jooq.Type<R>, AliasProvider
     @Override
     Class<? extends R> getRecordType();
 
+    /**
+     * Create an alias for this table
+     *
+     * @param alias The alias name
+     * @return The table alias
+     */
+    @Override
+    @Support
+    Table<R> as(String alias);
+
     /**
      * Retrieve the table's <code>IDENTITY</code> information, if available.
      * <p>
diff --git a/jOOQ/src/main/java/org/jooq/impl/AliasProviderImpl.java b/jOOQ/src/main/java/org/jooq/impl/AliasProviderImpl.java
index 56e1592075..cd08f534f7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AliasProviderImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AliasProviderImpl.java
@@ -50,6 +50,7 @@ import org.jooq.RenderContext;
 /**
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 class AliasProviderImpl<T extends AliasProvider<T>> extends AbstractNamedQueryPart implements AliasProvider<T> {
 
     private static final long serialVersionUID = -2456848365524191614L;