modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml
| 4 ++--
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
| 4 ++--
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
| 3 +++
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 1704544f28ee4781e5b8a18cb93c3622e74e551b
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Jul 17 11:25:42 2012 -0700
[BZ 815305] Min/max constraints. Fix db-upgrade.xml to addColumn instead of
alterColumn and change column names to MIN_ENTRIES from MIN and MAX_ENTRIES from MAX so
that we dont have any conflicts with other databases.
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml
b/modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml
index 7e189d9..d5d937e 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml
@@ -27,8 +27,8 @@
<column name="NAME" type="VARCHAR2"
required="false" size="255"/>
<column name="DISPLAY_NAME" type="VARCHAR2"
required="false" size="100"/>
<column name="DESCRIPTION" type="VARCHAR2"
required="false" size="1000"/>
- <column name="MIN" type="INTEGER"
required="false" />
- <column name="MAX" type="INTEGER"
required="false" />
+ <column name="MIN_ENTRIES" type="INTEGER"
required="false" />
+ <column name="MAX_ENTRIES" type="INTEGER"
required="false" />
<column name="DEFAULT_VALUE" type="VARCHAR2"
required="false" size="2000"/>
<column name="REQUIRED" type="BOOLEAN"
required="false"/>
<column name="READONLY" type="BOOLEAN"
required="false"/>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 2aafb72..2cee9f4 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -4008,8 +4008,8 @@
</schemaSpec>
<schemaSpec version="2.122">
- <schema-alterColumn table="RHQ_CONFIG_PROP_DEF"
column="MIN" columnType="INTEGER"/>
- <schema-alterColumn table="RHQ_CONFIG_PROP_DEF"
column="MAX" columnType="INTEGER"/>
+ <schema-addColumn table="RHQ_CONFIG_PROP_DEF"
column="MIN_ENTRIES" columnType="INTEGER"/>
+ <schema-addColumn table="RHQ_CONFIG_PROP_DEF"
column="MAX_ENTRIES" columnType="INTEGER"/>
</schemaSpec>
</dbupgrade>
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
index a3b11a6..adf1f34 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
@@ -25,6 +25,7 @@ package org.rhq.core.domain.configuration.definition;
import java.lang.Integer;
import javax.persistence.CascadeType;
+import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
@@ -49,8 +50,10 @@ import org.jetbrains.annotations.NotNull;
public class PropertyDefinitionList extends PropertyDefinition {
private static final long serialVersionUID = 1L;
+ @Column(name = "MIN_ENTRIES")
private int min = 0;
+ @Column(name = "MAX_ENTRIES")
private int max = Integer.MAX_VALUE;
@JoinColumn(name = "parent_list_definition_id")
Show replies by date