fixing master (h2)

Evolveum · Jan 12, 2015 · 1dee4cb · 1dee4cb
1 parent 5d2a567
commit 1dee4cb
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java b/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
@@ -50,7 +50,7 @@
  */
 @Entity
 @ForeignKey(name = "fk_connector_host")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_connector_host_name", columnNames = {"name_norm"}))
 public class RConnectorHost extends RObject<ConnectorHostType> {
 
     private RPolyString name;

diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java b/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java
@@ -37,7 +37,7 @@
  */
 @Entity
 @ForeignKey(name = "fk_generic_object")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_generic_object_name", columnNames = {"name_norm"}))
 public class RGenericObject extends RObject<GenericObjectType> {
 
     private RPolyString name;

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java
@@ -37,7 +37,7 @@
  */
 @Entity
 @ForeignKey(name = "fk_node")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_node_name", columnNames = {"name_norm"}))
 public class RNode extends RObject<NodeType> {
 
     private RPolyString name;

diff --git a/...po-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java b/...po-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
@@ -45,7 +45,7 @@
  */
 @Entity
 @ForeignKey(name = "fk_object_template")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_object_template_name", columnNames = {"name_norm"}))
 public class RObjectTemplate extends RObject<ObjectTemplateType> {
 
     private RPolyString name;

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
@@ -37,7 +37,7 @@
  */
 @Entity
 @ForeignKey(name = "fk_org")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_org_name", columnNames = {"name_norm"}))
 public class ROrg extends RAbstractRole<OrgType> {
 
     private RPolyString name;

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 
 @Entity
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_report_name", columnNames = {"name_norm"}))
 @ForeignKey(name = "fk_report")
 public class RReport extends RObject<ReportType> {
 

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
@@ -52,7 +52,7 @@
  */
 @Entity
 @ForeignKey(name = "fk_resource")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_resource_name", columnNames = {"name_norm"}))
 public class RResource extends RObject<ResourceType> {
 
     private static final Trace LOGGER = TraceManager.getTrace(RResource.class);

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
@@ -39,7 +39,7 @@
  */
 @Entity
 @ForeignKey(name = "fk_role")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_role_name", columnNames = {"name_norm"}))
 public class RRole extends RAbstractRole<RoleType> {
 
     private RPolyString name;

diff --git a/...po-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java b/...po-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 
 @Entity
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_security_policy_name", columnNames = {"name_norm"}))
 @ForeignKey(name = "fk_security_policy")
 public class RSecurityPolicy extends RObject<SecurityPolicyType> {
 

diff --git a/...l-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java b/...l-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
@@ -40,7 +40,7 @@
  */
 @Entity
 @ForeignKey(name = "fk_system_configuration")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_system_configuration_name", columnNames = {"name_norm"}))
 public class RSystemConfiguration extends RObject<SystemConfigurationType> {
 
     private RPolyString name;

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
@@ -43,7 +43,7 @@
  * @author lazyman
  */
 @Entity
-@Table(uniqueConstraints = @UniqueConstraint(name="uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name="uc_user_name", columnNames = {"name_norm"}))
 @org.hibernate.annotations.Table(appliesTo = "m_user",
         indexes = {@Index(name = "iFullName", columnNames = "fullName_orig"),
                 @Index(name = "iFamilyName", columnNames = "familyName_orig"),

diff --git a/.../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java b/.../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
@@ -39,7 +39,7 @@
  */
 @Entity
 @ForeignKey(name = "fk_value_policy")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_name_norm", columnNames = {"name_norm"}))
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_value_policy_name", columnNames = {"name_norm"}))
 public class RValuePolicy extends RObject<ValuePolicyType> {
 
     private RPolyString name;