This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new e1764ad1f6 ISIS-3091: adds back the table name as prefix for indices
e1764ad1f6 is described below
commit e1764ad1f6a64ab7adda092da9707ac49e296020
Author: Dan Haywood <[email protected]>
AuthorDate: Tue Aug 2 14:31:46 2022 +0100
ISIS-3091: adds back the table name as prefix for indices
also fixes 4 issues of inconsistent semantics for Execution{Log/Outbox}Entry
---
.../org/apache/isis/applib/mixins/system/DomainChangeRecord.java | 2 +-
.../java/org/apache/isis/applib/services/bookmark/HasTarget.java | 2 +-
.../isis/extensions/commandlog/jdo/dom/CommandLogEntry.java | 4 ++--
.../isis/extensions/commandlog/jpa/dom/CommandLogEntry.java | 8 ++++----
.../extensions/executionlog/applib/dom/ExecutionLogEntry.java | 8 ++++----
.../isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java | 6 +++---
.../isis/extensions/executionlog/jpa/dom/ExecutionLogEntry.java | 6 +++---
.../executionoutbox/applib/dom/ExecutionOutboxEntry.java | 8 ++++----
.../extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java | 6 +++---
.../extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java | 6 +++---
.../isis/extensions/audittrail/jdo/dom/AuditTrailEntry.java | 8 ++++----
.../isis/extensions/audittrail/jpa/dom/AuditTrailEntry.java | 8 ++++----
.../secman/jdo/permission/dom/ApplicationPermission.java | 2 +-
.../isis/extensions/secman/jdo/role/dom/ApplicationRole.java | 2 +-
.../extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java | 2 +-
.../isis/extensions/secman/jdo/user/dom/ApplicationUser.java | 2 +-
.../secman/jpa/permission/dom/ApplicationPermission.java | 2 +-
.../isis/extensions/secman/jpa/role/dom/ApplicationRole.java | 2 +-
.../extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java | 2 +-
.../isis/extensions/secman/jpa/user/dom/ApplicationUser.java | 2 +-
20 files changed, 44 insertions(+), 44 deletions(-)
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java
index 730450d53c..55479e8bd1 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java
@@ -237,7 +237,7 @@ public interface DomainChangeRecord extends
HasInteractionId, HasUsername, HasTa
@java.lang.annotation.Target({ ElementType.METHOD, ElementType.FIELD,
ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@interface PropertyId {
- int MAX_LENGTH = 255;
+ int MAX_LENGTH = 100;
boolean NULLABLE = true;
String ALLOWS_NULL = "true";
}
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/HasTarget.java
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/HasTarget.java
index d647a9cd38..a832bc7d7e 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/HasTarget.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/HasTarget.java
@@ -39,7 +39,7 @@ public interface HasTarget {
@java.lang.annotation.Target({ ElementType.METHOD, ElementType.FIELD,
ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@interface Target {
- int MAX_LENGTH = 2000;
+ int MAX_LENGTH = 1500;
boolean NULLABLE = true;
String ALLOWS_NULL = "true";
}
diff --git
a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
index 2e71c61c34..85c9432994 100644
---
a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
+++
b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
@@ -51,8 +51,8 @@ import lombok.Setter;
schema = CommandLogEntry.SCHEMA,
table = CommandLogEntry.TABLE)
@Indices({
- @Index(name = "startedAt__timestamp__IDX", members = { "startedAt",
"timestamp" }),
- @Index(name = "timestamp__IDX", members = { "timestamp" }),
+ @Index(name = "CommandLogEntry__startedAt_timestamp__IDX", members = {
"startedAt", "timestamp" }),
+ @Index(name = "CommandLogEntry__timestamp__IDX", members = {
"timestamp" }),
})
@Queries( {
@Query(
diff --git
a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/dom/CommandLogEntry.java
b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/dom/CommandLogEntry.java
index dc2e1b24cf..f97f9ab4eb 100644
---
a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/dom/CommandLogEntry.java
+++
b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/dom/CommandLogEntry.java
@@ -62,10 +62,10 @@ import lombok.Setter;
schema = CommandLogEntry.SCHEMA,
name = CommandLogEntry.TABLE,
indexes = {
- @Index(name = "startedAt__timestamp__IDX", columnList =
"startedAt, timestamp" ),
- @Index(name = "timestamp__IDX", columnList = "timestamp"),
- @Index(name = "target__IDX", columnList = "target"),
- @Index(name = "target__startedAt__IDX", columnList = "target,
startedAt"),
+ @Index(name = "CommandLogEntry__startedAt_timestamp__IDX",
columnList = "startedAt, timestamp" ),
+ @Index(name = "CommandLogEntry__timestamp__IDX", columnList =
"timestamp"),
+ @Index(name = "CommandLogEntry__target__IDX", columnList =
"target"),
+ @Index(name = "CommandLogEntry__target_startedAt__IDX",
columnList = "target, startedAt"),
}
)
@NamedQueries({
diff --git
a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
index 6063c4cdd5..94e4abe8fc 100644
---
a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
+++
b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
@@ -373,8 +373,8 @@ implements Comparable<ExecutionLogEntry>,
DomainChangeRecord, HasInteractionIdAn
@Retention(RetentionPolicy.RUNTIME)
public @interface StartedAt {
class DomainEvent extends PropertyDomainEvent<java.sql.Timestamp> {}
- boolean NULLABLE = false;
- String ALLOWS_NULL = "false";
+ boolean NULLABLE = true;
+ String ALLOWS_NULL = "true";
}
@StartedAt
public abstract java.sql.Timestamp getStartedAt();
@@ -394,8 +394,8 @@ implements Comparable<ExecutionLogEntry>,
DomainChangeRecord, HasInteractionIdAn
@Retention(RetentionPolicy.RUNTIME)
public @interface CompletedAt {
class DomainEvent extends PropertyDomainEvent<java.sql.Timestamp> {}
- boolean NULLABLE = false;
- String ALLOWS_NULL = "false";
+ boolean NULLABLE = true;
+ String ALLOWS_NULL = "true";
}
@CompletedAt
public abstract java.sql.Timestamp getCompletedAt();
diff --git
a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
index a87e2c9ddd..0d5ed3918f 100644
---
a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
+++
b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
@@ -51,9 +51,9 @@ import lombok.Setter;
table = ExecutionLogEntry.TABLE,
objectIdClass= ExecutionLogEntryPK.class)
@Indices({
- @Index(name = "timestamp__IDX", members = { "timestamp" }),
- @Index(name = "target__timestamp__IDX", members = { "target",
"timestamp" }),
- @Index(name = "username__timestamp__IDX", members = { "username",
"timestamp" }),
+ @Index(name = "ExecutionLogEntry__timestamp__IDX", members = {
"timestamp" }),
+ @Index(name = "ExecutionLogEntry__target_timestamp__IDX", members = {
"target", "timestamp" }),
+ @Index(name = "ExecutionLogEntry__username_timestamp__IDX", members =
{ "username", "timestamp" }),
})
@Queries( {
@Query(
diff --git
a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
index 43687adaba..b66e579f8d 100644
---
a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
+++
b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
@@ -58,9 +58,9 @@ import lombok.Setter;
schema = ExecutionLogEntry.SCHEMA,
name = ExecutionLogEntry.TABLE,
indexes = {
- @Index(name = "timestamp__IDX", columnList = "timestamp"),
- @Index(name = "target__timestamp__IDX", columnList = "target,
timestamp"),
- @Index(name = "username__timestamp__IDX", columnList =
"username, timestamp"),
+ @Index(name = "ExecutionLogEntry__timestamp__IDX", columnList
= "timestamp"),
+ @Index(name = "ExecutionLogEntry__target_timestamp__IDX",
columnList = "target, timestamp"),
+ @Index(name = "ExecutionLogEntry__username_timestamp__IDX",
columnList = "username, timestamp"),
}
)
@NamedQueries( {
diff --git
a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
index b16b69de4f..4bc4376cc0 100644
---
a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
+++
b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
@@ -363,8 +363,8 @@ implements Comparable<ExecutionOutboxEntry>,
DomainChangeRecord, HasInteractionI
@Retention(RetentionPolicy.RUNTIME)
public @interface StartedAt {
class DomainEvent extends PropertyDomainEvent<java.sql.Timestamp> {}
- boolean NULLABLE = false;
- String ALLOWS_NULL = "false";
+ boolean NULLABLE = true;
+ String ALLOWS_NULL = "true";
}
@StartedAt
public abstract java.sql.Timestamp getStartedAt();
@@ -384,8 +384,8 @@ implements Comparable<ExecutionOutboxEntry>,
DomainChangeRecord, HasInteractionI
@Retention(RetentionPolicy.RUNTIME)
public @interface CompletedAt {
class DomainEvent extends PropertyDomainEvent<java.sql.Timestamp> {}
- boolean NULLABLE = false;
- String ALLOWS_NULL = "false";
+ boolean NULLABLE = true;
+ String ALLOWS_NULL = "true";
}
@CompletedAt
public abstract java.sql.Timestamp getCompletedAt();
diff --git
a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
index a6a074246e..63f60e1dfa 100644
---
a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
+++
b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
@@ -52,9 +52,9 @@ import lombok.Setter;
table = ExecutionOutboxEntry.TABLE,
objectIdClass= ExecutionOutboxEntryPK.class)
@Indices({
- @Index(name = "timestamp__IDX", members = { "timestamp" }),
- @Index(name = "target__timestamp__IDX", members = { "target",
"timestamp" }),
- @Index(name = "username__timestamp__IDX", members = { "username",
"timestamp" }),
+ @Index(name = "ExecutionOutboxEntry__timestamp__IDX", members = {
"timestamp" }),
+ @Index(name = "ExecutionOutboxEntry__target__timestamp__IDX", members
= { "target", "timestamp" }),
+ @Index(name = "ExecutionOutboxEntry__username__timestamp__IDX",
members = { "username", "timestamp" }),
})
@Queries( {
@Query(
diff --git
a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java
b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java
index 835943e97d..58c5980f69 100644
---
a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java
+++
b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java
@@ -59,9 +59,9 @@ import lombok.Setter;
schema = ExecutionOutboxEntry.SCHEMA,
name = ExecutionOutboxEntry.TABLE,
indexes = {
- @Index(name = "timestamp__IDX", columnList = "timestamp"),
- @Index(name = "target__timestamp__IDX", columnList = "target,
timestamp"),
- @Index(name = "username__timestamp__IDX", columnList =
"username, timestamp"),
+ @Index(name = "ExecutionOutboxEntry__timestamp__IDX",
columnList = "timestamp"),
+ @Index(name = "ExecutionOutboxEntry__target__timestamp__IDX",
columnList = "target, timestamp"),
+ @Index(name =
"ExecutionOutboxEntry__username__timestamp__IDX", columnList = "username,
timestamp"),
}
)
@NamedQueries( {
diff --git
a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/dom/AuditTrailEntry.java
b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/dom/AuditTrailEntry.java
index ff536236aa..03d7a28828 100644
---
a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/dom/AuditTrailEntry.java
+++
b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/dom/AuditTrailEntry.java
@@ -52,10 +52,10 @@ import lombok.Setter;
schema = AuditTrailEntry.SCHEMA,
table = AuditTrailEntry.TABLE)
@Indices({
- @Index(name = "target_propertyId_timestamp_IDX", members = { "target",
"propertyId", "timestamp" }, unique = "false"),
- @Index(name = "target_timestamp_IDX", members = { "target",
"timestamp" }, unique = "false"),
- @Index(name = "timestamp_IDX", members = { "timestamp" }, unique =
"false"),
- @Index(name = "interactionId_IDX", members = { "interactionId" },
unique = "false")
+ @Index(name = "AuditTrailEntry__target_propertyId_timestamp_IDX",
members = { "target", "propertyId", "timestamp" }, unique = "false"),
+ @Index(name = "AuditTrailEntry__target_timestamp_IDX", members = {
"target", "timestamp" }, unique = "false"),
+ @Index(name = "AuditTrailEntry__timestamp_IDX", members = {
"timestamp" }, unique = "false"),
+ @Index(name = "AuditTrailEntry__interactionId_IDX", members = {
"interactionId" }, unique = "false")
})
@Queries( {
@Query(
diff --git
a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/dom/AuditTrailEntry.java
b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/dom/AuditTrailEntry.java
index e24d538662..1cb0481b5c 100644
---
a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/dom/AuditTrailEntry.java
+++
b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/dom/AuditTrailEntry.java
@@ -55,10 +55,10 @@ import lombok.Setter;
schema = AuditTrailEntry.SCHEMA,
name = AuditTrailEntry.TABLE,
indexes = {
- @Index(name = "target_propertyId_timestamp_IDX", columnList =
"target, propertyId, timestamp", unique = false),
- @Index(name = "target_timestamp_IDX", columnList = "target,
timestamp", unique = false),
- @Index(name = "timestamp_IDX", columnList = "timestamp",
unique = false),
- @Index(name = "interactionId_IDX", columnList =
"interactionId", unique = false)
+ @Index(name =
"AuditTrailEntry__target_propertyId_timestamp__IDX", columnList = "target,
propertyId, timestamp", unique = false),
+ @Index(name = "AuditTrailEntry__target_timestamp__IDX",
columnList = "target, timestamp", unique = false),
+ @Index(name = "AuditTrailEntry__timestamp__IDX", columnList =
"timestamp", unique = false),
+ @Index(name = "AuditTrailEntry__interactionId__IDX",
columnList = "interactionId", unique = false)
}
)
@NamedQueries( {
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
index 559d46f544..16a11c519b 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
@@ -54,7 +54,7 @@ import lombok.Setter;
schema = ApplicationPermission.SCHEMA,
table = ApplicationPermission.TABLE)
@Uniques({
- @Unique(name = "role__feature__rule__UNQ", members = { "role",
"featureSort", "featureFqn", "rule" })
+ @Unique(name = "ApplicationPermission__role_feature_rule__UNQ",
members = { "role", "featureSort", "featureFqn", "rule" })
})
@Queries( {
@Query(
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
index fee80e16fc..29ffd0f36f 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
@@ -56,7 +56,7 @@ import lombok.Setter;
schema = ApplicationRole.SCHEMA,
table = ApplicationRole.TABLE)
@Uniques({
- @Unique(name = "name__UNQ", members = { "name" })
+ @Unique(name = "ApplicationRole__name__UNQ", members = { "name" })
})
@Queries({
@Query(
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
index d28d33eb81..d3a9e9f98c 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
@@ -56,7 +56,7 @@ import lombok.Setter;
schema = ApplicationTenancy.SCHEMA,
table = ApplicationTenancy.TABLE)
@Uniques({
- @Unique(name = "name__UNQ", members = { "name" })
+ @Unique(name = "ApplicationTenancy__name__UNQ", members = { "name" })
})
@Queries( {
@Query(
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
index 539bbe05fe..f290912a97 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
@@ -57,7 +57,7 @@ import lombok.Setter;
schema = ApplicationUser.SCHEMA,
table = ApplicationUser.TABLE)
@Uniques({
- @Unique(name = "username__UNQ", members = { "username" })})
+ @Unique(name = "ApplicationUser__username__UNQ", members = { "username"
})})
@Queries( {
@Query(
name = Nq.FIND_BY_USERNAME,
diff --git
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermission.java
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermission.java
index 29bcd2f83f..c5aee951e5 100644
---
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermission.java
+++
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermission.java
@@ -57,7 +57,7 @@ import lombok.Setter;
schema = ApplicationPermission.SCHEMA,
name = ApplicationPermission.TABLE,
uniqueConstraints=
- @UniqueConstraint(name = "role__feature__rule__UNQ",
columnNames={"roleId", "featureSort", "featureFqn", "rule"})
+ @UniqueConstraint(name =
"ApplicationPermission_role_feature_rule__UNQ", columnNames={"roleId",
"featureSort", "featureFqn", "rule"})
)
@NamedQueries({
@NamedQuery(
diff --git
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java
index 473be8a65d..76093c43b0 100644
---
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java
+++
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java
@@ -54,7 +54,7 @@ import lombok.Setter;
schema = ApplicationRole.SCHEMA,
name = ApplicationRole.TABLE,
uniqueConstraints =
- @UniqueConstraint(name = "name__UNQ", columnNames= { "name" })
+ @UniqueConstraint(name = "ApplicationRole__name__UNQ",
columnNames= { "name" })
)
@NamedQueries({
@NamedQuery(
diff --git
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
index 6950d722c5..bcb7857b37 100644
---
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
+++
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
@@ -54,7 +54,7 @@ import lombok.Setter;
schema = ApplicationTenancy.SCHEMA,
name = ApplicationTenancy.TABLE,
uniqueConstraints =
- @UniqueConstraint(name = "name__UNQ", columnNames = { "name" })
+ @UniqueConstraint(name = "ApplicationTenancy__name__UNQ",
columnNames = { "name" })
)
@NamedQueries({
@NamedQuery(
diff --git
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
index 2ebd28f957..59edce864d 100644
---
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
+++
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
@@ -58,7 +58,7 @@ import lombok.Setter;
schema = ApplicationUser.SCHEMA,
name = ApplicationUser.TABLE,
uniqueConstraints =
- @UniqueConstraint(name = "username__UNQ", columnNames = {
"username" })
+ @UniqueConstraint(name = "ApplicationUser__username__UNQ",
columnNames = { "username" })
)
@NamedQueries({
@NamedQuery(
