Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
4b5a3f4f
Commit
4b5a3f4f
authored
Sep 07, 2020
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start building against Spring Framework 5.2.9 snapshots
See gh-23182
parent
611447c4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
8 deletions
+14
-8
FlywayAutoConfiguration.java
...rk/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+2
-1
SqlDialectLookup.java
...ngframework/boot/autoconfigure/jooq/SqlDialectLookup.java
+4
-2
DatabaseLookup.java
...gframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
+3
-2
pom.xml
spring-boot-project/spring-boot-dependencies/pom.xml
+1
-1
AbstractDataSourceInitializer.java
...ingframework/boot/jdbc/AbstractDataSourceInitializer.java
+4
-2
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View file @
4b5a3f4f
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
flyway
;
package
org
.
springframework
.
boot
.
autoconfigure
.
flyway
;
import
java.sql.DatabaseMetaData
;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.HashSet
;
...
@@ -385,7 +386,7 @@ public class FlywayAutoConfiguration {
...
@@ -385,7 +386,7 @@ public class FlywayAutoConfiguration {
private
DatabaseDriver
getDatabaseDriver
()
{
private
DatabaseDriver
getDatabaseDriver
()
{
try
{
try
{
String
url
=
JdbcUtils
.
extractDatabaseMetaData
(
this
.
dataSource
,
"getURL"
);
String
url
=
JdbcUtils
.
extractDatabaseMetaData
(
this
.
dataSource
,
DatabaseMetaData:
:
getURL
);
return
DatabaseDriver
.
fromJdbcUrl
(
url
);
return
DatabaseDriver
.
fromJdbcUrl
(
url
);
}
}
catch
(
MetaDataAccessException
ex
)
{
catch
(
MetaDataAccessException
ex
)
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java
View file @
4b5a3f4f
/*
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -16,6 +16,8 @@
...
@@ -16,6 +16,8 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
jooq
;
package
org
.
springframework
.
boot
.
autoconfigure
.
jooq
;
import
java.sql.DatabaseMetaData
;
import
javax.sql.DataSource
;
import
javax.sql.DataSource
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.Log
;
...
@@ -49,7 +51,7 @@ final class SqlDialectLookup {
...
@@ -49,7 +51,7 @@ final class SqlDialectLookup {
return
SQLDialect
.
DEFAULT
;
return
SQLDialect
.
DEFAULT
;
}
}
try
{
try
{
String
url
=
JdbcUtils
.
extractDatabaseMetaData
(
dataSource
,
"getURL"
);
String
url
=
JdbcUtils
.
extractDatabaseMetaData
(
dataSource
,
DatabaseMetaData:
:
getURL
);
SQLDialect
sqlDialect
=
JDBCUtils
.
dialect
(
url
);
SQLDialect
sqlDialect
=
JDBCUtils
.
dialect
(
url
);
if
(
sqlDialect
!=
null
)
{
if
(
sqlDialect
!=
null
)
{
return
sqlDialect
;
return
sqlDialect
;
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
View file @
4b5a3f4f
/*
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
orm
.
jpa
;
package
org
.
springframework
.
boot
.
autoconfigure
.
orm
.
jpa
;
import
java.sql.DatabaseMetaData
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.EnumMap
;
import
java.util.EnumMap
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -70,7 +71,7 @@ final class DatabaseLookup {
...
@@ -70,7 +71,7 @@ final class DatabaseLookup {
return
Database
.
DEFAULT
;
return
Database
.
DEFAULT
;
}
}
try
{
try
{
String
url
=
JdbcUtils
.
extractDatabaseMetaData
(
dataSource
,
"getURL"
);
String
url
=
JdbcUtils
.
extractDatabaseMetaData
(
dataSource
,
DatabaseMetaData:
:
getURL
);
DatabaseDriver
driver
=
DatabaseDriver
.
fromJdbcUrl
(
url
);
DatabaseDriver
driver
=
DatabaseDriver
.
fromJdbcUrl
(
url
);
Database
database
=
LOOKUP
.
get
(
driver
);
Database
database
=
LOOKUP
.
get
(
driver
);
if
(
database
!=
null
)
{
if
(
database
!=
null
)
{
...
...
spring-boot-project/spring-boot-dependencies/pom.xml
View file @
4b5a3f4f
...
@@ -191,7 +191,7 @@
...
@@ -191,7 +191,7 @@
<spring-batch.version>
4.2.4.RELEASE
</spring-batch.version>
<spring-batch.version>
4.2.4.RELEASE
</spring-batch.version>
<spring-cloud-connectors.version>
2.0.7.RELEASE
</spring-cloud-connectors.version>
<spring-cloud-connectors.version>
2.0.7.RELEASE
</spring-cloud-connectors.version>
<spring-data-releasetrain.version>
Moore-SR9
</spring-data-releasetrain.version>
<spring-data-releasetrain.version>
Moore-SR9
</spring-data-releasetrain.version>
<spring-framework.version>
5.2.
8.RELEASE
</spring-framework.version>
<spring-framework.version>
5.2.
9.BUILD-SNAPSHOT
</spring-framework.version>
<spring-hateoas.version>
1.0.5.RELEASE
</spring-hateoas.version>
<spring-hateoas.version>
1.0.5.RELEASE
</spring-hateoas.version>
<spring-integration.version>
5.2.8.RELEASE
</spring-integration.version>
<spring-integration.version>
5.2.8.RELEASE
</spring-integration.version>
<spring-kafka.version>
2.3.10.RELEASE
</spring-kafka.version>
<spring-kafka.version>
2.3.10.RELEASE
</spring-kafka.version>
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/AbstractDataSourceInitializer.java
View file @
4b5a3f4f
/*
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -16,6 +16,8 @@
...
@@ -16,6 +16,8 @@
package
org
.
springframework
.
boot
.
jdbc
;
package
org
.
springframework
.
boot
.
jdbc
;
import
java.sql.DatabaseMetaData
;
import
javax.annotation.PostConstruct
;
import
javax.annotation.PostConstruct
;
import
javax.sql.DataSource
;
import
javax.sql.DataSource
;
...
@@ -87,7 +89,7 @@ public abstract class AbstractDataSourceInitializer {
...
@@ -87,7 +89,7 @@ public abstract class AbstractDataSourceInitializer {
protected
String
getDatabaseName
()
{
protected
String
getDatabaseName
()
{
try
{
try
{
String
productName
=
JdbcUtils
.
commonDatabaseName
(
String
productName
=
JdbcUtils
.
commonDatabaseName
(
JdbcUtils
.
extractDatabaseMetaData
(
this
.
dataSource
,
"getDatabaseProductName"
).
toString
(
));
JdbcUtils
.
extractDatabaseMetaData
(
this
.
dataSource
,
DatabaseMetaData:
:
getDatabaseProductName
));
DatabaseDriver
databaseDriver
=
DatabaseDriver
.
fromProductName
(
productName
);
DatabaseDriver
databaseDriver
=
DatabaseDriver
.
fromProductName
(
productName
);
if
(
databaseDriver
==
DatabaseDriver
.
UNKNOWN
)
{
if
(
databaseDriver
==
DatabaseDriver
.
UNKNOWN
)
{
throw
new
IllegalStateException
(
"Unable to detect database type"
);
throw
new
IllegalStateException
(
"Unable to detect database type"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment