Add column LOCATIONS to db table ISSUES

17 files changed, 71 insertions, 13 deletions

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml
index a4c029b4606..b2765988177 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml
@@ -26,6 +26,7 @@
       issue_close_date="[null]"
       created_at="1300000000000"
       updated_at="1400000000000"
+      locations="[null]"
       />
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/insert_new_issue-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/insert_new_issue-result.xml
index 7c0c5c10d55..d114f261b49 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/insert_new_issue-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/insert_new_issue-result.xml
@@ -26,6 +26,7 @@
       issue_close_date="[null]"
       created_at="1400000000000"
       updated_at="1400000000000"
+      locations="[null]"
       />
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml
index 3cee2f8e087..263f957b384 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml
@@ -38,6 +38,7 @@
       issue_close_date="[null]"
       created_at="1300000000000"
       updated_at="1300000000000"
+      locations="[null]"
       />
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
index 48631f4bb0f..3db758bb13b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
@@ -19,6 +19,7 @@
           issue_creation_date="1368878400000"
           issue_update_date="1368878400000"
           issue_close_date="1368878400000"
+          locations="[null]"
     />
 
   <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml
index 58a27702be5..8d08984e61d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml
@@ -29,5 +29,6 @@
           issue_creation_date="1115848800000"
           issue_update_date="1368828000000"
           issue_close_date="[null]"
+          locations="[null]"
     />
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml
index 5f4ddaca1a1..76ef67e4569 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml
@@ -31,5 +31,6 @@
           issue_creation_date="1115848800000"
           issue_update_date="1368878400000"
           issue_close_date="[null]"
+          locations="[null]"
     />
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
index 170a3b210cc..f5ffd879c45 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
@@ -24,6 +24,7 @@
           issue_creation_date="1368878400000"
           issue_update_date="1368878400000"
           issue_close_date="1368878400000"
+          locations="[null]"
     />
 
   <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
index 61c625b7bcb..613f21bef9b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
@@ -24,5 +24,6 @@
           issue_creation_date="1262300400000"
           issue_update_date="1265065200000"
           issue_close_date="[null]"
+          locations="[null]"
     />
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
index b63e969de7f..29ff12edfe0 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
@@ -19,6 +19,7 @@
           issue_creation_date="1368878400000"
           issue_update_date="1368878400000"
           issue_close_date="1368878400000"
+          locations="[null]"
       />
 
   <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
index f0fc706f0fc..be8f39e9bce 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
@@ -24,6 +24,7 @@
           issue_creation_date="1368878400000"
           issue_update_date="1368878400000"
           issue_close_date="1368878400000"
+          locations="[null]"
       />
 
   <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
index 4bac34f1908..5ac4459b439 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
@@ -30,5 +30,6 @@
           issue_creation_date="1262300400000"
           issue_update_date="1265065200000"
           issue_close_date="[null]"
+          locations="[null]"
       />
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml
index d7e82dde47c..1277674a21f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml
@@ -32,5 +32,6 @@
           issue_creation_date="1115848800000"
           issue_update_date="1368828000000"
           issue_close_date="[null]"
+          locations="[null]"
       />
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_directory_path.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_directory_path.xml
index 9440a8227a4..939428fa0d5 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_directory_path.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_directory_path.xml
@@ -32,7 +32,8 @@
       updated_at="1400000000000"
       issue_creation_date="1115848800000"
       issue_update_date="1356994800000"
-      issue_close_date="[null]"/>
+      issue_close_date="[null]"
+      locations="[null]"/>
 
   <issues
       id="2"
@@ -59,7 +60,8 @@
       updated_at="1450000000000"
       issue_creation_date="1115848800000"
       issue_update_date="1368828000000"
-      issue_close_date="[null]"/>
+      issue_close_date="[null]"
+      locations="[null]"/>
 
   <issues
       id="3"
