SONAR-2602 remove the unused column RULES_PROFILES.ENABLED

9 files changed, 15 insertions, 15 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
index 754d5e973b6..8d7f02e6d08 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
@@ -35,7 +35,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 331;
+  public static final int LAST_VERSION = 332;
 
   public static enum Status {
     UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index 05b077452b2..f96ebf5ccc8 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
@@ -173,6 +173,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('320');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('321');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('330');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('331');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('332');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null);
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index 53e322fc449..6b469747ce3 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -71,7 +71,6 @@ CREATE TABLE "RULES_PROFILES" (
   "PROVIDED" BOOLEAN NOT NULL DEFAULT FALSE,
   "LANGUAGE" VARCHAR(16),
   "PARENT_NAME" VARCHAR(100),
-  "ENABLED" BOOLEAN NOT NULL DEFAULT TRUE,
   "VERSION" INTEGER DEFAULT 1,
   "USED_PROFILE" BOOLEAN DEFAULT FALSE
 );
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml
index ca00e8cb5c4..ed2f97ee294 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml
@@ -1,7 +1,7 @@
 <dataset>
 
-  <rules_profiles id="1" provided="true" name="profile one" default_profile="0" language="java" enabled="true"/>
-  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
-  <rules_profiles id="3" provided="true" name="profile three" default_profile="0" language="plsql" enabled="true"/>
+  <rules_profiles id="1" provided="true" name="profile one" default_profile="0" language="java"/>
+  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java"/>
+  <rules_profiles id="3" provided="true" name="profile three" default_profile="0" language="plsql"/>
 
 </dataset>
\ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml
index 0d8e296a25a..98922f49cc0 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml
@@ -6,8 +6,8 @@
   <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="REGULAR_EXPRESSION"/>
   <rules_parameters id="2" rule_id="1" name="param2" description="[null]" param_type="REGULAR_EXPRESSION"/>
 
-  <rules_profiles id="1" provided="true" name="profile1" default_profile="1" language="java" enabled="true"/>
-  <rules_profiles id="2" provided="true" name="profile2" default_profile="1" language="OTHER" enabled="true"/>
+  <rules_profiles id="1" provided="true" name="profile1" default_profile="1" language="java"/>
+  <rules_profiles id="2" provided="true" name="profile2" default_profile="1" language="OTHER"/>
 
   <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/>
   <active_rules id="2" profile_id="2" rule_id="1" failure_level="2"/>
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml
index 0a6b2ee0e2c..8bedbeca82b 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml
@@ -6,8 +6,8 @@
   <rules_parameters id="1" rule_id="1" name="param1" description="foo" param_type="REGULAR_EXPRESSION"/>
   <rules_parameters id="2" rule_id="1" name="param2" description="foo" param_type="REGULAR_EXPRESSION"/>
 
-  <rules_profiles id="1" provided="true" name="profile1" default_profile="1" language="java" enabled="true"/>
-  <rules_profiles id="2" provided="true" name="profile2" default_profile="1" language="OTHER" enabled="true"/>
+  <rules_profiles id="1" provided="true" name="profile1" default_profile="1" language="java"/>
+  <rules_profiles id="2" provided="true" name="profile2" default_profile="1" language="OTHER"/>
 
   <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/>
   <active_rules id="2" profile_id="2" rule_id="1" failure_level="2"/>
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml
index 394b84a7374..489fca92c1b 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml
@@ -1,7 +1,7 @@
 <dataset>
 
-  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>
-  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
+  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java"/>
+  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java"/>
 
   <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"
          plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml
index 107805b86f2..00226391488 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml
@@ -1,7 +1,7 @@
 <dataset>
 
-  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>
-  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
+  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" />
+  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" />
 
   <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"
          plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml
index 394b84a7374..d0334e987f0 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml
@@ -1,7 +1,7 @@
 <dataset>
 
-  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>
-  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
+  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" />
+  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" />
 
   <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"
          plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>