From c3b81e6324a01e5b9ad958aef3f7d10fa16561f8 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 3 Feb 2020 09:28:26 +0100
Subject: [PATCH] [#9782] Revert bad OSS Edition change

---
 jOOQ/src/main/java/org/jooq/impl/Function.java        | 4 ++--
 jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java | 2 +-
 jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java   | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Values.java          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java
index d3a0ac3572..f980590776 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Function.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Function.java
@@ -53,7 +53,7 @@ import static org.jooq.SQLDialect.MYSQL;
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 import static org.jooq.SQLDialect.SQLITE;
-import static org.jooq.SQLDialect.SQLITE_3_30;
+// ...
 // ...
 import static org.jooq.impl.DSL.choose;
 import static org.jooq.impl.DSL.condition;
@@ -156,7 +156,7 @@ class Function<T> extends AbstractField<T> implements
     private static final Set<SQLDialect>   SUPPORT_GROUP_CONCAT               = SQLDialect.supportedBy(CUBRID, H2, HSQLDB, MARIADB, MYSQL, SQLITE);
     private static final Set<SQLDialect>   SUPPORT_STRING_AGG                 = SQLDialect.supportedBy(POSTGRES);
     private static final Set<SQLDialect>   SUPPORT_NO_PARENS_WINDOW_REFERENCE = SQLDialect.supportedBy(MYSQL, POSTGRES);
-    private static final Set<SQLDialect>   SUPPORT_FILTER                     = SQLDialect.supportedBy(H2, HSQLDB, POSTGRES, SQLITE_3_30);
+    private static final Set<SQLDialect>   SUPPORT_FILTER                     = SQLDialect.supportedBy(H2, HSQLDB, POSTGRES, SQLITE);
     private static final Set<SQLDialect>   SUPPORT_DISTINCT_RVE               = SQLDialect.supportedBy(H2, POSTGRES);
 
     static final Field<Integer>            ASTERISK                           = DSL.field("*", Integer.class);
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 39a99baecd..6811888e54 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -215,7 +215,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
     private static final Set<SQLDialect> NO_SUPPORT_FOR_UPDATE_QUALIFIED = SQLDialect.supportedBy(DERBY, FIREBIRD, H2, HSQLDB);
     private static final Set<SQLDialect> SUPPORT_SELECT_INTO_TABLE       = SQLDialect.supportedBy(HSQLDB, POSTGRES);
     static final Set<SQLDialect>         SUPPORT_WINDOW_CLAUSE           = SQLDialect.supportedBy(H2 /* -- See [#8279] */, MYSQL, POSTGRES /*, SQLITE -- See [#8279] [#8548] */);
-    private static final Set<SQLDialect> REQUIRES_FROM_CLAUSE            = SQLDialect.supportedUntil(AURORA_MYSQL, ACCESS, CUBRID, DB2, DERBY, FIREBIRD, HSQLDB, INFORMIX, INGRES, MARIADB_10_3, MEMSQL, MYSQL_5_7, HANA, ORACLE, TERADATA, SYBASE);
+    private static final Set<SQLDialect> REQUIRES_FROM_CLAUSE            = SQLDialect.supportedUntil(CUBRID, DERBY, FIREBIRD, HSQLDB);
     private static final Set<SQLDialect> REQUIRES_DERIVED_TABLE_DML      = SQLDialect.supportedBy(MARIADB, MYSQL);
     private static final Set<SQLDialect> EMULATE_EMPTY_GROUP_BY_OTHER    = SQLDialect.supportedBy(FIREBIRD, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE);
     private static final Set<SQLDialect> SUPPORT_FULL_WITH_TIES          = SQLDialect.supportedBy(H2);
diff --git a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
index 1b42b581ec..8a3e6b5529 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
@@ -75,7 +75,7 @@ final class SortFieldImpl<T> extends AbstractQueryPart implements SortField<T> {
     private static final long            serialVersionUID = 1223739398544155873L;
 
     // DB2 supports NULLS FIRST/LAST only in OLAP (window) functions
-    private static final Set<SQLDialect> NO_SUPPORT_NULLS = SQLDialect.supportedUntil(ACCESS, ASE, AURORA_MYSQL, COCKROACHDB, CUBRID, DB2, INGRES, MARIADB, MEMSQL, MYSQL, REDSHIFT, SQLDATAWAREHOUSE, SQLITE_3_28, SQLSERVER, SYBASE, VERTICA);
+    private static final Set<SQLDialect> NO_SUPPORT_NULLS = SQLDialect.supportedUntil(CUBRID, MARIADB, MYSQL);
 
     private final Field<T>               field;
     private final SortOrder              order;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Values.java b/jOOQ/src/main/java/org/jooq/impl/Values.java
index 785b66bf12..96d599fb8d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Values.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Values.java
@@ -83,7 +83,7 @@ final class Values<R extends Record> extends AbstractTable<R> {
      * Generated UID
      */
     private static final long            serialVersionUID  = -637982217747670311L;
-    private static final Set<SQLDialect> NO_SUPPORT_VALUES = SQLDialect.supportedUntil(ACCESS, ASE, AURORA_MYSQL, FIREBIRD, HANA, INGRES, MARIADB, MEMSQL, MYSQL_8_0, ORACLE, REDSHIFT, SQLDATAWAREHOUSE, SYBASE, TERADATA, VERTICA);
+    private static final Set<SQLDialect> NO_SUPPORT_VALUES = SQLDialect.supportedUntil(FIREBIRD, MARIADB);
 
     private final Row[]                  rows;