diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
index ba2b48ce2b..2d8265ce7e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.inline;
 import static org.jooq.impl.DSL.name;
-import static org.jooq.impl.DSL.queryPart;
+import static org.jooq.impl.DSL.sql;
 
 import org.jooq.AlterTableAlterStep;
 import org.jooq.AlterTableDropStep;
@@ -326,7 +326,7 @@ class AlterTableImpl extends AbstractQuery implements
         xx xxxxxxx xxxxx xxxxxxxxxxx xxxx xxx xxxxxx xx x xxxxxxxxxxx xxxx xxx xxx xxxxxx
         xx               xxxxxxxxxx xxxxxxxxx xx xxxx xx
 
-        xxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxx
                 xxxxxxxx xxxxxxxxxxx xxxxxxxxxxxxxxx
             x xxxxxxxxxx xxxxxxxx xxxxxxxxxxxxxxx
             x xxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 754fb1de93..396513fc64 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -5593,7 +5593,9 @@ public class DSL {
      *
      * @param sql The SQL
      * @return A query part wrapping the plain SQL
+     * @deprecated - 3.6.0 - [#3854] - Use {@link #sql(String)} instead
      */
+    @Deprecated
     @Support
     public static QueryPart queryPart(String sql) {
         return sql(sql);
@@ -5616,7 +5618,9 @@ public class DSL {
      * @param parts The {@link QueryPart} objects that are rendered at the
      *            {numbered placeholder} locations
      * @return A query part wrapping the plain SQL
+     * @deprecated - 3.6.0 - [#3854] - Use {@link #sql(String, QueryPart...)} instead
      */
+    @Deprecated
     @Support
     public static QueryPart queryPart(String sql, QueryPart... parts) {
         return sql(sql, parts);
@@ -5637,7 +5641,9 @@ public class DSL {
      *
      * @param sql The SQL
      * @return A query part wrapping the plain SQL
+     * @deprecated - 3.6.0 - [#3854] - Use {@link #sql(String, Object...)} instead
      */
+    @Deprecated
     @Support
     public static QueryPart queryPart(String sql, Object... bindings) {
         return sql(sql, bindings);
@@ -12570,7 +12576,6 @@ public class DSL {
      * @param type The Java type
      * @return The <code>DSL</code>'s underlying default data type.
      */
-    @SuppressWarnings("deprecation")
     @Support
     public static <T> DataType<T> getDataType(Class<T> type) {
         return DefaultDataType.getDataType(SQLDialect.DEFAULT, type);
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
index 80189b9e49..c00200f6d5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
@@ -87,7 +87,7 @@ import org.jooq.types.UShort;
  *
  * @author Lukas Eder
  */
-@SuppressWarnings({"unchecked", "deprecation"})
+@SuppressWarnings({"unchecked"})
 public class DefaultDataType<T> implements DataType<T> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBCUtils.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBCUtils.java
index ff9742796b..aad0ce1011 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBCUtils.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBCUtils.java
@@ -117,7 +117,6 @@ public class JDBCUtils {
     /**
      * "Guess" the {@link SQLDialect} from a connection URL.
      */
-    @SuppressWarnings("deprecation")
     public static final SQLDialect dialect(String url) {
 
         // The below list might not be accurate or complete. Feel free to