@@ -86,7 +88,8 @@
       updated_at="1450000000000"
       issue_creation_date="1115848800000"
       issue_update_date="1368828000000"
-      issue_close_date="[null]"/>
+      issue_close_date="[null]"
+      locations="[null]"/>
 
   <issues
       id="4"
@@ -113,6 +116,7 @@
       updated_at="1450000000000"
       issue_creation_date="1115848800000"
       issue_update_date="1368828000000"
-      issue_close_date="[null]"/>
+      issue_close_date="[null]"
+      locations="[null]"/>
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_file_path.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_file_path.xml
index 9440a8227a4..939428fa0d5 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_file_path.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_file_path.xml
@@ -32,7 +32,8 @@
       updated_at="1400000000000"
       issue_creation_date="1115848800000"
       issue_update_date="1356994800000"
-      issue_close_date="[null]"/>
+      issue_close_date="[null]"
+      locations="[null]"/>
 
   <issues
       id="2"
@@ -59,7 +60,8 @@
       updated_at="1450000000000"
       issue_creation_date="1115848800000"
       issue_update_date="1368828000000"
-      issue_close_date="[null]"/>
+      issue_close_date="[null]"
+      locations="[null]"/>
 
   <issues
       id="3"
@@ -86,7 +88,8 @@
       updated_at="1450000000000"
       issue_creation_date="1115848800000"
       issue_update_date="1368828000000"
-      issue_close_date="[null]"/>
+      issue_close_date="[null]"
+      locations="[null]"/>
 
   <issues
       id="4"
@@ -113,6 +116,7 @@
       updated_at="1450000000000"
       issue_creation_date="1115848800000"
       issue_update_date="1368828000000"
-      issue_close_date="[null]"/>
+      issue_close_date="[null]"
+      locations="[null]"/>
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/one_issue.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/one_issue.xml
index c632c495a9e..f9cb45385b0 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/one_issue.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/one_issue.xml
@@ -32,6 +32,7 @@
       updated_at="1400000000000"
       issue_creation_date="1115848800000"
       issue_update_date="1356994800000"
-      issue_close_date="[null]"/>
+      issue_close_date="[null]"
+      locations="[null]"/>
 
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/shared.xml
index 52c576adc8a..417b2fdce4c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/shared.xml
@@ -32,7 +32,9 @@
     updated_at="1400000000000"
     issue_creation_date="1115848800000"
     issue_update_date="1356994800000"
-    issue_close_date="[null]"/>
+    issue_close_date="[null]"
+    locations="[null]"
+    />
 
   <issues
     id="2"
@@ -59,7 +61,9 @@
     updated_at="1400000000000"
     issue_creation_date="1115848800000"
     issue_update_date="1356994800000"
-    issue_close_date="[null]"/>
+    issue_close_date="[null]"
+    locations="[null]"
+    />
 
   <issues
     id="3"
@@ -86,7 +90,8 @@
     updated_at="1450000000000"
     issue_creation_date="1115848800000"
     issue_update_date="1368828000000"
-    issue_close_date="[null]"/>
+    issue_close_date="[null]"
+    locations="[null]"/>
 
   <issues
     id="4"
@@ -113,6 +118,8 @@
     updated_at="1400000000000"
     issue_creation_date="1115848800000"
     issue_update_date="1356994800000"
-    issue_close_date="[null]"/>
+    issue_close_date="[null]"
+    locations="[null]"
+    />
 
 </dataset>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/927_add_issues_locations.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/927_add_issues_locations.rb
new file mode 100644
index 00000000000..b97dabe36cb
--- /dev/null
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/927_add_issues_locations.rb
@@ -0,0 +1,30 @@
+#
+# SonarQube, open source software quality management tool.
+# Copyright (C) 2008-2014 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# SonarQube is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# SonarQube is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+
+#
+# SonarQube 5.2
+#
+class AddIssuesLocations < ActiveRecord::Migration
+
+  def self.up
+    add_column 'issues', 'locations', :binary, :null => true
+  end
+
+end