Browse Source

Merge pull request #4709 in CORE/base-third from release/11.0 to final/11.0

* commit '16b88e6b0bdd65ad5ac238589e0c2a45abd53b38':
  DEC-22165 fix: 移除pom.xml
  REPORT-63790 日志同步插件-check_table失败导致同步失败 1、catalog为空字符串会导致sqlserver的 sp_tables 语句无法执行
final/11.0
superman 3 years ago
parent
commit
6ce073557f
  1. 1
      build.third_step0.gradle
  2. 3
      fine-hibernate/src/main/java/com/fr/third/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java

1
build.third_step0.gradle

@ -173,6 +173,7 @@ task unpackEssential(type:Copy) {
for (File file : configurations.essential.files) { for (File file : configurations.essential.files) {
from (zipTree(file)) { from (zipTree(file)) {
exclude "META-INF/versions/11/*" exclude "META-INF/versions/11/*"
exclude "META-INF/maven/com.zaxxer/**"
} }
} }
into classesDir into classesDir

3
fine-hibernate/src/main/java/com/fr/third/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java

@ -299,9 +299,6 @@ public class InformationExtractorJdbcDatabaseMetaDataImpl implements Information
// 2) look in default namespace // 2) look in default namespace
catalogFilter = toMetaDataObjectName( extractionContext.getDefaultCatalog() ); catalogFilter = toMetaDataObjectName( extractionContext.getDefaultCatalog() );
} }
else {
catalogFilter = "";
}
} }
else { else {
catalogFilter = toMetaDataObjectName( catalog ); catalogFilter = toMetaDataObjectName( catalog );

Loading…
Cancel
Save