From 51a28630d30fed8e5f12e598e31cedefcf70006f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Mon, 14 Jan 2019 18:02:45 +0100 Subject: [PATCH] SONAR-11631 add SNAPSHOTS.PROJECT_VERSION --- .../org/sonar/db/version/schema-h2.ddl | 1 + .../shouldDeleteResource.xml | 1 + .../shouldDeleteSnapshot-result.xml | 1 + .../shouldDeleteSnapshot.xml | 2 + ...stedMeasuresWhenPurgingAnalysis-result.xml | 1 + ...eleteWastedMeasuresWhenPurgingAnalysis.xml | 1 + .../shouldPurgeAnalysis-result.xml | 2 + .../PurgeCommandsTest/shouldPurgeAnalysis.xml | 2 + .../shouldDeleteAbortedBuilds-result.xml | 2 + .../shouldDeleteAbortedBuilds.xml | 3 + .../shouldDeleteAnalyses-result.xml | 2 + .../PurgeDaoTest/shouldDeleteAnalyses.xml | 3 + ...oricalDataOfDirectoriesAndFiles-result.xml | 2 + ...eteHistoricalDataOfDirectoriesAndFiles.xml | 2 + .../PurgeDaoTest/shouldDeleteProject.xml | 1 + .../shouldPurgeProject-result.xml | 3 + .../purge/PurgeDaoTest/shouldPurgeProject.xml | 3 + .../shouldSelectPurgeableAnalysis.xml | 5 ++ .../v77/AddProjectVersionToSnapshot.java | 48 ++++++++++++++++ .../db/migration/version/v77/DbVersion77.java | 3 +- .../v77/AddProjectVersionToSnapshotTest.java | 57 +++++++++++++++++++ .../version/v77/DbVersion77Test.java | 2 +- .../snapshots.sql | 28 +++++++++ 23 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v77/AddProjectVersionToSnapshot.java create mode 100644 server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v77/AddProjectVersionToSnapshotTest.java create mode 100644 server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v77/AddProjectVersionToSnapshotTest/snapshots.sql diff --git a/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl b/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl index 1598855aa2d..cea2a5ea5e6 100644 --- a/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl +++ b/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl @@ -142,6 +142,7 @@ CREATE TABLE "SNAPSHOTS" ( "PURGE_STATUS" INTEGER, "ISLAST" BOOLEAN NOT NULL DEFAULT FALSE, "VERSION" VARCHAR(500), + "PROJECT_VERSION" VARCHAR(100), "PERIOD1_MODE" VARCHAR(100), "PERIOD1_PARAM" VARCHAR(100), "PERIOD1_DATE" BIGINT, diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteResource.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteResource.xml index 2b7cd7f7107..af7588f557e 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteResource.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteResource.xml @@ -42,6 +42,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingAnalysis.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingAnalysis.xml index d683a6acfe6..8bee951c35b 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingAnalysis.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingAnalysis.xml @@ -52,6 +52,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeAnalysis-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeAnalysis-result.xml index 9b8cfc57b26..e7651e44899 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeAnalysis-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeAnalysis-result.xml @@ -32,6 +32,7 @@ Note that measures, events and reviews are not deleted. created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -77,6 +78,7 @@ Snapshot 2 has been deleted created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml index 9acb701f9e9..99b17569bae 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml @@ -45,6 +45,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -72,6 +73,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -99,6 +101,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses-result.xml index 878595a3c80..bc8a1e2382e 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses-result.xml @@ -25,6 +25,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -52,6 +53,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses.xml index d4cdd256532..7aa4af52e0c 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses.xml @@ -25,6 +25,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -52,6 +53,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -79,6 +81,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml index e84a82ff99e..259be92616c 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml @@ -185,6 +185,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -94,6 +95,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -121,6 +123,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml index 4590dc6260b..7362c125b54 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml @@ -65,6 +65,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -93,6 +94,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -120,6 +122,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldSelectPurgeableAnalysis.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldSelectPurgeableAnalysis.xml index e1c341d36b0..48931a146e0 100644 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldSelectPurgeableAnalysis.xml +++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldSelectPurgeableAnalysis.xml @@ -25,6 +25,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -52,6 +53,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -79,6 +81,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -106,6 +109,7 @@ created_at="1228222680000" build_date="1228222680000" version="[null]" + project_version="[null]" /> @@ -133,6 +137,7 @@ created_at="1228222680000" build_date="1228222680000" version="V5" + project_version="[null]" />