Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source 
# Conflicts:
#	spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
This commit is contained in:
Juergen Hoeller
2024-03-19 10:06:48 +01:00
parent 8f56b4a8ae bd27ddf83a
commit e58ea0d945
58 changed files with 322 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -88,6 +88,10 @@ public final class CallMetaDataProviderFactory {
try {
return JdbcUtils.extractDatabaseMetaData(dataSource, databaseMetaData -> {
String databaseProductName = JdbcUtils.commonDatabaseName(databaseMetaData.getDatabaseProductName());
if (databaseProductName == null) {
databaseProductName = "";
}
boolean accessProcedureColumnMetaData = context.isAccessCallParameterMetaData();
if (context.isFunction()) {
if (!supportedDatabaseProductsForFunctions.contains(databaseProductName)) {

2
spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
View File

@@ -437,7 +437,7 @@ public class TableMetaDataContext {
this.quoting = StringUtils.hasText(identifierQuoteString);
}
public void appendTo(StringBuilder stringBuilder, String item) {
public void appendTo(StringBuilder stringBuilder, @Nullable String item) {
if (this.quoting) {
stringBuilder.append(this.identifierQuoteString)
.append(item).append(this.identifierQuoteString);

7
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -84,8 +84,9 @@ public class EmbeddedDatabaseFactoryBean extends EmbeddedDatabaseFactory
@Override
public void destroy() {
if (this.databaseCleaner != null && getDataSource() != null) {
DatabasePopulatorUtils.execute(this.databaseCleaner, getDataSource());
DatabasePopulator cleaner = this.databaseCleaner;
if (cleaner != null && getDataSource() != null) {
DatabasePopulatorUtils.execute(cleaner, getDataSource());
}
shutdownDatabase();
}