From 48b5c8e590b498c3cfa5070a277b3f7200c67a7f Mon Sep 17 00:00:00 2001 From: David Gageot Date: Fri, 4 May 2012 17:00:27 +0200 Subject: SONAR-1927 Dashboards are global instead of detached --- .../src/main/java/org/sonar/core/dashboard/DashboardDto.java | 10 +++++----- .../org/sonar/core/dashboard/DashboardMapper-oracle.xml | 6 +++--- .../resources/org/sonar/core/dashboard/DashboardMapper.xml | 6 +++--- .../main/resources/org/sonar/core/persistence/schema-derby.ddl | 2 +- .../test/java/org/sonar/core/dashboard/DashboardDaoTest.java | 2 ++ .../core/dashboard/DashboardDaoTest/shouldInsert-result.xml | 2 +- .../shouldInsertWithNullableColumns-result.xml | 2 +- .../dashboard/DashboardDaoTest/shouldSelectGlobalDashboard.xml | 2 -- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'sonar-core') diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/DashboardDto.java b/sonar-core/src/main/java/org/sonar/core/dashboard/DashboardDto.java index 4b5c2136fcb..5365786f7ff 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/DashboardDto.java +++ b/sonar-core/src/main/java/org/sonar/core/dashboard/DashboardDto.java @@ -33,7 +33,7 @@ public final class DashboardDto { private String description; private String columnLayout; private boolean shared; - private boolean detached; + private boolean global; private Date createdAt; private Date updatedAt; private List widgetDtos = Lists.newArrayList(); @@ -92,12 +92,12 @@ public final class DashboardDto { return this; } - public boolean getDetached() { - return detached; + public boolean getGlobal() { + return global; } - public DashboardDto setDetached(boolean detached) { - this.detached = detached; + public DashboardDto setGlobal(boolean global) { + this.global = global; return this; } diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper-oracle.xml index 234105361aa..c31679db232 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper-oracle.xml @@ -4,7 +4,7 @@ @@ -12,9 +12,9 @@ select dashboards_seq.NEXTVAL from DUAL - INSERT INTO dashboards (id, user_id, name, description, column_layout, shared, detached, created_at, updated_at) + INSERT INTO dashboards (id, user_id, name, description, column_layout, shared, is_global, created_at, updated_at) VALUES (#{id}, #{userId, jdbcType=FLOAT}, #{name, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, - #{columnLayout, jdbcType=INTEGER}, #{shared}, #{detached}, #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}) + #{columnLayout, jdbcType=INTEGER}, #{shared}, #{global}, #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}) diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml b/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml index 26f977c3275..00e32a3785f 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml @@ -4,14 +4,14 @@ - INSERT INTO dashboards (user_id, name, description, column_layout, shared, detached, created_at, updated_at) + INSERT INTO dashboards (user_id, name, description, column_layout, shared, is_global, created_at, updated_at) VALUES (#{userId, jdbcType=FLOAT}, #{name, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, - #{columnLayout, jdbcType=INTEGER}, #{shared}, #{detached}, #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}) + #{columnLayout, jdbcType=INTEGER}, #{shared}, #{global}, #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}) diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl index 527c103da98..01c32cb84a8 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl @@ -413,7 +413,7 @@ CREATE TABLE "DASHBOARDS" ( "DESCRIPTION" VARCHAR(1000), "COLUMN_LAYOUT" VARCHAR(20), "SHARED" BOOLEAN, - "DETACHED" BOOLEAN, + "IS_GLOBAL" BOOLEAN, "CREATED_AT" TIMESTAMP, "UPDATED_AT" TIMESTAMP ); diff --git a/sonar-core/src/test/java/org/sonar/core/dashboard/DashboardDaoTest.java b/sonar-core/src/test/java/org/sonar/core/dashboard/DashboardDaoTest.java index 1988e73bf50..36b464f6778 100644 --- a/sonar-core/src/test/java/org/sonar/core/dashboard/DashboardDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/dashboard/DashboardDaoTest.java @@ -60,6 +60,7 @@ public class DashboardDaoTest extends DaoTestCase { dashboardDto.setDescription("This is a dashboard"); dashboardDto.setColumnLayout("100%"); dashboardDto.setShared(true); + dashboardDto.setGlobal(true); dashboardDto.setCreatedAt(aDate); dashboardDto.setUpdatedAt(aDate); @@ -94,6 +95,7 @@ public class DashboardDaoTest extends DaoTestCase { dashboardDto.setDescription(null); dashboardDto.setColumnLayout(null); dashboardDto.setShared(true); + dashboardDto.setGlobal(false); dashboardDto.setCreatedAt(null); dashboardDto.setUpdatedAt(null); diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldInsert-result.xml index 9654b21fad7..68bd31b0ba2 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldInsert-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldInsert-result.xml @@ -7,7 +7,7 @@ description="This is a dashboard" column_layout="100%" shared="[true]" - detached="[false]" + is_global="[true]" /> diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldSelectGlobalDashboard.xml b/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldSelectGlobalDashboard.xml index ac1a6f041a6..110e760f9ad 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldSelectGlobalDashboard.xml +++ b/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldSelectGlobalDashboard.xml @@ -7,7 +7,6 @@ description="User SQALE dashboard" column_layout="100%" shared="[true]" - detached="[false]" /> -- cgit v1.2.3