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

[jOOQ/jOOQ#8948] Map JSON / JSONB to CLOB/BLOB in HSQLDB

Browse Source
This commit is contained in:
Lukas Eder 2020-06-25 11:21:20 +02:00
parent 48c4ee5ed2
commit a8d77ff363
2 changed files with 48 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4352,49 +4352,42 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
/**
* Generated UID
*/
private static final long serialVersionUID = 3430629127218407737L;
private static final long serialVersionUID = 3430629127218407737L;
private static final Set<SQLDialect> EMULATE_AS_BLOB = SQLDialect.supportedBy(HSQLDB);
private final Converter<byte[], JSONB> BYTES_CONVERTER;
private final DefaultBytesBinding<U> BYTES;
@SuppressWarnings({ "serial", "unchecked", "rawtypes" })
DefaultJSONBBinding(Converter<JSONB, U> converter, boolean isLob) {
super(converter, isLob);
// [#8949] TODO: Support overriding the system default Charset
BYTES_CONVERTER = new AbstractConverter<byte[], JSONB>(byte[].class, JSONB.class) {
@Override
public JSONB from(byte[] t) {
return t == null ? null : JSONB.valueOf(new String(t));
}
@Override
public byte[] to(JSONB u) {
return u == null ? null : u.toString().getBytes();
}
};
BYTES = new DefaultBytesBinding<>((Converter) BYTES_CONVERTER, isLob);
}
@Override
void sqlInline0(BindingSQLContext<U> ctx, JSONB value) throws SQLException {
if (EMULATE_AS_BLOB.contains(ctx.dialect())) {
BYTES.sqlInline0(ctx, BYTES_CONVERTER.to(value));
}
else {
super.sqlInline0(ctx, value);
super.sqlInline0(ctx, value);
if (ctx.family() == H2 && value != null)
ctx.render().sql(' ').visit(K_FORMAT).sql(' ').visit(K_JSON);
if (ctx.family() == H2 && value != null)
ctx.render().sql(' ').visit(K_FORMAT).sql(' ').visit(K_JSON);
}
}
@Override
@ -4407,30 +4400,24 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
@Override
final void set0(BindingSetStatementContext<U> ctx, JSONB value) throws SQLException {
ctx.statement().setString(ctx.index(), value.toString());
if (EMULATE_AS_BLOB.contains(ctx.dialect()))
BYTES.set0(ctx, BYTES_CONVERTER.to(value));
else
ctx.statement().setString(ctx.index(), value.toString());
}
@Override
final void set0(BindingSetSQLOutputContext<U> ctx, JSONB value) throws SQLException {
ctx.output().writeString(value.toString());
if (EMULATE_AS_BLOB.contains(ctx.dialect()))
BYTES.set0(ctx, BYTES_CONVERTER.to(value));
else
ctx.output().writeString(value.toString());
}
@Override
final JSONB get0(BindingGetResultSetContext<U> ctx) throws SQLException {
if (EMULATE_AS_BLOB.contains(ctx.dialect()))
return BYTES_CONVERTER.from(BYTES.get0(ctx));
String string = ctx.resultSet().getString(ctx.index());
return string == null ? null : JSONB.valueOf(string);
@ -4438,10 +4425,8 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
@Override
final JSONB get0(BindingGetStatementContext<U> ctx) throws SQLException {
if (EMULATE_AS_BLOB.contains(ctx.dialect()))
return BYTES_CONVERTER.from(BYTES.get0(ctx));
String string = ctx.statement().getString(ctx.index());
return string == null ? null : JSONB.valueOf(string);
@ -4449,10 +4434,8 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
@Override
final JSONB get0(BindingGetSQLInputContext<U> ctx) throws SQLException {
if (EMULATE_AS_BLOB.contains(ctx.dialect()))
return BYTES_CONVERTER.from(BYTES.get0(ctx));
String string = ctx.input().readString();
return string == null ? null : JSONB.valueOf(string);
@ -4460,10 +4443,8 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
@Override
final int sqltype(Statement statement, Configuration configuration) {
if (EMULATE_AS_BLOB.contains(configuration.dialect()))
BYTES.sqltype(statement, configuration);
return Types.VARCHAR;
}

4
jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDataType.java
View File

@ -49,6 +49,8 @@ import java.time.OffsetTime;
import java.util.UUID;
import org.jooq.DataType;
import org.jooq.JSON;
import org.jooq.JSONB;
import org.jooq.Record;
import org.jooq.Result;
import org.jooq.SQLDialect;
@ -140,6 +142,8 @@ public class HSQLDBDataType {
protected static final DataType<UShort> __SMALLINTUNSIGNED = new DefaultDataType<>(SQLDialect.HSQLDB, SQLDataType.SMALLINTUNSIGNED, "int");
protected static final DataType<UInteger> __INTEGERUNSIGNED = new DefaultDataType<>(SQLDialect.HSQLDB, SQLDataType.INTEGERUNSIGNED, "bigint");
protected static final DataType<ULong> __BIGINTUNSIGNED = new DefaultDataType<>(SQLDialect.HSQLDB, SQLDataType.BIGINTUNSIGNED, "decimal");
protected static final DataType<JSON> __JSON = new DefaultDataType<>(SQLDialect.HSQLDB, SQLDataType.JSON, "clob");
protected static final DataType<JSONB> __JSONB = new DefaultDataType<>(SQLDialect.HSQLDB, SQLDataType.JSONB, "blob");
// -------------------------------------------------------------------------
// Compatibility types for supported Java types