Skip to content

Commit 81d973c

Browse files
committed
completely remove hibernate.dialect.oracle.prefer_long_raw
Looks like this has not worked since probably H 6.0 The issue here is that the test for this feature was one of these tests written to look at the Hibernate metamodel and not at the actual DDL that was ultimately generated. This is why I despise "unit" testing instead of testing actual user-visible functionality. Anyway this was an undocumented feature so it can just be removed.
1 parent 5db02b0 commit 81d973c

File tree

5 files changed

+5
-155
lines changed

5 files changed

+5
-155
lines changed

hibernate-core/src/main/java/org/hibernate/cfg/DialectSpecificSettings.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ public interface DialectSpecificSettings {
4343
*/
4444
String ORACLE_APPLICATION_CONTINUITY = "hibernate.dialect.oracle.application_continuity";
4545

46-
/**
47-
* Enables the use of the deprecated type {@code LONGVARBINARY} on Oracle instead of {@code BLOB}.
48-
*
49-
* @settingDefault {@code false}
50-
*/
51-
String ORACLE_PREFER_LONG_RAW = "hibernate.dialect.oracle.prefer_long_raw";
52-
5346
/**
5447
* Specifies whether the {@code ansinull} setting is enabled on Sybase.
5548
* <p>

hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
4848
import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
4949
import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
50-
import org.hibernate.internal.util.StringHelper;
5150
import org.hibernate.mapping.CheckConstraint;
5251
import org.hibernate.metamodel.mapping.EntityMappingType;
5352
import org.hibernate.metamodel.spi.RuntimeModelCreationContext;

hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.hibernate.QueryTimeoutException;
2020
import org.hibernate.boot.model.FunctionContributions;
2121
import org.hibernate.boot.model.TypeContributions;
22-
import org.hibernate.cfg.DialectSpecificSettings;
2322
import org.hibernate.dialect.aggregate.AggregateSupport;
2423
import org.hibernate.dialect.aggregate.OracleAggregateSupport;
2524
import org.hibernate.dialect.function.CommonFunctionFactory;
@@ -35,8 +34,6 @@
3534
import org.hibernate.dialect.temptable.TemporaryTableKind;
3635
import org.hibernate.dialect.unique.CreateTableUniqueDelegate;
3736
import org.hibernate.dialect.unique.UniqueDelegate;
38-
import org.hibernate.engine.config.spi.ConfigurationService;
39-
import org.hibernate.engine.config.spi.StandardConverters;
4037
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
4138
import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
4239
import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
@@ -87,7 +84,6 @@
8784
import org.hibernate.type.NullType;
8885
import org.hibernate.type.StandardBasicTypes;
8986
import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
90-
import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
9187
import org.hibernate.type.descriptor.jdbc.JdbcType;
9288
import org.hibernate.type.descriptor.jdbc.NullJdbcType;
9389
import org.hibernate.type.descriptor.jdbc.ObjectNullAsNullTypeJdbcType;
@@ -167,16 +163,11 @@ public class OracleDialect extends Dialect {
167163
private static final Pattern SQL_STATEMENT_TYPE_PATTERN =
168164
Pattern.compile( "^(?:/\\*.*?\\*/)?\\s*(select|insert|update|delete)\\s+.*?", CASE_INSENSITIVE );
169165

170-
private static final int PARAM_LIST_SIZE_LIMIT_1000 = 1000;
171-
172-
/** Starting from 23c, 65535 parameters are supported for the IN condition. */
173-
private static final int PARAM_LIST_SIZE_LIMIT_65535 = 65535;
174-
175166
/**
176-
* @deprecated Use {@link DialectSpecificSettings#ORACLE_PREFER_LONG_RAW}.
167+
* Starting from 23c, 65535 parameters are supported for the {@code IN} condition.
177168
*/
178-
@Deprecated(since = "7.0", forRemoval = true)
179-
public static final String PREFER_LONG_RAW = DialectSpecificSettings.ORACLE_PREFER_LONG_RAW;
169+
private static final int PARAM_LIST_SIZE_LIMIT_65535 = 65535;
170+
private static final int PARAM_LIST_SIZE_LIMIT_1000 = 1000;
180171

181172
private static final String yqmSelect =
182173
"(trunc(%2$s, 'MONTH') + numtoyminterval(%1$s, 'MONTH') + (least(extract(day from %2$s), extract(day from last_day(trunc(%2$s, 'MONTH') + numtoyminterval(%1$s, 'MONTH')))) - 1))";
@@ -987,12 +978,6 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
987978
typeContributions.contributeJdbcType( OracleReflectionStructJdbcType.INSTANCE );
988979
}
989980

990-
// account for Oracle's deprecated support for LONGVARBINARY
991-
// prefer BLOB, unless the user explicitly opts out
992-
final boolean preferLong = serviceRegistry.requireService( ConfigurationService.class )
993-
.getSetting( PREFER_LONG_RAW, StandardConverters.BOOLEAN, false );
994-
typeContributions.contributeJdbcType( preferLong ? BlobJdbcType.PRIMITIVE_ARRAY_BINDING : BlobJdbcType.DEFAULT );
995-
996981
if ( getVersion().isSameOrAfter( 21 ) ) {
997982
typeContributions.contributeJdbcType( OracleJsonJdbcType.INSTANCE );
998983
typeContributions.contributeJdbcTypeConstructor( OracleJsonArrayJdbcTypeConstructor.NATIVE_INSTANCE );

hibernate-core/src/main/java/org/hibernate/dialect/OracleServerConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public static OracleServerConfiguration fromDialectResolutionInfo(DialectResolut
130130

131131
private static boolean isExtended(Statement statement) {
132132
try ( final ResultSet resultSet =
133-
statement.executeQuery( "select cast('string' as varchar2(32000)) from dual" ) ) {
133+
statement.executeQuery( "select cast('string' as varchar2(32000)) from dual" ) ) {
134134
resultSet.next();
135135
// succeeded, so MAX_STRING_SIZE == EXTENDED
136136
return true;
@@ -185,7 +185,7 @@ private static Boolean determineApplicationContinuity(Connection connection, Sta
185185

186186
private static boolean isAutonomous(Statement statement) {
187187
try ( final ResultSet resultSet =
188-
statement.executeQuery( "select sys_context('USERENV','CLOUD_SERVICE') from dual" ) ) {
188+
statement.executeQuery( "select sys_context('USERENV','CLOUD_SERVICE') from dual" ) ) {
189189
return resultSet.next()
190190
&& isAutonomous( resultSet.getString(1) );
191191
}

hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleLongLobTypeTest.java

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)