Merge branch 'hibernate:main' into dialect_case_insensitive_query_pattern

Author: dnovitski

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java

@@ -123,7 +123,7 @@ public SequenceSupport getSequenceSupport() {
 	@Override
 	public String getQuerySequencesString() {
 		if ( getVersion().isSameOrAfter(7,3) ) {
-			return "select distinct sequence_name from qsys2.syssequences " +
+			return "select distinct sequence_schema as seqschema, sequence_name as seqname, START, minimum_value as minvalue, maximum_value as maxvalue, increment from qsys2.syssequences " +
 					"where current_schema='*LIBL' and sequence_schema in (select schema_name from qsys2.library_list_info) " +
 					"or sequence_schema=current_schema";
 		}

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

@@ -120,7 +120,7 @@ public SequenceSupport getSequenceSupport() {
 	@Override
 	public String getQuerySequencesString() {
 		if ( getVersion().isSameOrAfter(7,3) ) {
-			return "select distinct sequence_name from qsys2.syssequences " +
+			return "select distinct sequence_schema as seqschema, sequence_name as seqname, START, minimum_value as minvalue, maximum_value as maxvalue, increment from qsys2.syssequences " +
 					"where current_schema='*LIBL' and sequence_schema in (select schema_name from qsys2.library_list_info) " +
 					"or sequence_schema=current_schema";
 		}

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

@@ -81,7 +81,6 @@
 import org.hibernate.exception.spi.SQLExceptionConverter;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.loader.ast.spi.MultiKeyLoadSizingStrategy;
 import org.hibernate.mapping.CheckConstraint;
@@ -228,6 +227,7 @@
 import static org.hibernate.internal.util.MathHelper.ceilingPowerOfTwo;
 import static org.hibernate.internal.util.StringHelper.isBlank;
 import static org.hibernate.internal.util.StringHelper.isEmpty;
+import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 import static org.hibernate.internal.util.StringHelper.splitAtCommas;
 import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_STRING_ARRAY;
 import static org.hibernate.sql.ast.internal.NonLockingClauseStrategy.NON_CLAUSE_STRATEGY;
@@ -5223,9 +5223,12 @@ public static String addUseIndexQueryHint(String query, String hints) {
 		if ( matcher.matches() && matcher.groupCount() > 1 ) {
 			final String startToken = matcher.group(1);
 			// Null if there is no join in the query
-			final String joinToken = Objects.toString( matcher.group(2), "" );
+			final String joinToken = matcher.group(2);
 			final String endToken = matcher.group(3);
-			return startToken + " use index (" + hints + ") " + joinToken + endToken;
+			return startToken
+					+ " use index (" + hints + ") "
+					+ ( joinToken == null ? "" : joinToken )
+					+ endToken;
 		}
 		else {
 			return query;
@@ -5243,7 +5246,7 @@ protected String prependComment(String sql, String comment) {
 	 * Perform necessary character escaping on the text of the comment.
 	 */
 	public static String escapeComment(String comment) {
-		if ( StringHelper.isNotEmpty( comment ) ) {
+		if ( isNotEmpty( comment ) ) {
 			final String escaped = ESCAPE_CLOSING_COMMENT_PATTERN.matcher( comment ).replaceAll( "*\\\\/" );
 			return ESCAPE_OPENING_COMMENT_PATTERN.matcher( escaped ).replaceAll( "/\\\\*" );
 		}

hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentWriter.java

@@ -173,7 +173,8 @@ private void moveProcessingStateMachine() {
 				if ( this.processingStates.getCurrent().equals( JsonProcessingState.ARRAY ) ) {
 					this.processingStates.pop();
 				}
-				assert this.processingStates.pop().equals( JsonProcessingState.STARTING_ARRAY );
+				final JsonProcessingState arrayStart = this.processingStates.pop();
+				assert arrayStart.equals( JsonProcessingState.STARTING_ARRAY );
 				break;
 			case ENDING_OBJECT:
 				// when ending an object, we have one or two states.
@@ -185,7 +186,8 @@ private void moveProcessingStateMachine() {
 				if ( this.processingStates.getCurrent().equals( JsonProcessingState.OBJECT ) ) {
 					this.processingStates.pop();
 				}
-				assert this.processingStates.pop().equals( JsonProcessingState.STARTING_OBJECT );
+				final JsonProcessingState objectStart = this.processingStates.pop();
+				assert objectStart.equals( JsonProcessingState.STARTING_OBJECT );
 				break;
 			default:
 				//nothing to do for the other ones.