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
3a15287c
Commit
3a15287c
authored
Feb 08, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix detection for Microsoft SQL Server
Closes gh-8222
parent
9247cd9c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
DatabaseDriver.java
...in/java/org/springframework/boot/jdbc/DatabaseDriver.java
+2
-2
DatabaseDriverTests.java
...va/org/springframework/boot/jdbc/DatabaseDriverTests.java
+2
-2
No files found.
spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
View file @
3a15287c
/*
* Copyright 2012-201
6
the original author or authors.
* Copyright 2012-201
7
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.
...
...
@@ -100,7 +100,7 @@ public enum DatabaseDriver {
/**
* SQL Server.
*/
SQLSERVER
(
"
SQL SERVER
"
,
"com.microsoft.sqlserver.jdbc.SQLServerDriver"
,
SQLSERVER
(
"
Microsoft SQL Server
"
,
"com.microsoft.sqlserver.jdbc.SQLServerDriver"
,
"com.microsoft.sqlserver.jdbc.SQLServerXADataSource"
,
"SELECT 1"
),
/**
...
...
spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java
View file @
3a15287c
/*
* Copyright 2012-201
6
the original author or authors.
* Copyright 2012-201
7
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,7 +84,7 @@ public class DatabaseDriverTests {
.
isEqualTo
(
DatabaseDriver
.
ORACLE
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"PostgreSQL"
))
.
isEqualTo
(
DatabaseDriver
.
POSTGRESQL
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"
SQL SERVER
"
))
assertThat
(
DatabaseDriver
.
fromProductName
(
"
Microsoft SQL Server
"
))
.
isEqualTo
(
DatabaseDriver
.
SQLSERVER
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"DB2"
)).
isEqualTo
(
DatabaseDriver
.
DB2
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"Firebird 2.5.WI"
))
...
...
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