github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release 3.9.0

Browse Source
This commit is contained in:
lukaseder 2016-12-23 14:18:36 +01:00
parent e0c0ed0229
commit b431727ee1
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
View File

@ -5450,6 +5450,7 @@ public class JavaGenerator extends AbstractGenerator {
private DataType<?> mapJavaTimeTypes(DataType<?> dataType) {
DataType<?> result = dataType;
// [#4429] [#5713] This logic should be implemented in Configuration
if (dataType.isDateTime() && generateJavaTimeTypes) {
if (dataType.getType() == Date.class)
@ -5460,6 +5461,7 @@ public class JavaGenerator extends AbstractGenerator {
result = SQLDataType.LOCALDATETIME;
}
return result;
}

8
jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
View File

@ -101,6 +101,8 @@ import org.jooq.Configuration;
import org.jooq.ConnectionCallable;
import org.jooq.ConnectionProvider;
import org.jooq.ConnectionRunnable;
import org.jooq.ContextTransactionalCallable;
import org.jooq.ContextTransactionalRunnable;
import org.jooq.CreateIndexStep;
import org.jooq.CreateSchemaFinalStep;
import org.jooq.CreateSequenceFinalStep;
@ -217,8 +219,6 @@ import org.jooq.Table;
import org.jooq.TableField;
import org.jooq.TableLike;
import org.jooq.TableRecord;
import org.jooq.ContextTransactionalCallable;
import org.jooq.ContextTransactionalRunnable;
import org.jooq.TransactionProvider;
import org.jooq.TransactionalCallable;
import org.jooq.TransactionalRunnable;
@ -406,12 +406,12 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
@Override
public InformationSchema informationSchema(Table<?> table) {
return InformationSchemaExport.exportTables(configuration(), Arrays.asList(table));
return InformationSchemaExport.exportTables(configuration(), Arrays.<Table<?>>asList(table));
}
@Override
public InformationSchema informationSchema(Table<?>... tables) {
return InformationSchemaExport.exportTables(configuration(), Arrays.asList(tables));
return InformationSchemaExport.exportTables(configuration(), Arrays.<Table<?>>asList(tables));
}
// -------------------------------------------------------------------------

18
jOOQ/src/main/java/org/jooq/impl/InformationSchemaMetaImpl.java
View File

@ -402,27 +402,27 @@ public static void main(String[] args) {
@Override
public final List<Catalog> getCatalogs() {
return unmodifiableList(catalogs);
return Collections.<Catalog>unmodifiableList(catalogs);
}
@Override
public final List<Schema> getSchemas() {
return unmodifiableList(schemas);
return Collections.<Schema>unmodifiableList(schemas);
}
@Override
public final List<Table<?>> getTables() {
return unmodifiableList(tables);
return Collections.<Table<?>>unmodifiableList(tables);
}
@Override
public final List<Sequence<?>> getSequences() {
return unmodifiableList(sequences);
return Collections.<Sequence<?>>unmodifiableList(sequences);
}
@Override
public final List<UniqueKey<?>> getPrimaryKeys() {
return unmodifiableList(primaryKeys);
return Collections.<UniqueKey<?>>unmodifiableList(primaryKeys);
}
private final class InformationSchemaCatalog extends CatalogImpl {
@ -455,12 +455,12 @@ public static void main(String[] args) {
@Override
public final List<Table<?>> getTables() {
return unmodifiableList(tablesPerSchema.get(this));
return Collections.<Table<?>>unmodifiableList(tablesPerSchema.get(this));
}
@Override
public final List<Sequence<?>> getSequences() {
return unmodifiableList(sequencesPerSchema.get(this));
return Collections.<Sequence<?>>unmodifiableList(sequencesPerSchema.get(this));
}
}
@ -486,12 +486,12 @@ public static void main(String[] args) {
@Override
public List<UniqueKey<Record>> getKeys() {
return Collections.unmodifiableList(uniqueKeys);
return Collections.<UniqueKey<Record>>unmodifiableList(uniqueKeys);
}
@Override
public List<ForeignKey<Record, ?>> getReferences() {
return Collections.unmodifiableList(foreignKeys);
return Collections.<ForeignKey<Record, ?>>unmodifiableList(foreignKeys);
}
}

2
jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
View File

@ -151,7 +151,7 @@ final class MetaImpl implements Meta, Serializable {
Result<Record> run(DatabaseMetaData meta) throws SQLException;
}
private final Result<Record> meta(MetaFunction consumer) {
private final Result<Record> meta(final MetaFunction consumer) {
return ctx.connectionResult(new ConnectionCallable<Result<Record>>() {
@Override
public Result<Record> run(Connection connection) throws SQLException {

4
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -620,7 +620,7 @@ class ParserImpl implements Parser {
do {
parse(ctx, '(');
if (parseIf(ctx, ')')) {
fieldSets.add(emptyList());
fieldSets.add(Collections.<Field<?>>emptyList());
}
else {
fieldSets.add(parseFields(ctx));
@ -3620,7 +3620,7 @@ class ParserImpl implements Parser {
boolean distinct = parseSetQuantifier(ctx);
List<Field<?>> fields = distinct
? parseFields(ctx)
: Collections.singletonList(parseField(ctx));
: Collections.<Field<?>>singletonList(parseField(ctx));
parse(ctx, ')');
if (distinct)