inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-select-SqlMap.xml
View File

@@ -14,67 +14,61 @@
<!-- user feed - all sites - everyone -->
<select id="select_activity_feed_for_feeduser" parameterType="ActivityFeedQuery" resultType="ActivityFeed" fetchSize="-2147483648">
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
select id as id, activity_type as activityType, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed
where feed_user_id = #{feedUserId}
and activity_format = #{activitySummaryFormat}
<if test="minId != null"><![CDATA[ and id >= #{minId} ]]></if>
order by post_date desc
</select>
<!-- user feed - all sites - others (not me) -->
<select id="select_activity_feed_for_feeduser_others" parameterType="ActivityFeedQuery" resultType="ActivityFeed" fetchSize="-2147483648">
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
select id as id, activity_type as activityType, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed
where feed_user_id = #{feedUserId}
<![CDATA[ and post_user_id <> #{feedUserId} ]]>
and activity_format = #{activitySummaryFormat}
<if test="minId != null"><![CDATA[ and id >= #{minId} ]]></if>
order by post_date desc
</select>
<!-- user feed - all sites - me only (not others) -->
<select id="select_activity_feed_for_feeduser_me" parameterType="ActivityFeedQuery" resultType="ActivityFeed" fetchSize="-2147483648">
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
select id as id, activity_type as activityType, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed
where feed_user_id = #{feedUserId}
and post_user_id = #{feedUserId}
and activity_format = #{activitySummaryFormat}
<if test="minId != null"><![CDATA[ and id >= #{minId} ]]></if>
order by post_date desc
</select>
<!-- user feed - given site - everyone -->
<select id="select_activity_feed_for_feeduser_and_site" parameterType="ActivityFeedQuery" resultType="ActivityFeed" fetchSize="-2147483648">
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
select id as id, activity_type as activityType, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed
where feed_user_id = #{feedUserId}
and site_network = #{siteNetwork}
and activity_format = #{activitySummaryFormat}
<if test="minId != null"><![CDATA[ and id >= #{minId} ]]></if>
order by post_date desc
</select>
<!-- user feed - given site - others (not me) -->
<select id="select_activity_feed_for_feeduser_others_and_site" parameterType="ActivityFeedQuery" resultType="ActivityFeed" fetchSize="-2147483648">
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
select id as id, activity_type as activityType, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed
where feed_user_id = #{feedUserId}
<![CDATA[ and post_user_id <> #{feedUserId} ]]>
and site_network = #{siteNetwork}
and activity_format = #{activitySummaryFormat}
<if test="minId != null"><![CDATA[ and id >= #{minId} ]]></if>
order by post_date desc
</select>
<!-- user feed - given site - me only (not others) -->
<select id="select_activity_feed_for_feeduser_me_and_site" parameterType="ActivityFeedQuery" resultType="ActivityFeed" fetchSize="-2147483648">
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
select id as id, activity_type as activityType, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed
where feed_user_id = #{feedUserId}
and post_user_id = #{feedUserId}
and site_network = #{siteNetwork}
and activity_format = #{activitySummaryFormat}
<if test="minId != null"><![CDATA[ and id >= #{minId} ]]></if>
order by post_date desc
</select>
@@ -82,11 +76,10 @@
<!-- site feed - given site -->
<select id="select_activity_feed_for_site" parameterType="ActivityFeedQuery" resultType="ActivityFeed" fetchSize="-2147483648">
<![CDATA[
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
select id as id, activity_type as activityType, activity_summary as activitySummary, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed
where (feed_user_id = '' or feed_user_id is null)
and site_network = #{siteNetwork}
and activity_format = #{activitySummaryFormat}
order by post_date desc
]]>
</select>

10
config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/query-authorities-common-SqlMap.xml
View File

@@ -28,6 +28,16 @@
<!-- -->
<!-- Statements -->
<!-- -->
<!-- Count authorities: PEOPLE -->
<select id="select_AuthorityCount_People" parameterType="ids" resultType="long">
select count(type_qname_id) from alf_node where type_qname_id = #{idOne}
</select>
<!-- Count authorities: GROUPS -->
<select id="select_AuthorityCount_Groups" resultType="long">
select count(type_qname_id) from alf_node where type_qname_id = #{idOne}
</select>
<!-- GetAuthorities - note: take advantage of fact that authority name is also on child assoc (including "username" for users, eg. getAllAuthoritiesInZone) -->
<select id="select_GetAuthoritiesCannedQuery" parameterType="AuthorityInfo" resultMap="result_AuthorityInfo" fetchSize="-2147483648">