Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 57A5419F4B for ; Thu, 21 Apr 2016 09:56:29 +0000 (UTC) Received: (qmail 70349 invoked by uid 500); 21 Apr 2016 09:56:29 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 70283 invoked by uid 500); 21 Apr 2016 09:56:29 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 70161 invoked by uid 99); 21 Apr 2016 09:56:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Apr 2016 09:56:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB674E02A2; Thu, 21 Apr 2016 09:56:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ilgrosso@apache.org To: commits@syncope.apache.org Date: Thu, 21 Apr 2016 09:56:30 -0000 Message-Id: <68893dc1afc84e13b631e642023dc542@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/7] syncope git commit: [SYNCOPE-822] Verified it works on all supported DBMS http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/core/persistence-jpa/src/test/resources/domains/TwoContent.xml ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/resources/domains/TwoContent.xml b/core/persistence-jpa/src/test/resources/domains/TwoContent.xml index b9b18a8..cd88c6e 100644 --- a/core/persistence-jpa/src/test/resources/domains/TwoContent.xml +++ b/core/persistence-jpa/src/test/resources/domains/TwoContent.xml @@ -18,109 +18,109 @@ specific language governing permissions and limitations under the License. --> - + - + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - - - + + + + + + + - - - + + - - - + + - - - + + - - - + + + - + - - - - - - - - - - - - + + - - + - - - - - + + + + http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java ---------------------------------------------------------------------- diff --git a/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java b/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java index 9b5de4c..18d9ce7 100644 --- a/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java +++ b/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java @@ -178,7 +178,7 @@ public class CamelRouteLoader implements SyncopeLoader { String routeId = ((Element) routeElement).getAttribute("id"); jdbcTemplate.update( - String.format("INSERT INTO %s(KEY, ANYTYPEKIND, CONTENT) VALUES (?, ?, ?)", + String.format("INSERT INTO %s(ID, ANYTYPEKIND, CONTENT) VALUES (?, ?, ?)", CamelRoute.class.getSimpleName()), new Object[] { routeId, anyTypeKind.name(), routeContent }); LOG.info("[{}] Route successfully loaded: {}", domain, routeId); http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/fit/core-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index eb7d440..af261a4 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -374,7 +374,7 @@ under the License. org.postgresql postgresql - 9.4-1201-jdbc41 + 9.4.1208.jre7 test @@ -410,7 +410,7 @@ under the License. mysql mysql-connector-java - 5.1.36 + 5.1.38 test @@ -532,6 +532,7 @@ under the License. true provisioning.properties + views.xml @@ -539,6 +540,16 @@ under the License. true + + + + src/main/resources/sqlserver + + views.xml + + + http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/fit/core-reference/src/main/resources/sqlserver/views.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/sqlserver/views.xml b/fit/core-reference/src/main/resources/sqlserver/views.xml new file mode 100644 index 0000000..ef6c666 --- /dev/null +++ b/fit/core-reference/src/main/resources/sqlserver/views.xml @@ -0,0 +1,250 @@ + + + + + Views + + + + CREATE VIEW user_search AS + + SELECT u.id as any_id, u.* FROM SyncopeUser u + + + CREATE VIEW user_search_unique_attr AS + + SELECT ua.owner_id AS any_id, + ua.schema_id AS schema_id, + uav.booleanvalue AS booleanvalue, + uav.datevalue AS datevalue, + uav.doublevalue AS doublevalue, + uav.longvalue AS longvalue, + uav.stringvalue AS stringvalue + FROM UPlainAttrUniqueValue uav, UPlainAttr ua + WHERE uav.attribute_id = ua.id + + + CREATE VIEW user_search_attr AS + + SELECT ua.owner_id AS any_id, + ua.schema_id AS schema_id, + uav.booleanvalue AS booleanvalue, + uav.datevalue AS datevalue, + uav.doublevalue AS doublevalue, + uav.longvalue AS longvalue, + uav.stringvalue AS stringvalue + FROM UPlainAttrValue uav, UPlainAttr ua + WHERE uav.attribute_id = ua.id + + + CREATE VIEW user_search_null_attr AS + + SELECT u.id AS any_id, + PlainSchema.id AS schema_id, + NULL AS booleanvalue, + CAST (NULL AS DATETIME2) datevalue, + CAST (NULL AS FLOAT) doublevalue, + CAST (NULL AS BIGINT) longvalue, + CAST (NULL AS VARCHAR(255)) AS stringvalue + FROM SyncopeUser u CROSS JOIN PlainSchema + LEFT OUTER JOIN UPlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id) + WHERE ua.id IS NULL + + + CREATE VIEW user_search_urelationship AS + + SELECT m.user_id AS any_id, m.anyObject_id AS right_any_id, m.type_id AS type + FROM URelationship m + + + CREATE VIEW user_search_umembership AS + + SELECT m.user_id AS any_id, g.id AS group_id, g.name AS group_name + FROM UMembership m, SyncopeGroup g + WHERE m.group_id = g.id + + + CREATE VIEW user_search_udyngmemb AS + + SELECT ds.user_id AS any_id, d.group_id AS group_id + FROM UDynGroupMembership d, UDynGroupMembership_User ds + WHERE d.id = ds.uDynGroupMembership_id + + + CREATE VIEW user_search_role AS + + SELECT ss.user_id AS any_id, ss.role_id AS role_id + FROM SyncopeUser_SyncopeRole ss + + + CREATE VIEW user_search_dynrmemb AS + + SELECT ds.user_id AS any_id, d.role_id AS role_id + FROM DynRoleMembership d, DynRoleMembership_User ds + WHERE d.id = ds.dynRoleMembership_id + + + CREATE VIEW user_search_resource AS + + SELECT st.user_id AS any_id, st.resource_id AS resource_id + FROM SyncopeUser_ExternalResource st + + + CREATE VIEW user_search_group_res AS + + SELECT m.user_id AS any_id, st.resource_id AS resource_id + FROM UMembership m, SyncopeGroup r, SyncopeGroup_ExternalResource st + WHERE m.group_id = r.id AND st.group_id = r.id + + + + + CREATE VIEW anyObject_search AS + + SELECT a.id as any_id, a.* FROM AnyObject a + + + CREATE VIEW anyObject_search_unique_attr AS + + SELECT ua.owner_id AS any_id, + ua.schema_id AS schema_id, + uav.booleanvalue AS booleanvalue, + uav.datevalue AS datevalue, + uav.doublevalue AS doublevalue, + uav.longvalue AS longvalue, + uav.stringvalue AS stringvalue + FROM APlainAttrUniqueValue uav, APlainAttr ua + WHERE uav.attribute_id = ua.id + + + CREATE VIEW anyObject_search_attr AS + + SELECT ua.owner_id AS any_id, + ua.schema_id AS schema_id, + uav.booleanvalue AS booleanvalue, + uav.datevalue AS datevalue, + uav.doublevalue AS doublevalue, + uav.longvalue AS longvalue, + uav.stringvalue AS stringvalue + FROM APlainAttrValue uav, APlainAttr ua + WHERE uav.attribute_id = ua.id + + + CREATE VIEW anyObject_search_null_attr AS + + SELECT u.id AS any_id, + PlainSchema.id AS schema_id, + NULL AS booleanvalue, + CAST (NULL AS DATETIME2) datevalue, + CAST (NULL AS FLOAT) doublevalue, + CAST (NULL AS BIGINT) longvalue, + CAST (NULL AS VARCHAR(255)) AS stringvalue + FROM AnyObject u CROSS JOIN PlainSchema + LEFT OUTER JOIN APlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id) + WHERE ua.id IS NULL + + + CREATE VIEW anyObject_search_arelationship AS + + SELECT m.left_anyObject_id AS any_id, m.right_anyObject_id AS right_any_id, m.type_id AS type + FROM ARelationship m + + + CREATE VIEW anyObject_search_amembership AS + + SELECT m.anyObject_id AS any_id, g.id AS group_id, g.name AS group_name + FROM AMembership m, SyncopeGroup g + WHERE m.group_id = g.id + + + CREATE VIEW anyObject_search_adyngmemb AS + + SELECT ds.anyObject_id AS any_id, d.group_id AS group_id + FROM ADynGroupMembership d, ADynGroupMembership_AnyObject ds + WHERE d.id = ds.aDynGroupMembership_id + + + CREATE VIEW anyObject_search_resource AS + + SELECT st.anyObject_id AS any_id, st.resource_id AS resource_id + FROM AnyObject_ExternalResource st + + + CREATE VIEW anyObject_search_group_res AS + + SELECT m.anyObject_id AS any_id, st.resource_id AS resource_id + FROM AMembership m, SyncopeGroup r, SyncopeGroup_ExternalResource st + WHERE m.group_id = r.id AND st.group_id = r.id + + + + + CREATE VIEW group_search AS + + SELECT r.id as any_id, r.* FROM SyncopeGroup r + + + CREATE VIEW group_search_unique_attr AS + + SELECT ua.owner_id AS any_id, + ua.schema_id AS schema_id, + uav.booleanvalue AS booleanvalue, + uav.datevalue AS datevalue, + uav.doublevalue AS doublevalue, + uav.longvalue AS longvalue, + uav.stringvalue AS stringvalue + FROM GPlainAttrUniqueValue uav, GPlainAttr ua + WHERE uav.attribute_id = ua.id + + + CREATE VIEW group_search_attr AS + + SELECT ua.owner_id AS any_id, + ua.schema_id AS schema_id, + uav.booleanvalue AS booleanvalue, + uav.datevalue AS datevalue, + uav.doublevalue AS doublevalue, + uav.longvalue AS longvalue, + uav.stringvalue AS stringvalue + FROM GPlainAttrValue uav, GPlainAttr ua + WHERE uav.attribute_id = ua.id + + + CREATE VIEW group_search_null_attr AS + + SELECT u.id AS any_id, + PlainSchema.id AS schema_id, + NULL AS booleanvalue, + CAST (NULL AS DATETIME2) datevalue, + CAST (NULL AS FLOAT) doublevalue, + CAST (NULL AS BIGINT) longvalue, + CAST (NULL AS VARCHAR(255)) AS stringvalue + FROM SyncopeGroup u CROSS JOIN PlainSchema + LEFT OUTER JOIN GPlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id) + WHERE ua.id IS NULL + + + CREATE VIEW group_search_resource AS + + SELECT st.group_id AS any_id, st.resource_id AS resource_id + FROM SyncopeGroup_ExternalResource st + + + http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java index 864835d..4922cc8 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java @@ -88,7 +88,7 @@ import org.springframework.jdbc.core.JdbcTemplate; public class PullTaskITCase extends AbstractTaskITCase { @BeforeClass - public static void testPullctionsSetup() { + public static void testPullActionsSetup() { PullTaskTO pullTask = taskService.read(PULL_TASK_KEY, true); pullTask.getActionsClassNames().add(TestPullActions.class.getName()); taskService.update(pullTask);