diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 0b22b6c584..f6ed6d51fa 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -61,6 +61,7 @@ import static org.jooq.SQLDialect.SQLITE; // ... // ... // ... +// ... import java.math.BigInteger; import java.sql.Connection; diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java index 15afaab9d1..556fa727ae 100644 --- a/jOOQ/src/main/java/org/jooq/Field.java +++ b/jOOQ/src/main/java/org/jooq/Field.java @@ -60,6 +60,7 @@ import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.SQLITE; // ... // ... +// ... import java.math.BigDecimal; import java.util.Collection; diff --git a/jOOQ/src/main/java/org/jooq/Name.java b/jOOQ/src/main/java/org/jooq/Name.java index 0b0b4c410a..2b27656df1 100644 --- a/jOOQ/src/main/java/org/jooq/Name.java +++ b/jOOQ/src/main/java/org/jooq/Name.java @@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import javax.annotation.Generated; diff --git a/jOOQ/src/main/java/org/jooq/Row1.java b/jOOQ/src/main/java/org/jooq/Row1.java index 6a3c0bc787..9634a6375b 100644 --- a/jOOQ/src/main/java/org/jooq/Row1.java +++ b/jOOQ/src/main/java/org/jooq/Row1.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row10.java b/jOOQ/src/main/java/org/jooq/Row10.java index f8a08970ce..fdebe645d9 100644 --- a/jOOQ/src/main/java/org/jooq/Row10.java +++ b/jOOQ/src/main/java/org/jooq/Row10.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row11.java b/jOOQ/src/main/java/org/jooq/Row11.java index 489123bf33..ce993011d5 100644 --- a/jOOQ/src/main/java/org/jooq/Row11.java +++ b/jOOQ/src/main/java/org/jooq/Row11.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row12.java b/jOOQ/src/main/java/org/jooq/Row12.java index 48e6ce83db..213769e506 100644 --- a/jOOQ/src/main/java/org/jooq/Row12.java +++ b/jOOQ/src/main/java/org/jooq/Row12.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row13.java b/jOOQ/src/main/java/org/jooq/Row13.java index 63bb831e5a..422f5e0941 100644 --- a/jOOQ/src/main/java/org/jooq/Row13.java +++ b/jOOQ/src/main/java/org/jooq/Row13.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row14.java b/jOOQ/src/main/java/org/jooq/Row14.java index beb97973e0..8b4908cf1b 100644 --- a/jOOQ/src/main/java/org/jooq/Row14.java +++ b/jOOQ/src/main/java/org/jooq/Row14.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row15.java b/jOOQ/src/main/java/org/jooq/Row15.java index 89b9b72a67..0f30d19b1a 100644 --- a/jOOQ/src/main/java/org/jooq/Row15.java +++ b/jOOQ/src/main/java/org/jooq/Row15.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row16.java b/jOOQ/src/main/java/org/jooq/Row16.java index 8313a335b4..b4d5bedc24 100644 --- a/jOOQ/src/main/java/org/jooq/Row16.java +++ b/jOOQ/src/main/java/org/jooq/Row16.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row17.java b/jOOQ/src/main/java/org/jooq/Row17.java index a38f8dfa06..79a9363105 100644 --- a/jOOQ/src/main/java/org/jooq/Row17.java +++ b/jOOQ/src/main/java/org/jooq/Row17.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row18.java b/jOOQ/src/main/java/org/jooq/Row18.java index 001816c20c..a9c63f5006 100644 --- a/jOOQ/src/main/java/org/jooq/Row18.java +++ b/jOOQ/src/main/java/org/jooq/Row18.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row19.java b/jOOQ/src/main/java/org/jooq/Row19.java index 395f6bd4da..dd2b27c17a 100644 --- a/jOOQ/src/main/java/org/jooq/Row19.java +++ b/jOOQ/src/main/java/org/jooq/Row19.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row2.java b/jOOQ/src/main/java/org/jooq/Row2.java index cfeb683800..794f732202 100644 --- a/jOOQ/src/main/java/org/jooq/Row2.java +++ b/jOOQ/src/main/java/org/jooq/Row2.java @@ -55,13 +55,15 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... + +import org.jooq.Comparator; +import org.jooq.impl.DSL; import java.util.Collection; import javax.annotation.Generated; -import org.jooq.impl.DSL; - /** * A model type for a row value expression with degree 2. *

