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

[#8547] Fix SQLITE comparisons against dialect

Browse Source 
SQLITE should normally be compared against the dialect family.

Also replace some occurrences of `context.configuration().dialect()`
with `context.dialect()`.
This commit is contained in:
Knut Wannheden 2019-05-28 15:51:08 +02:00
parent 2b26053a64
commit d751d6edc7
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jOOQ-meta/src/main/java/org/jooq/meta/Databases.java
View File

@ -133,6 +133,10 @@ public class Databases {
case POSTGRES: result = PostgresDatabase.class; break;
case SQLITE: result = SQLiteDatabase.class; break;
case DEFAULT:

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

@ -226,7 +226,7 @@ final class CaseWhenStepImpl<V, T> extends AbstractFunction<T> implements CaseWh
.visit(K_CASE);
int size = compareValues.size();
switch (ctx.configuration().dialect()) {
switch (ctx.dialect()) {
// The DERBY dialect doesn't support the simple CASE clause
case DERBY: {

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

@ -1444,7 +1444,7 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
final BigInteger get0(BindingGetResultSetContext<U> ctx) throws SQLException {
// The SQLite JDBC driver doesn't support BigDecimals
if (ctx.configuration().dialect() == SQLDialect.SQLITE)
if (ctx.family() == SQLDialect.SQLITE)
return Convert.convert(ctx.resultSet().getString(ctx.index()), BigInteger.class);
BigDecimal b = ctx.resultSet().getBigDecimal(ctx.index());

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

@ -642,7 +642,7 @@ class Function<T> extends AbstractField<T> implements
if (name != null)
ctx.visit(name);
else if (term != null)
ctx.sql(term.translate(ctx.configuration().dialect()));
ctx.sql(term.translate(ctx.dialect()));
else
ctx.sql(getName());
}

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

@ -82,7 +82,7 @@ final class FunctionTable<R extends Record> extends AbstractTable<R> {
@Override
public final void accept(Context<?> ctx) {
switch (ctx.configuration().dialect()) {
switch (ctx.dialect()) {
case HSQLDB: {
ctx.visit(K_TABLE).sql('(').visit(function).sql(')');
break;
@ -99,7 +99,7 @@ final class FunctionTable<R extends Record> extends AbstractTable<R> {
}
default:
throw new SQLDialectNotSupportedException("FUNCTION TABLE is not supported for " + ctx.configuration().dialect());
throw new SQLDialectNotSupportedException("FUNCTION TABLE is not supported for " + ctx.dialect());
}
}

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

@ -429,7 +429,7 @@ final class MetaImpl extends AbstractMeta {
// SQLite JDBC's DatabaseMetaData.getColumns() can only return a single
// table's columns
if (columnCache == null && configuration.dialect() != SQLITE) {
if (columnCache == null && configuration.family() != SQLITE) {
Result<Record> columns = getColumns0(schema, "%");
Field<String> tableCat = (Field<String>) columns.field(0); // TABLE_CAT