diff options
| author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2015-04-17 15:14:51 +0200 |
|---|---|---|
| committer | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2015-04-17 15:24:55 +0200 |
| commit | f1793ad0c7b6ce5d8847f921cb4abcbf966d2728 (patch) | |
| tree | 99f7cfb5d5aaab7c063f5e28349096ed14a1bd13 /server | |
| parent | 76c0f10693e69f1f943f368252019c7bb0777649 (diff) | |
| download | sonarqube-f1793ad0c7b6ce5d8847f921cb4abcbf966d2728.tar.gz sonarqube-f1793ad0c7b6ce5d8847f921cb4abcbf966d2728.zip | |
cancel test_data migration in file_sources
Diffstat (limited to 'server')
13 files changed, 2 insertions, 49 deletions
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/select_module_files_tree.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/select_module_files_tree.xml index 0bfa9cfb70c..20e8797e9d4 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/select_module_files_tree.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/select_module_files_tree.xml @@ -21,7 +21,6 @@ <file_sources id="101" project_uuid="ABCD" file_uuid="EFGHI" binary_data=",,,,,,,,,,,,,,,unchanged ,,,,,,,,,,,,,,,content " - test_data="[null]" line_hashes="lineEFGHI" data_hash="dataEFGHI" src_hash="srcEFGHI" @@ -49,7 +48,6 @@ <file_sources id="102" project_uuid="ABCD" file_uuid="HIJK" binary_data=",,,,,,,,,,,,,,,unchanged ,,,,,,,,,,,,,,,content " - test_data="[null]" line_hashes="lineHIJK" data_hash="dataHIJK" src_hash="srcHIJK" diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/SourceLinesCacheTest/load_data.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/SourceLinesCacheTest/load_data.xml index e8f6721099f..24e4d0c14d0 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/SourceLinesCacheTest/load_data.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/SourceLinesCacheTest/load_data.xml @@ -6,7 +6,6 @@ --> <file_sources id="1" file_uuid="FILE_A" project_uuid="PROJECT_A" binary_data="" - test_data="[null]" line_hashes="8d7b3d6b83c0a517eac07e1aac94b773 9a0364b9e99bb480dd25e1f0284c8555" data_hash="0263047cd758c68c27683625f072f010" src_hash="123456" diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexSourceLinesStepTest/index_source.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexSourceLinesStepTest/index_source.xml index bfa7d651386..62401136eb3 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexSourceLinesStepTest/index_source.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexSourceLinesStepTest/index_source.xml @@ -2,7 +2,6 @@ <file_sources id="101" project_uuid="ABCD" file_uuid="FILE1_UUID" binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - test_data="[null]" created_at="1500000000000" updated_at="0"/> <file_sources id="102" project_uuid="DCBA" file_uuid="FILE2_UUID" diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/insert-result.xml index 67fb0ae86e7..74bca5ec788 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/insert-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/insert-result.xml @@ -2,7 +2,6 @@ <file_sources id="101" project_uuid="PRJ_UUID" file_uuid="FILE1_UUID" binary_data="abcde" data_hash="hash" - test_data="[null]" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" created_at="1500000000000" updated_at="1500000000000" /> @@ -10,7 +9,6 @@ <file_sources id="102" project_uuid="PRJ_UUID" file_uuid="FILE2_UUID" binary_data="[ignore]" - test_data="[null]" data_hash="FILE2_DATA_HASH" line_hashes="LINE1_HASH\nLINE2_HASH" src_hash="FILE2_HASH" diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/shared.xml index c04c92d5c9b..79a340f841d 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/shared.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/shared.xml @@ -2,7 +2,6 @@ <file_sources id="101" project_uuid="PRJ_UUID" file_uuid="FILE1_UUID" binary_data="abcde" data_hash="hash" - test_data="[null]" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" created_at="1500000000000" updated_at="1500000000000" /> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update-result.xml index 2d71f379cf2..40cbfa91a43 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update-result.xml @@ -2,7 +2,6 @@ <file_sources id="101" project_uuid="PRJ_UUID" file_uuid="FILE1_UUID" binary_data="[ignore]" - test_data="[null]" data_hash="NEW_DATA_HASH" line_hashes="NEW_LINE_HASHES" src_hash="NEW_FILE_HASH" diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml index 0450883e306..931bab04e18 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml @@ -3,19 +3,16 @@ <!-- Updated --> <file_sources id="101" project_uuid="ABCD" file_uuid="FILE1_UUID" binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - test_data="[null]" created_at="1500000000000" updated_at="1500000000002"/> <!-- Not updated because updated_at is not null --> <file_sources id="102" project_uuid="ABCD" file_uuid="FILE2_UUID" binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - test_data="[null]" created_at="1500000000000" updated_at="1500000000000"/> <!-- Not updated because on another project --> <file_sources id="103" project_uuid="BCDE" file_uuid="FILE3_UUID" binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - test_data="[null]" created_at="1500000000000" updated_at="0"/> </dataset> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml index 5444e33435f..9782d5c3837 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml @@ -3,17 +3,14 @@ <!-- Only this source should be updated --> <file_sources id="101" project_uuid="ABCD" file_uuid="FILE1_UUID" binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - test_data="[null]" created_at="1500000000000" updated_at="0"/> <file_sources id="102" project_uuid="ABCD" file_uuid="FILE2_UUID" binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - test_data="[null]" created_at="1500000000000" updated_at="1500000000000"/> <file_sources id="103" project_uuid="BCDE" file_uuid="FILE3_UUID" binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - test_data="[null]" created_at="1500000000000" updated_at="0"/> </dataset> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/schema.sql index abfc5bbcd87..859eefe3625 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/schema.sql +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/schema.sql @@ -4,7 +4,6 @@ CREATE TABLE "FILE_SOURCES" ( "PROJECT_UUID" VARCHAR(50) NOT NULL, "FILE_UUID" VARCHAR(50) NOT NULL, "BINARY_DATA" BINARY(167772150), - "TEST_DATA" BINARY(167772150), "DATA_HASH" VARCHAR(50) NOT NULL, "CREATED_AT" BIGINT NOT NULL, "UPDATED_AT" BIGINT NOT NULL diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/shared.xml index caba05c55b6..f56c7f5a796 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/shared.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/shared.xml @@ -1,6 +1,6 @@ <dataset> <file_sources id="1" project_uuid="P1" file_uuid="F1" created_at="1416238020000" updated_at="1416239042000" - binary_data="" test_data="[null]" data_hash="" /> + binary_data="" data_hash="" /> </dataset> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceLineIndexerTest/db.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceLineIndexerTest/db.xml index 4ed570abc88..48e58478ab6 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceLineIndexerTest/db.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceLineIndexerTest/db.xml @@ -1,6 +1,6 @@ <dataset> <file_sources id="1" project_uuid="PROJECT_UUID" file_uuid="FILE_UUID" created_at="1416238020000" updated_at="1416239042000" - binary_data="" test_data="[null]" data_hash="DATA_HASH" /> + binary_data="" data_hash="DATA_HASH" /> </dataset> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml index baf6790601a..4dcc5c21ee0 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml @@ -6,7 +6,6 @@ <file_sources id="101" project_uuid="ABCD" file_uuid="CDEF" binary_data="" data_hash="hash" - test_data="[null]" line_hashes="987654" src_hash="12345" created_at="1414597442000" updated_at="1414683842000"/> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/909_add_file_sources_test_data.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/909_add_file_sources_test_data.rb deleted file mode 100644 index 134ee56b27b..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/909_add_file_sources_test_data.rb +++ /dev/null @@ -1,31 +0,0 @@ -# -# 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 -# SONAR-6255 -# -class AddFileSourcesTestData < ActiveRecord::Migration - - def self.up - add_column 'file_sources', 'test_data', :binary, :null => true - end - -end |