@@ -91,7 +93,7 @@ public interface Row2 extends Row { // ------------------------------------------------------------------------ // Generic comparison predicates // ------------------------------------------------------------------------ - + /** * Compare this row value expression with another row value expression * using a dynamic comparator. diff --git a/jOOQ/src/main/java/org/jooq/Row20.java b/jOOQ/src/main/java/org/jooq/Row20.java index b5899fa24b..8cb339083c 100644 --- a/jOOQ/src/main/java/org/jooq/Row20.java +++ b/jOOQ/src/main/java/org/jooq/Row20.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row21.java b/jOOQ/src/main/java/org/jooq/Row21.java index 795ce63244..baabeecd7a 100644 --- a/jOOQ/src/main/java/org/jooq/Row21.java +++ b/jOOQ/src/main/java/org/jooq/Row21.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row22.java b/jOOQ/src/main/java/org/jooq/Row22.java index 9efb1078c9..acbf23ce01 100644 --- a/jOOQ/src/main/java/org/jooq/Row22.java +++ b/jOOQ/src/main/java/org/jooq/Row22.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row3.java b/jOOQ/src/main/java/org/jooq/Row3.java index 3cbc233625..3e01b91fa0 100644 --- a/jOOQ/src/main/java/org/jooq/Row3.java +++ b/jOOQ/src/main/java/org/jooq/Row3.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row4.java b/jOOQ/src/main/java/org/jooq/Row4.java index d87af62757..d66d87e1de 100644 --- a/jOOQ/src/main/java/org/jooq/Row4.java +++ b/jOOQ/src/main/java/org/jooq/Row4.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row5.java b/jOOQ/src/main/java/org/jooq/Row5.java index b6897ff02a..ca901a605a 100644 --- a/jOOQ/src/main/java/org/jooq/Row5.java +++ b/jOOQ/src/main/java/org/jooq/Row5.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row6.java b/jOOQ/src/main/java/org/jooq/Row6.java index 1777e62c66..f355fced5e 100644 --- a/jOOQ/src/main/java/org/jooq/Row6.java +++ b/jOOQ/src/main/java/org/jooq/Row6.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row7.java b/jOOQ/src/main/java/org/jooq/Row7.java index 24279ba83f..bbe84b273f 100644 --- a/jOOQ/src/main/java/org/jooq/Row7.java +++ b/jOOQ/src/main/java/org/jooq/Row7.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row8.java b/jOOQ/src/main/java/org/jooq/Row8.java index 8380ca4bc5..40874ed1b3 100644 --- a/jOOQ/src/main/java/org/jooq/Row8.java +++ b/jOOQ/src/main/java/org/jooq/Row8.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Row9.java b/jOOQ/src/main/java/org/jooq/Row9.java index bb2a7cdb60..bfd096c306 100644 --- a/jOOQ/src/main/java/org/jooq/Row9.java +++ b/jOOQ/src/main/java/org/jooq/Row9.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/RowN.java b/jOOQ/src/main/java/org/jooq/RowN.java index e6ada74a81..4b8b4ba7fa 100644 --- a/jOOQ/src/main/java/org/jooq/RowN.java +++ b/jOOQ/src/main/java/org/jooq/RowN.java @@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import org.jooq.Comparator; import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/Select.java b/jOOQ/src/main/java/org/jooq/Select.java index af1019cdf1..34ff7263ef 100644 --- a/jOOQ/src/main/java/org/jooq/Select.java +++ b/jOOQ/src/main/java/org/jooq/Select.java @@ -56,6 +56,7 @@ import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.SQLITE; // ... // ... +// ... import java.util.List; diff --git a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java index 24e9896090..35976b924b 100644 --- a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java @@ -60,6 +60,7 @@ import static org.jooq.SQLDialect.POSTGRES_9_3; import static org.jooq.SQLDialect.SQLITE; // ... // ... +// ... import org.jooq.impl.DSL; diff --git a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java index 598c662b34..908b81379d 100644 --- a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java @@ -49,11 +49,14 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; // ... // ... +import static org.jooq.SQLDialect.MARIADB; +import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.SQLITE; // ... // ... +// ... /** @@ -118,7 +121,7 @@ public interface SelectUnionStep extends SelectFinalStep { * Apply the EXCEPT (or MINUS) set operation. */ @Override - @Support({ CUBRID, DERBY, H2, HSQLDB, POSTGRES, SQLITE }) + @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) SelectOrderByStep except(Select select); /** @@ -132,7 +135,7 @@ public interface SelectUnionStep extends SelectFinalStep { * Apply the INTERSECT set operation. */ @Override - @Support({ CUBRID, DERBY, H2, HSQLDB, POSTGRES, SQLITE }) + @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) SelectOrderByStep intersect(Select select); /** diff --git a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java index 542f4ad452..499dd25a29 100644 --- a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java @@ -48,6 +48,7 @@ import static org.jooq.SQLDialect.CUBRID; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import java.util.Collection; diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java index 4a0c79c2f8..f73b741176 100644 --- a/jOOQ/src/main/java/org/jooq/Table.java +++ b/jOOQ/src/main/java/org/jooq/Table.java @@ -62,6 +62,7 @@ import static org.jooq.SQLDialect.POSTGRES_9_3; import static org.jooq.SQLDialect.SQLITE; // ... // ... +// ... import java.sql.Timestamp; import java.util.Collection; diff --git a/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java b/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java index 3999f70ce6..68cb502413 100644 --- a/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... // ... +// ... import java.util.Collection; diff --git a/jOOQ/src/main/java/org/jooq/WindowOverStep.java b/jOOQ/src/main/java/org/jooq/WindowOverStep.java index b987aac8a6..eff516b973 100644 --- a/jOOQ/src/main/java/org/jooq/WindowOverStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowOverStep.java @@ -52,6 +52,7 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... // ... +// ... /** * This type is used for the window function DSL API. diff --git a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java index 798632c66e..0e497ac687 100644 --- a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... // ... +// ... /** * This type is used for the window function DSL API. diff --git a/jOOQ/src/main/java/org/jooq/WindowRowsStep.java b/jOOQ/src/main/java/org/jooq/WindowRowsStep.java index 7e7633e332..6975e902d4 100644 --- a/jOOQ/src/main/java/org/jooq/WindowRowsStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowRowsStep.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... // ... +// ... /** * This type is used for the window function DSL API. diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java index 211567f814..67c99f796b 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... // ... +// ... import java.util.Collection; diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java index 85ad771def..60bc461569 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... // ... +// ... import java.util.Collection; diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java index d0f5cdda20..d001f4bcb8 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsAndStep.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... // ... +// ... /** * An intermediate step in the construction of a {@link WindowSpecification}. diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java index 161fc17b4b..4e3fedb850 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationRowsStep.java @@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.POSTGRES; // ... // ... // ... +// ... /** * An intermediate step in the construction of a {@link WindowSpecification}. diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index b8e9ec5814..03ac9b644c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -11701,7 +11701,7 @@ public class DSL { * @see #power(Field, Number) */ @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) - public static Field shl(Fieldvalue1, Number value2) { + public static Field shl(Field value1, Number value2) { return shl(nullSafe(value1), Utils.field(value2)); } diff --git a/jOOQ/src/main/java/org/jooq/impl/Expression.java b/jOOQ/src/main/java/org/jooq/impl/Expression.java index d68c3f0da8..4ff402053f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Expression.java +++ b/jOOQ/src/main/java/org/jooq/impl/Expression.java @@ -57,6 +57,7 @@ import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.SQLITE; // ... // ... +// ... import static org.jooq.impl.DSL.field; import static org.jooq.impl.DSL.function; import static org.jooq.impl.DSL.inline;