From 528c13a6aeeade512cd7e4a19d4e91de000d2974 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 9 Feb 2015 18:08:17 +0100
Subject: [PATCH] [#4047] Add DSL.deleteFrom() alias for DSL.delete()

---
 jOOQ/src/main/java/org/jooq/DSLContext.java      | 10 +++++++++-
 jOOQ/src/main/java/org/jooq/impl/DSL.java        | 16 +++++++++++++---
 .../java/org/jooq/impl/DefaultDSLContext.java    |  5 +++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 186cd353c9..eea4a99021 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -4536,7 +4536,7 @@ public interface DSLContext extends Scope {
      * Example: <code><pre>
      * DSLContext create = DSL.using(configuration);
      *
-     * create.delete(table)
+     * create.deleteFrom(table)
      *       .where(field1.greaterThan(100))
      *       .execute();
      * </pre></code>
@@ -4544,6 +4544,14 @@ public interface DSLContext extends Scope {
      * Some but not all databases support aliased tables in delete statements.
      */
     @Support
+    <R extends Record> DeleteWhereStep<R> deleteFrom(Table<R> table);
+
+    /**
+     * Create a new DSL delete statement.
+     * <p>
+     * This is an alias for {@link #deleteFrom(Table)}
+     */
+    @Support
     <R extends Record> DeleteWhereStep<R> delete(Table<R> table);
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 6d7666f736..617c5c31b4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -4209,17 +4209,27 @@ public class DSL {
      *
      * // [...]
      *
-     * delete(table)
+     * deleteFrom(table)
      *   .where(field1.greaterThan(100))
      * </pre></code>
      * <p>
      * Some but not all databases support aliased tables in delete statements.
      *
-     * @see DSLContext#delete(Table)
+     * @see DSLContext#deleteFrom(Table)
+     */
+    @Support
+    public static <R extends Record> DeleteWhereStep<R> deleteFrom(Table<R> table) {
+        return using(new DefaultConfiguration()).deleteFrom(table);
+    }
+
+    /**
+     * Create a new DSL delete statement.
+     * <p>
+     * This is an alias for {@link #deleteFrom(Table)}
      */
     @Support
     public static <R extends Record> DeleteWhereStep<R> delete(Table<R> table) {
-        return using(new DefaultConfiguration()).delete(table);
+        return using(new DefaultConfiguration()).deleteFrom(table);
     }
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index 54aceff591..83168cec14 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -1496,6 +1496,11 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
 
     @Override
     public <R extends Record> DeleteWhereStep<R> delete(Table<R> table) {
+        return deleteFrom(table);
+    }
+
+    @Override
+    public <R extends Record> DeleteWhereStep<R> deleteFrom(Table<R> table) {
         return new DeleteImpl<R>(configuration(), table);
     }