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

[jOOQ/jOOQ#12956] Can no longer store/retrieve blob data exceeding 1M in H2 2.0

Browse Source
This commit is contained in:
Lukas Eder 2022-01-27 10:45:49 +01:00
parent a18294daf4
commit 2802dc2607
2 changed files with 106 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jOOQ/src/main/java/org/jooq/impl/BlobBinding.java
View File

@ -42,6 +42,7 @@ import static org.jooq.impl.DefaultExecuteContext.localTargetConnection;
import static org.jooq.impl.Tools.asInt;
import java.sql.Blob;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Types;
@ -88,12 +89,12 @@ public class BlobBinding implements Binding<byte[], byte[]> {
@Override
public final void set(BindingSetStatementContext<byte[]> ctx) throws SQLException {
ctx.statement().setBlob(ctx.index(), newBlob(ctx, ctx.value()));
ctx.statement().setBlob(ctx.index(), newBlob(ctx, ctx.value(), ctx.statement().getConnection()));
}
@Override
public final void set(BindingSetSQLOutputContext<byte[]> ctx) throws SQLException {
ctx.output().writeBlob(newBlob(ctx, ctx.value()));
ctx.output().writeBlob(newBlob(ctx, ctx.value(), null));
}
@Override
@ -132,7 +133,7 @@ public class BlobBinding implements Binding<byte[], byte[]> {
}
}
static final Blob newBlob(ResourceManagingScope scope, byte[] bytes) throws SQLException {
static final Blob newBlob(ResourceManagingScope scope, byte[] bytes, Connection connection) throws SQLException {
Blob blob;
switch (scope.dialect()) {
@ -148,7 +149,7 @@ public class BlobBinding implements Binding<byte[], byte[]> {
default: {
blob = localConnection().createBlob();
blob = (connection != null ? connection : localConnection()).createBlob();
break;
}
}

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

@ -1939,45 +1939,64 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
}
static final class DefaultBytesBinding<U> extends AbstractBinding<byte[], U> {
private static final Set<SQLDialect> INLINE_AS_X_APOS = SQLDialect.supportedBy(H2, HSQLDB, MARIADB, MYSQL, SQLITE);
private static final Set<SQLDialect> REQUIRE_BYTEA_CAST = SQLDialect.supportedBy(POSTGRES, YUGABYTEDB);
// [#12956] Starting from H2 2.0, we can't use byte[] for BLOB anymore, if they're
// larger than 1MB
private final BlobBinding blobs;
DefaultBytesBinding(DataType<byte[]> dataType, Converter<byte[], U> converter) {
super(dataType, converter);
this.blobs = new BlobBinding();
}
@Override
final void setNull0(BindingSetStatementContext<U> ctx) throws SQLException {
switch (ctx.family()) {
super.setNull0(ctx);
default:
super.setNull0(ctx);
break;
}
}
@Override
final void sqlInline0(BindingSQLContext<U> ctx, byte[] value) {
// [#1154] Binary data cannot always be inlined
if (INLINE_AS_X_APOS.contains(ctx.dialect()))
ctx.render()
.sql("X'")
.sql(convertBytesToHex(value))
.sql('\'');
else if (ctx.dialect() == DERBY)
ctx.render()
.visit(K_CAST)
.sql("(X'")
.sql(convertBytesToHex(value))
.sql("' ")
.visit(K_AS)
.sql(' ')
.visit(BLOB)
.sql(')');
switch (ctx.family()) {
case H2:
case HSQLDB:
case MARIADB:
case MYSQL:
case SQLITE:
ctx.render()
.sql("X'")
.sql(convertBytesToHex(value))
.sql('\'');
break;
case DERBY:
ctx.render()
.visit(K_CAST)
.sql("(X'")
.sql(convertBytesToHex(value))
.sql("' ")
.visit(K_AS)
.sql(' ')
.visit(BLOB)
.sql(')');
break;
@ -2000,24 +2019,54 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
else if (REQUIRE_BYTEA_CAST.contains(ctx.dialect()))
ctx.render()
.sql("E'")
.sql(PostgresUtils.toPGString(value))
.sql("'::bytea");
// This default behaviour is used in debug logging for dialects
// that do not support inlining binary data
else
ctx.render()
.sql("X'")
.sql(convertBytesToHex(value))
.sql('\'');
case POSTGRES:
case YUGABYTEDB:
ctx.render()
.sql("E'")
.sql(PostgresUtils.toPGString(value))
.sql("'::bytea");
break;
default:
ctx.render()
.sql("X'")
.sql(convertBytesToHex(value))
.sql('\'');
break;
}
}
@Override
final void set0(BindingSetStatementContext<U> ctx, byte[] value) throws SQLException {
ctx.statement().setBytes(ctx.index(), value);
switch (ctx.family()) {
case H2:
blobs.set(new DefaultBindingSetStatementContext<>(ctx.executeContext(), ctx.statement(), ctx.index(), value));
break;
default:
ctx.statement().setBytes(ctx.index(), value);
break;
}
}
@Override
@ -2036,12 +2085,28 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
@Override
final byte[] get0(BindingGetResultSetContext<U> ctx) throws SQLException {
return ctx.resultSet().getBytes(ctx.index());
switch (ctx.family()) {
case H2:
DefaultBindingGetResultSetContext<byte[]> x = new DefaultBindingGetResultSetContext<>(ctx.executeContext(), ctx.resultSet(), ctx.index());
blobs.get(x);
return x.value();
default:
return ctx.resultSet().getBytes(ctx.index());
}
}
@Override
final byte[] get0(BindingGetStatementContext<U> ctx) throws SQLException {
return ctx.statement().getBytes(ctx.index());
switch (ctx.family()) {
case H2:
DefaultBindingGetStatementContext<byte[]> x = new DefaultBindingGetStatementContext<>(ctx.executeContext(), ctx.statement(), ctx.index());
blobs.get(x);
return x.value();
default:
return ctx.statement().getBytes(ctx.index());
}
}
@Override