[SYNCOPE-1331] Table shortened to ExternalResourcePropaAction
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/241fee75 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/241fee75 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/241fee75 Branch: refs/heads/master Commit: 241fee756f19a0a02bb331b0755764e3af692b56 Parents: 1e8a5f5 Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Jul 6 15:15:11 2018 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Jul 6 15:15:11 2018 +0200 ---------------------------------------------------------------------- .../core/persistence/jpa/entity/resource/JPAExternalResource.java | 2 +- core/persistence-jpa/src/test/resources/domains/MasterContent.xml | 2 +- .../java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java | 2 +- core/upgrade/src/main/resources/schema.xml | 2 +- .../org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/241fee75/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java index 10e406a..ea2b98d 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java @@ -163,7 +163,7 @@ public class JPAExternalResource extends AbstractProvidedKeyEntity implements Ex private Set<ConnectorCapability> capabilitiesOverride = new HashSet<>(); @ManyToMany(fetch = FetchType.EAGER) - @JoinTable(name = TABLE + "PropagationAction", + @JoinTable(name = TABLE + "PropAction", joinColumns = @JoinColumn(name = "resource_id"), inverseJoinColumns = http://git-wip-us.apache.org/repos/asf/syncope/blob/241fee75/core/persistence-jpa/src/test/resources/domains/MasterContent.xml ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml index 86b9b4d..6096d05 100644 --- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml @@ -819,7 +819,7 @@ under the License. createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" provisioningTraceLevel="ALL"/> <Implementation id="LDAPMembershipPropagationActions" type="PROPAGATION_ACTIONS" engine="JAVA" body="org.apache.syncope.core.provisioning.java.propagation.LDAPMembershipPropagationActions"/> - <ExternalResourcePropagationAction resource_id="resource-ldap" implementation_id="LDAPMembershipPropagationActions"/> + <ExternalResourcePropAction resource_id="resource-ldap" implementation_id="LDAPMembershipPropagationActions"/> <ExternalResource id="resource-ldap-orgunit" connector_id="74141a3b-0762-4720-a4aa-fc3e374ef3ef" randomPwdIfNotProvided="1" enforceMandatoryCondition="1" overrideCapabilities="0" propagationPriority="1" http://git-wip-us.apache.org/repos/asf/syncope/blob/241fee75/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java ---------------------------------------------------------------------- diff --git a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java index f4a863d..6f69d72 100644 --- a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java +++ b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java @@ -318,7 +318,7 @@ public final class GenerateUpgradeSQL { while (rs.next()) { String resourceId = rs.getString(1); String actionClassName = rs.getString(2); - OUT.write("INSERT INTO ExternalResourcePropagationAction(resource_id,implementation_id) VALUES(" + OUT.write("INSERT INTO ExternalResourcePropAction(resource_id,implementation_id) VALUES(" + "'" + resourceId + "'," + "'" + actionClassName + "');\n"); } http://git-wip-us.apache.org/repos/asf/syncope/blob/241fee75/core/upgrade/src/main/resources/schema.xml ---------------------------------------------------------------------- diff --git a/core/upgrade/src/main/resources/schema.xml b/core/upgrade/src/main/resources/schema.xml index 9d73d86..ea1a6a0 100644 --- a/core/upgrade/src/main/resources/schema.xml +++ b/core/upgrade/src/main/resources/schema.xml @@ -418,7 +418,7 @@ under the License. <fk to-table="ExternalResource" column="ENTITY_ID"/> <index name="I_XTRNCNF_ENTITY" column="ENTITY_ID"/> </table> - <table name="ExternalResourcePropagationAction"> + <table name="ExternalResourcePropAction"> <column name="resource_id" type="varchar" size="255"/> <column name="implementation_id" type="varchar" size="255"/> <fk to-table="ExternalResource" column="resource_id"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/241fee75/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java ---------------------------------------------------------------------- diff --git a/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java b/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java index 3d44e37..d81117c 100644 --- a/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java +++ b/core/upgrade/src/test/java/org/apache/syncope/core/upgrade/GeneratedUpgradeSQLTest.java @@ -89,7 +89,7 @@ public class GeneratedUpgradeSQLTest { assertEquals(0, pushTaskActions.intValue()); Integer propagationTaskActions = jdbcTemplate.queryForObject( - "SELECT COUNT(*) FROM ExternalResourcePropagationAction", Integer.class); + "SELECT COUNT(*) FROM ExternalResourcePropAction", Integer.class); assertNotNull(propagationTaskActions); assertEquals(1, propagationTaskActions.intValue());
