diff options
| author | Godin <mandrikov@gmail.com> | 2010-12-16 00:56:42 +0000 |
|---|---|---|
| committer | Godin <mandrikov@gmail.com> | 2010-12-16 00:56:42 +0000 |
| commit | 96caf6eac13b66a73d0ee572ad3a361c38e4b53a (patch) | |
| tree | 73887c03c31ac8d172f93cf3e3c79a38e144d67b /sonar-core | |
| parent | a8026252cd527d5aeb5897b641ee4a8df19a452c (diff) | |
| download | sonarqube-96caf6eac13b66a73d0ee572ad3a361c38e4b53a.tar.gz sonarqube-96caf6eac13b66a73d0ee572ad3a361c38e4b53a.zip | |
SONAR-1722: Add DB columns for profiles inheritance
Diffstat (limited to 'sonar-core')
| -rw-r--r-- | sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java | 7 | ||||
| -rw-r--r-- | sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldAddActiveRulesToProfile-result.xml | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java b/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java index ff04ffb27ba..4c0ee4aa224 100644 --- a/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java +++ b/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java @@ -19,18 +19,19 @@ */ package org.sonar.jpa.entity; -import javax.persistence.*; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import javax.persistence.*; + @Entity -@Table(name = SchemaMigration.TABLE_NAME, uniqueConstraints = {@UniqueConstraint(columnNames = {"version"})}) +@Table(name = SchemaMigration.TABLE_NAME, uniqueConstraints = { @UniqueConstraint(columnNames = { "version" }) }) public class SchemaMigration { public final static int VERSION_UNKNOWN = -1; - public static final int LAST_VERSION = 168; + public static final int LAST_VERSION = 169; public final static String TABLE_NAME = "schema_migrations"; diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldAddActiveRulesToProfile-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldAddActiveRulesToProfile-result.xml index 6818bf4c09e..32bf7af86df 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldAddActiveRulesToProfile-result.xml +++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldAddActiveRulesToProfile-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules_profiles id="1" provided="true" name="profile" default_profile="1" language="java"/> + <rules_profiles id="1" parent_id="[null]" provided="true" name="profile" default_profile="1" language="java"/> <rules_categories id="1" name="category one" description="[null]"/> @@ -10,7 +10,7 @@ <rules_parameters id="1" rule_id="1" name="param1" description="foo" param_type="r"/> <!-- Active rule created --> - <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/> + <active_rules id="1" profile_id="1" rule_id="1" failure_level="2" inherited="[null]" overrides="[null]"/> <!-- Active rule param created --> <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" value="20"/> |