Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-18518 Using StringHelper to split versionString instead of regex parsing

This commit is contained in:
Tommy Svendsen 2024-08-29 08:25:05 +02:00 committed by Marco Belladelli
parent 9ac9637daa
commit d39ba13ee4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
View File

@ -17,8 +17,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.hibernate.Length;
import org.hibernate.LockOptions;
import org.hibernate.PessimisticLockException;
@ -214,12 +212,12 @@ public class MySQLDialect extends Dialect {
protected static DatabaseVersion createVersion(DialectResolutionInfo info, DatabaseVersion defaultVersion) {
final String versionString = info.getDatabaseVersion();
if ( versionString != null ) {
final Matcher matcher = Pattern.compile("^(\\d+)\\.(\\d+)\\.(\\d+).*").matcher(versionString);
if ( matcher.matches() && matcher.groupCount() >= 3 ) {
final String[] components = StringHelper.split(".-", versionString);
if ( components.length >= 3 ) {
try {
final int majorVersion = Integer.parseInt( matcher.group(1));
final int minorVersion = Integer.parseInt( matcher.group(2) );
final int patchLevel = Integer.parseInt( matcher.group(3) );
final int majorVersion = Integer.parseInt( components[0] );
final int minorVersion = Integer.parseInt( components[1] );
final int patchLevel = Integer.parseInt( components[2] );
return DatabaseVersion.make( majorVersion, minorVersion, patchLevel );
}
catch (NumberFormatException ex) {