Fix #2679 Support SQL Server Integrated Security

flyway · Feb 19, 2020 · 585eb38 · 585eb38
1 parent ea1db69
commit 585eb38
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java b/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java
@@ -460,6 +460,9 @@ private static boolean needsUser(String url) {
         if (DriverDataSource.DriverType.SNOWFLAKE.matches(url)) {
             return !url.contains("user=");
         }
+        if (DriverDataSource.DriverType.SQLSERVER.matches(url)) {
+            return !url.contains("integratedSecurity=");
+        }
         return true;
     }
 
@@ -471,6 +474,9 @@ private static boolean needsPassword(String url) {
         if (DriverDataSource.DriverType.SNOWFLAKE.matches(url)) {
             return !url.contains("private_key_file=");
         }
+        if (DriverDataSource.DriverType.SQLSERVER.matches(url)) {
+            return !url.contains("integratedSecurity=");
+        }
         return true;
     }
 

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/jdbc/JdbcUtils.java b/flyway-core/src/main/java/org/flywaydb/core/internal/jdbc/JdbcUtils.java
@@ -55,6 +55,11 @@ public static Connection openConnection(DataSource dataSource, int connectRetrie
             try {
                 return dataSource.getConnection();
             } catch (SQLException e) {
+                if ("08S01".equals(e.getSQLState()) && e.getMessage().contains("This driver is not configured for integrated authentication")) {
+                    throw new FlywaySqlException("Unable to obtain connection from database"
+                            + getDataSourceInfo(dataSource) + ": " + e.getMessage() + "\nTo setup integrated authentication see https://flywaydb.org/documentation/database/sqlserver#windows-authentication.", e);
+                }
+
                 if (++retries > connectRetries) {
                     throw new FlywaySqlException("Unable to obtain connection from database"
                             + getDataSourceInfo(dataSource) + ": " + e.getMessage(), e);