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

[jOOQ/jOOQ#10205] Fixed the NPE

Browse Source
This commit is contained in:
Lukas Eder 2020-05-19 17:14:59 +02:00
parent 0f08489f68
commit 937a34e0f6
14 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/Tables.java
View File

@ -9,7 +9,7 @@ import org.jooq.example.flyway.ddl.db.h2.tables.Book;
/**
* Convenience access to all tables in FLYWAY_TEST
* Convenience access to all tables in FLYWAY_TEST.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables {

24
jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java
View File

@ -31,7 +31,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Author extends TableImpl<AuthorRecord> {
private static final long serialVersionUID = 615226003;
private static final long serialVersionUID = 1852277325;
/**
* The reference instance of <code>FLYWAY_TEST.AUTHOR</code>
@ -76,11 +76,12 @@ public class Author extends TableImpl<AuthorRecord> {
*/
public final TableField<AuthorRecord, String> ADDRESS = createField(DSL.name("ADDRESS"), org.jooq.impl.SQLDataType.VARCHAR(50), this, "");
/**
* Create a <code>FLYWAY_TEST.AUTHOR</code> table reference
*/
public Author() {
this(DSL.name("AUTHOR"), null);
private Author(Name alias, Table<AuthorRecord> aliased) {
this(alias, aliased, null);
}
private Author(Name alias, Table<AuthorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
@ -97,12 +98,11 @@ public class Author extends TableImpl<AuthorRecord> {
this(alias, AUTHOR);
}
private Author(Name alias, Table<AuthorRecord> aliased) {
this(alias, aliased, null);
}
private Author(Name alias, Table<AuthorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
/**
* Create a <code>FLYWAY_TEST.AUTHOR</code> table reference
*/
public Author() {
this(DSL.name("AUTHOR"), null);
}
public <O extends Record> Author(Table<O> child, ForeignKey<O, AuthorRecord> key) {

24
jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Book.java
View File

@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Book extends TableImpl<BookRecord> {
private static final long serialVersionUID = 830463937;
private static final long serialVersionUID = -40744821;
/**
* The reference instance of <code>FLYWAY_TEST.BOOK</code>
@ -60,11 +60,12 @@ public class Book extends TableImpl<BookRecord> {
*/
public final TableField<BookRecord, String> TITLE = createField(DSL.name("TITLE"), org.jooq.impl.SQLDataType.VARCHAR(400).nullable(false), this, "");
/**
* Create a <code>FLYWAY_TEST.BOOK</code> table reference
*/
public Book() {
this(DSL.name("BOOK"), null);
private Book(Name alias, Table<BookRecord> aliased) {
this(alias, aliased, null);
}
private Book(Name alias, Table<BookRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
@ -81,12 +82,11 @@ public class Book extends TableImpl<BookRecord> {
this(alias, BOOK);
}
private Book(Name alias, Table<BookRecord> aliased) {
this(alias, aliased, null);
}
private Book(Name alias, Table<BookRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
/**
* Create a <code>FLYWAY_TEST.BOOK</code> table reference
*/
public Book() {
this(DSL.name("BOOK"), null);
}
public <O extends Record> Book(Table<O> child, ForeignKey<O, BookRecord> key) {

2
jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Tables.java
View File

@ -11,7 +11,7 @@ import org.jooq.example.jpa.jooq.tables.Language;
/**
* Convenience access to all tables in
* Convenience access to all tables in the default schema.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables {

24
jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java
View File

@ -31,7 +31,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Actor extends TableImpl<ActorRecord> {
private static final long serialVersionUID = -676325822;
private static final long serialVersionUID = -1488770024;
/**
* The reference instance of <code>ACTOR</code>
@ -61,11 +61,12 @@ public class Actor extends TableImpl<ActorRecord> {
*/
public final TableField<ActorRecord, String> LASTNAME = createField(DSL.name("LASTNAME"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
/**
* Create a <code>ACTOR</code> table reference
*/
public Actor() {
this(DSL.name("ACTOR"), null);
private Actor(Name alias, Table<ActorRecord> aliased) {
this(alias, aliased, null);
}
private Actor(Name alias, Table<ActorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
@ -82,12 +83,11 @@ public class Actor extends TableImpl<ActorRecord> {
this(alias, ACTOR);
}
private Actor(Name alias, Table<ActorRecord> aliased) {
this(alias, aliased, null);
}
private Actor(Name alias, Table<ActorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
/**
* Create a <code>ACTOR</code> table reference
*/
public Actor() {
this(DSL.name("ACTOR"), null);
}
public <O extends Record> Actor(Table<O> child, ForeignKey<O, ActorRecord> key) {

24
jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java
View File

@ -32,7 +32,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Film extends TableImpl<FilmRecord> {
private static final long serialVersionUID = 1375443672;
private static final long serialVersionUID = 313776890;
/**
* The reference instance of <code>FILM</code>
@ -77,11 +77,12 @@ public class Film extends TableImpl<FilmRecord> {
*/
public final TableField<FilmRecord, Integer> ORIGINALLANGUAGE_LANGUAGEID = createField(DSL.name("ORIGINALLANGUAGE_LANGUAGEID"), org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* Create a <code>FILM</code> table reference
*/
public Film() {
this(DSL.name("FILM"), null);
private Film(Name alias, Table<FilmRecord> aliased) {
this(alias, aliased, null);
}
private Film(Name alias, Table<FilmRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
@ -98,12 +99,11 @@ public class Film extends TableImpl<FilmRecord> {
this(alias, FILM);
}
private Film(Name alias, Table<FilmRecord> aliased) {
this(alias, aliased, null);
}
private Film(Name alias, Table<FilmRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
/**
* Create a <code>FILM</code> table reference
*/
public Film() {
this(DSL.name("FILM"), null);
}
public <O extends Record> Film(Table<O> child, ForeignKey<O, FilmRecord> key) {

24
jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java
View File

@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class FilmActor extends TableImpl<FilmActorRecord> {
private static final long serialVersionUID = 1747205121;
private static final long serialVersionUID = 1729998951;
/**
* The reference instance of <code>FILM_ACTOR</code>
@ -55,11 +55,12 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
*/
public final TableField<FilmActorRecord, Integer> ACTORS_ACTORID = createField(DSL.name("ACTORS_ACTORID"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* Create a <code>FILM_ACTOR</code> table reference
*/
public FilmActor() {
this(DSL.name("FILM_ACTOR"), null);
private FilmActor(Name alias, Table<FilmActorRecord> aliased) {
this(alias, aliased, null);
}
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
@ -76,12 +77,11 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
this(alias, FILM_ACTOR);
}
private FilmActor(Name alias, Table<FilmActorRecord> aliased) {
this(alias, aliased, null);
}
private FilmActor(Name alias, Table<FilmActorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
/**
* Create a <code>FILM_ACTOR</code> table reference
*/
public FilmActor() {
this(DSL.name("FILM_ACTOR"), null);
}
public <O extends Record> FilmActor(Table<O> child, ForeignKey<O, FilmActorRecord> key) {

24
jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java
View File

@ -31,7 +31,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Language extends TableImpl<LanguageRecord> {
private static final long serialVersionUID = 1073752323;
private static final long serialVersionUID = 888214397;
/**
* The reference instance of <code>LANGUAGE</code>
@ -56,11 +56,12 @@ public class Language extends TableImpl<LanguageRecord> {
*/
public final TableField<LanguageRecord, String> NAME = createField(DSL.name("NAME"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
/**
* Create a <code>LANGUAGE</code> table reference
*/
public Language() {
this(DSL.name("LANGUAGE"), null);
private Language(Name alias, Table<LanguageRecord> aliased) {
this(alias, aliased, null);
}
private Language(Name alias, Table<LanguageRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
@ -77,12 +78,11 @@ public class Language extends TableImpl<LanguageRecord> {
this(alias, LANGUAGE);
}
private Language(Name alias, Table<LanguageRecord> aliased) {
this(alias, aliased, null);
}
private Language(Name alias, Table<LanguageRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
/**
* Create a <code>LANGUAGE</code> table reference
*/
public Language() {
this(DSL.name("LANGUAGE"), null);
}
public <O extends Record> Language(Table<O> child, ForeignKey<O, LanguageRecord> key) {

2
jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Tables.java
View File

@ -11,7 +11,7 @@ import org.jooq.example.db.h2.tables.BookToBookStore;
/**
* Convenience access to all tables in PUBLIC
* Convenience access to all tables in PUBLIC.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables {

24
jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java
View File

@ -32,7 +32,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Author extends TableImpl<AuthorRecord> {
private static final long serialVersionUID = -227991572;
private static final long serialVersionUID = -219005764;
/**
* The reference instance of <code>PUBLIC.AUTHOR</code>
@ -77,11 +77,12 @@ public class Author extends TableImpl<AuthorRecord> {
*/
public final TableField<AuthorRecord, String> ADDRESS = createField(DSL.name("ADDRESS"), org.jooq.impl.SQLDataType.VARCHAR(50), this, "");
/**
* Create a <code>PUBLIC.AUTHOR</code> table reference
*/
public Author() {
this(DSL.name("AUTHOR"), null);
private Author(Name alias, Table<AuthorRecord> aliased) {
this(alias, aliased, null);
}
private Author(Name alias, Table<AuthorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
@ -98,12 +99,11 @@ public class Author extends TableImpl<AuthorRecord> {
this(alias, AUTHOR);
}
private Author(Name alias, Table<AuthorRecord> aliased) {
this(alias, aliased, null);
}
private Author(Name alias, Table<AuthorRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
/**
* Create a <code>PUBLIC.AUTHOR</code> table reference
*/
public Author() {
this(DSL.name("AUTHOR"), null);
}
public <O extends Record> Author(Table<O> child, ForeignKey<O, AuthorRecord> key) {

26
jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java
View File

@ -32,7 +32,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Book extends TableImpl<BookRecord> {
private static final long serialVersionUID = 359588588;
private static final long serialVersionUID = -925238409;
/**
* The reference instance of <code>PUBLIC.BOOK</code>
@ -100,13 +100,14 @@ public class Book extends TableImpl<BookRecord> {
/**
* The column <code>PUBLIC.BOOK.REC_TIMESTAMP</code>.
*/
public final TableField<BookRecord, LocalDateTime> REC_TIMESTAMP = createField(DSL.name("REC_TIMESTAMP"), org.jooq.impl.SQLDataType.LOCALDATETIME, this, "");
public final TableField<BookRecord, LocalDateTime> REC_TIMESTAMP = createField(DSL.name("REC_TIMESTAMP"), org.jooq.impl.SQLDataType.LOCALDATETIME(6), this, "");
/**
* Create a <code>PUBLIC.BOOK</code> table reference
*/
public Book() {
this(DSL.name("BOOK"), null);
private Book(Name alias, Table<BookRecord> aliased) {
this(alias, aliased, null);
}
private Book(Name alias, Table<BookRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
@ -123,12 +124,11 @@ public class Book extends TableImpl<BookRecord> {
this(alias, BOOK);
}
private Book(Name alias, Table<BookRecord> aliased) {
this(alias, aliased, null);
}
private Book(Name alias, Table<BookRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
/**
* Create a <code>PUBLIC.BOOK</code> table reference
*/
public Book() {
this(DSL.name("BOOK"), null);
}
public <O extends Record> Book(Table<O> child, ForeignKey<O, BookRecord> key) {

24
jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/BookStore.java
View File

@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class BookStore extends TableImpl<BookStoreRecord> {
private static final long serialVersionUID = -490084615;
private static final long serialVersionUID = -133334503;
/**
* The reference instance of <code>PUBLIC.BOOK_STORE</code>
@ -50,11 +50,12 @@ public class BookStore extends TableImpl<BookStoreRecord> {
*/
public final TableField<BookStoreRecord, String> NAME = createField(DSL.name("NAME"), org.jooq.impl.SQLDataType.VARCHAR(400).nullable(false), this, "");
/**
* Create a <code>PUBLIC.BOOK_STORE</code> table reference
*/
public BookStore() {
this(DSL.name("BOOK_STORE"), null);
private BookStore(Name alias, Table<BookStoreRecord> aliased) {
this(alias, aliased, null);
}
private BookStore(Name alias, Table<BookStoreRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
@ -71,12 +72,11 @@ public class BookStore extends TableImpl<BookStoreRecord> {
this(alias, BOOK_STORE);
}
private BookStore(Name alias, Table<BookStoreRecord> aliased) {
this(alias, aliased, null);
}
private BookStore(Name alias, Table<BookStoreRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
/**
* Create a <code>PUBLIC.BOOK_STORE</code> table reference
*/
public BookStore() {
this(DSL.name("BOOK_STORE"), null);
}
public <O extends Record> BookStore(Table<O> child, ForeignKey<O, BookStoreRecord> key) {

24
jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/BookToBookStore.java
View File

@ -30,7 +30,7 @@ import org.jooq.impl.TableImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class BookToBookStore extends TableImpl<BookToBookStoreRecord> {
private static final long serialVersionUID = -544979400;
private static final long serialVersionUID = 1075233960;
/**
* The reference instance of <code>PUBLIC.BOOK_TO_BOOK_STORE</code>
@ -60,11 +60,12 @@ public class BookToBookStore extends TableImpl<BookToBookStoreRecord> {
*/
public final TableField<BookToBookStoreRecord, Integer> STOCK = createField(DSL.name("STOCK"), org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* Create a <code>PUBLIC.BOOK_TO_BOOK_STORE</code> table reference
*/
public BookToBookStore() {
this(DSL.name("BOOK_TO_BOOK_STORE"), null);
private BookToBookStore(Name alias, Table<BookToBookStoreRecord> aliased) {
this(alias, aliased, null);
}
private BookToBookStore(Name alias, Table<BookToBookStoreRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
@ -81,12 +82,11 @@ public class BookToBookStore extends TableImpl<BookToBookStoreRecord> {
this(alias, BOOK_TO_BOOK_STORE);
}
private BookToBookStore(Name alias, Table<BookToBookStoreRecord> aliased) {
this(alias, aliased, null);
}
private BookToBookStore(Name alias, Table<BookToBookStoreRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
/**
* Create a <code>PUBLIC.BOOK_TO_BOOK_STORE</code> table reference
*/
public BookToBookStore() {
this(DSL.name("BOOK_TO_BOOK_STORE"), null);
}
public <O extends Record> BookToBookStore(Table<O> child, ForeignKey<O, BookToBookStoreRecord> key) {

6
jOOQ/src/main/java/org/jooq/impl/Interpreter.java
View File

@ -38,6 +38,7 @@
package org.jooq.impl;
import static java.lang.Boolean.TRUE;
import static java.util.Arrays.asList;
import static org.jooq.Name.Quoted.QUOTED;
import static org.jooq.conf.SettingsTools.interpreterLocale;
import static org.jooq.impl.AbstractName.NO_NAME;
@ -57,7 +58,6 @@ import static org.jooq.tools.StringUtils.defaultIfNull;
import java.util.AbstractList;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Deque;
import java.util.HashMap;
import java.util.Iterator;
@ -799,10 +799,10 @@ final class Interpreter {
}
List<DataType<?>> columnTypes = new ArrayList<>();
for (Field<?> f : query.$select().getSelect())
for (Field<?> f : (query.$select() != null ? query.$select().getSelect() : asList(query.$fields())))
columnTypes.add(f.getDataType());
newTable(table, schema, Arrays.asList(query.$fields()), columnTypes, query.$select(), null, TableOptions.view(query.$select()));
newTable(table, schema, asList(query.$fields()), columnTypes, query.$select(), null, TableOptions.view(query.$select()));
}
private final void accept0(AlterViewImpl query) {