SONAR-18583 Condition on schema when dropping constraints

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/sql/DropMsSQLDefaultConstraintsBuilder.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/sql/DropMsSQLDefaultConstraintsBuilder.java
index 95b082ac35e9f7bc1faa165a26f27ea52e39e10c..2cfbd2886e585a9f4c3c834d89b329960bcec61f 100644 (file)
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/sql/DropMsSQLDefaultConstraintsBuilder.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/sql/DropMsSQLDefaultConstraintsBuilder.java
@@ -80,8 +80,9 @@ public class DropMsSQLDefaultConstraintsBuilder {
       PreparedStatement pstmt = connection
         .prepareStatement(format("SELECT d.name FROM sys.tables t "
           + "JOIN sys.default_constraints d ON d.parent_object_id = t.object_id "
-          + "JOIN sys.columns c ON c.object_id = t.object_id AND c.column_id = d.parent_column_id  "
-          + "WHERE  t.name = '%s' AND c.name in (%s)", tableName, commaSeparatedListOfColumns));
+          + "JOIN sys.columns c ON c.object_id = t.object_id AND c.column_id = d.parent_column_id "
+          + "JOIN sys.schemas s ON s.schema_id = t.schema_id "
+          + "WHERE t.name = '%s' AND c.name in (%s) AND s.name = '%s'", tableName, commaSeparatedListOfColumns, connection.getSchema()));
       ResultSet rs = pstmt.executeQuery()) {
       while (rs.next()) {
         defaultConstrainNames.add(rs.getString(1));