From eedd7271cd660855b869ef8fea7bae905eb78d92 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 14 Feb 2022 12:26:48 +0100 Subject: [PATCH] [jOOQ/jOOQ#13068] Change selectFrom(Table) methods to selectFrom(TableLike) --- jOOQ/src/main/java/org/jooq/DSLContext.java | 12 ++++++------ jOOQ/src/main/java/org/jooq/WithStep.java | 12 ++++++------ jOOQ/src/main/java/org/jooq/impl/DSL.java | 12 ++++++------ .../main/java/org/jooq/impl/DefaultDSLContext.java | 2 +- jOOQ/src/main/java/org/jooq/impl/WithImpl.java | 3 ++- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index a21289373e..3c9caf4a66 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -6058,13 +6058,13 @@ public interface DSLContext extends Scope { */ @NotNull @CheckReturnValue @Support - SelectWhereStep selectFrom(Table table); + SelectWhereStep selectFrom(TableLike table); /** * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Example: *

@@ -6082,7 +6082,7 @@ public interface DSLContext extends Scope { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Example: *

@@ -6107,7 +6107,7 @@ public interface DSLContext extends Scope { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Example: *

@@ -6133,7 +6133,7 @@ public interface DSLContext extends Scope { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Example: *

@@ -6159,7 +6159,7 @@ public interface DSLContext extends Scope { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Example: *

diff --git a/jOOQ/src/main/java/org/jooq/WithStep.java b/jOOQ/src/main/java/org/jooq/WithStep.java index aa75b50e48..35a262c671 100644 --- a/jOOQ/src/main/java/org/jooq/WithStep.java +++ b/jOOQ/src/main/java/org/jooq/WithStep.java @@ -530,13 +530,13 @@ public interface WithStep extends QueryPart { */ @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB }) - SelectWhereStep selectFrom(Table table); + SelectWhereStep selectFrom(TableLike table); /** * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Example: *

@@ -554,7 +554,7 @@ public interface WithStep extends QueryPart { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Example: *

@@ -579,7 +579,7 @@ public interface WithStep extends QueryPart { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Example: *

@@ -605,7 +605,7 @@ public interface WithStep extends QueryPart { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Example: *

@@ -631,7 +631,7 @@ public interface WithStep extends QueryPart { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Example: *

diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index f68ef811df..13d4cbb7ca 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -3002,7 +3002,7 @@ public class DSL { */ @NotNull @Support - public static SelectWhereStep selectFrom(Table table) { + public static SelectWhereStep selectFrom(TableLike table) { return dsl().selectFrom(table); } @@ -3010,7 +3010,7 @@ public class DSL { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Unlike {@link Select} factory methods in the {@link DSLContext} API, this * creates an unattached, and thus not directly renderable or executable @@ -3038,7 +3038,7 @@ public class DSL { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Unlike {@link Select} factory methods in the {@link DSLContext} API, this * creates an unattached, and thus not directly renderable or executable @@ -3073,7 +3073,7 @@ public class DSL { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Unlike {@link Select} factory methods in the {@link DSLContext} API, this * creates an unattached, and thus not directly renderable or executable @@ -3109,7 +3109,7 @@ public class DSL { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Unlike {@link Select} factory methods in the {@link DSLContext} API, this * creates an unattached, and thus not directly renderable or executable @@ -3145,7 +3145,7 @@ public class DSL { * Create a new DSL select statement, projecting *. *

* Without knowing any columns from the argument table (see - * {@link #selectFrom(Table)}), this will project SELECT *. + * {@link #selectFrom(TableLike)}), this will project SELECT *. *

* Unlike {@link Select} factory methods in the {@link DSLContext} API, this * creates an unattached, and thus not directly renderable or executable diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 0eefd360d0..2e96bdb19a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -2029,7 +2029,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri } @Override - public SelectWhereStep selectFrom(Table table) { + public SelectWhereStep selectFrom(TableLike table) { return new SelectImpl(configuration(), null).from(table); } diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java index b36f5fb555..cb84fb0385 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java @@ -105,6 +105,7 @@ import org.jooq.SelectFieldOrAsterisk; import org.jooq.SelectSelectStep; import org.jooq.SelectWhereStep; import org.jooq.Table; +import org.jooq.TableLike; // ... import org.jooq.WithAsStep; import org.jooq.WithAsStep1; @@ -586,7 +587,7 @@ implements } @Override - public final SelectWhereStep selectFrom(Table table) { + public final SelectWhereStep selectFrom(TableLike table) { return new SelectImpl(configuration, this).from(table); }