Merged DEV/SWIFT to HEAD

25490: ALF-5260 - MyBatis: AVM (-> MySQL)
          - includes SerializableTypeHandler
          - also, for consistency, remove SqlSessionDaoSupport from Activtities (r25466)
          - TODO: test EliminateDuplicates patch
          - TODO: inserts for non-MySQL dbs
   25504: ALF-5260 - MyBatis: part III
          - AppliedPatch, Content/MimeType/Encoding, Locale, Locks, QName, Usage
          - also minor updates to AVM & Activities (for consistency)
   25517: ALF-5260 - MyBatis: part IV
          - DAOs - Patch, Permissions/ACLs, PropVal, SOLR
          - NOTE: includes fixup for SOLRDAOTest - also return nodeRef
          - TODO: batching (for ContentUrl patch)
   25541: ALF-5260 - MyBatis: add missing file (r25517)
   25556: ALF-5260 - MyBatis: V - PostgreSQL support (for migrated DAOs - does not yet include Audit + Node)
   25576: ALF-5260 - MyBatis: VI - Audit & Control DAOs (MySQL + PostgreSQL)
          - also replaced SqlExecutor.NO_MAXIMUM_RESULTS with RowBounds.NO_ROW_LIMIT
   25589: ALF-5260 - MyBatis: part VII - Node DAO (MySQL + PostgreSQL)
   25612: ALF-5260 - MyBatis: part VIII - Oracle / DB2 / SQL Server
          - sanity checked only (bootstrap -> RepositoryStartupTest, DomainTestSuite, ModelTestSuite)
          - also remove remaining references to iBatis (and jar)
Note:
 - Currently LockDAOTest is failing on an update
 - Fixed up DAo code changes from V3.4 - expect some to have been missed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-05-24 05:57:44 +00:00
parent e92b931ee9
commit 682d24d191
76 changed files with 2789 additions and 2758 deletions

View File

@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<sqlMap namespace="alfresco.activities">
<mapper namespace="alfresco.activities.insert">
<insert id="insert_activity_feedcontrol" parameterClass="FeedControl">
<insert id="insert_activity_feedcontrol" parameterType="FeedControl">
<selectKey keyProperty="id" resultClass="long">
<selectKey keyProperty="id" resultType="long" order="BEFORE" >
select nextVal('alf_activity_feed_control_seq')
</selectKey>
@@ -16,9 +14,9 @@
</insert>
<insert id="insert_activity_feed" parameterClass="ActivityFeed">
<insert id="insert_activity_feed" parameterType="ActivityFeed">
<selectKey keyProperty="id" resultClass="long">
<selectKey keyProperty="id" resultType="long" order="BEFORE" >
select nextVal('alf_activity_feed_seq')
</selectKey>
@@ -26,9 +24,9 @@
</insert>
<insert id="insert_activity_post" parameterClass="ActivityPost">
<insert id="insert_activity_post" parameterType="ActivityPost">
<selectKey keyProperty="id" resultClass="long">
<selectKey keyProperty="id" resultType="long" order="BEFORE" >
select nextVal('alf_activity_post_seq')
</selectKey>
@@ -36,4 +34,4 @@
</insert>
</sqlMap>
</mapper>

View File

@@ -1,42 +1,37 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<sqlMap namespace="alfresco.audit">
<mapper namespace="alfresco.audit.insert">
<insert id="insert_AuditModel" parameterClass="AuditModel" >
<insert id="insert_AuditModel" parameterType="AuditModel" >
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_audit_model_seq')
</selectKey>
insert into alf_audit_model (id, content_data_id, content_crc)
values (#id#, #contentDataId#, #contentCrc#)
<include refid="insert_AuditModel_Sequence"/>
</insert>
<insert id="insert_AuditApplication" parameterClass="AuditApplication" >
<insert id="insert_AuditApplication" parameterType="AuditApplication" >
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_audit_app_seq')
</selectKey>
insert into alf_audit_app (id, version, app_name_id, audit_model_id, disabled_paths_id)
values (#id#, #version#, #applicationNameId#, #auditModelId#, #disabledPathsId#)
<include refid="insert_AuditApplication_Sequence"/>
</insert>
<insert id="insert_AuditEntry" parameterClass="AuditEntry" >
<insert id="insert_AuditEntry" parameterType="AuditEntry" >
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_audit_entry_seq')
</selectKey>
insert into alf_audit_entry (id, audit_app_id, audit_user_id, audit_time, audit_values_id)
values (#id#, #auditApplicationId#, #auditUserId#, #auditTime#, #auditValuesId#)
<include refid="insert_AuditEntry_Sequence"/>
</insert>
</sqlMap>
</mapper>

View File

@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<sqlMap namespace="alfresco.avm">
<mapper namespace="alfresco.avm.insert">
<insert id="insert_AVMStore" parameterClass="AVMStore">
<insert id="insert_AVMStore" parameterType="AVMStore">
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('avm_stores_seq')
</selectKey>
@@ -18,7 +16,7 @@
<insert id="insert_AVMStoreProperty" parameterMap="parameter_IdStorePropertyPatternMap">
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('avm_store_properties_seq')
</selectKey>
@@ -26,9 +24,9 @@
</insert>
<insert id="insert_AVMNode" parameterClass="AVMNode">
<insert id="insert_AVMNode" parameterType="AVMNode">
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('avm_nodes_seq')
</selectKey>
@@ -36,9 +34,9 @@
</insert>
<insert id="insert_AVMVersionRoot" parameterClass="AVMVersionRoot">
<insert id="insert_AVMVersionRoot" parameterType="AVMVersionRoot">
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('avm_version_roots_seq')
</selectKey>
@@ -46,4 +44,4 @@
</insert>
</sqlMap>
</mapper>

View File

@@ -1,53 +1,47 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<sqlMap namespace="alfresco.content">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="alfresco.content.insert">
<insert id="insert_Mimetype" parameterClass="Mimetype" >
<insert id="insert_Mimetype" parameterType="Mimetype" >
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_mimetype_seq')
</selectKey>
insert into alf_mimetype (id, version, mimetype_str)
values (#id#, #version#, lower(#mimetype#))
<include refid="alfresco.content.insert_Mimetype_Sequence"/>
</insert>
<insert id="insert_Encoding" parameterClass="Encoding" >
<insert id="insert_Encoding" parameterType="Encoding" >
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_encoding_seq')
</selectKey>
insert into alf_encoding (id, version, encoding_str)
values (#id#, #version#, lower(#encoding#))
<include refid="alfresco.content.insert_Encoding_Sequence"/>
</insert>
<insert id="insert_ContentUrl" parameterClass="ContentUrl" >
<insert id="insert_ContentUrl" parameterType="ContentUrl" >
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_content_url_seq')
</selectKey>
insert into alf_content_url (id, content_url, content_url_short, content_url_crc, content_size, orphan_time)
values (#id#, #contentUrl#, #contentUrlShort#, #contentUrlCrc#, #size#, #orphanTime#)
<include refid="alfresco.content.insert_ContentUrl_Sequence"/>
</insert>
<insert id="insert_ContentData" parameterClass="ContentData" >
<insert id="insert_ContentData" parameterType="ContentData" >
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_content_data_seq')
</selectKey>
insert into alf_content_data (id, version, content_url_id, content_mimetype_id, content_encoding_id, content_locale_id)
values (#id#, #version#, #contentUrlId#, #mimetypeId#, #encodingId#, #localeId#)
<include refid="alfresco.content.insert_ContentData_Sequence"/>
</insert>
</sqlMap>
</mapper>

View File

@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<sqlMap namespace="alfresco.locale">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<insert id="insert_Locale" parameterClass="Locale">
<selectKey resultClass="long" keyProperty="id">
<mapper namespace="alfresco.locale.insert">
<insert id="insert_Locale" parameterType="Locale">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_locale_seq')
</selectKey>
insert into alf_locale (id, version, locale_str)
values (#id#, #version#, #localeStr#)
<include refid="alfresco.locale.insert_Locale_Sequence"/>
</insert>
</sqlMap>
</mapper>

View File

@@ -1,31 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<sqlMap namespace="alfresco.lock">
<mapper namespace="alfresco.lock.insert">
<insert id="insert_LockResource" parameterClass="LockResource" >
<insert id="insert_LockResource" parameterType="LockResource" >
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_lock_resource_seq')
</selectKey>
insert into alf_lock_resource (id, version, qname_ns_id, qname_localname)
values (#id#, #version#, #qnameNamespaceId#, lower(#qnameLocalName#))
<include refid="insert_LockResource_Sequence"/>
</insert>
<insert id="insert_Lock" parameterClass="Lock" >
<insert id="insert_Lock" parameterType="Lock" >
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_lock_seq')
</selectKey>
insert into alf_lock (id, version, shared_resource_id, excl_resource_id, lock_token, start_time, expiry_time)
values (#id#, #version#, #sharedResourceId#, #exclusiveResourceId#, lower(#lockToken#), #startTime#, #expiryTime#)
<include refid="insert_Lock_Sequence"/>
</insert>
</sqlMap>
</mapper>

View File

@@ -1,58 +1,56 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<sqlMap namespace="alfresco.node">
<mapper namespace="alfresco.node.insert">
<insert id="insert_Server" parameterClass="Server" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_Server" parameterType="Server" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_server_seq')
</selectKey>
<include refid="alfresco.node.insert_Server_Sequence"/>
<include refid="alfresco.node.insert_Server_Sequence"/>
</insert>
<insert id="insert_Store" parameterClass="Store" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_Store" parameterType="Store" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_store_seq')
</selectKey>
<include refid="alfresco.node.insert_Store_Sequence"/>
<include refid="alfresco.node.insert_Store_Sequence"/>
</insert>
<insert id="insert_Node" parameterClass="Node" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_Node" parameterType="Node" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_node_seq')
</selectKey>
<include refid="alfresco.node.insert_Node_Sequence"/>
<include refid="alfresco.node.insert_Node_Sequence"/>
</insert>
<insert id="insert_Transaction" parameterClass="Transaction" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_Transaction" parameterType="Transaction" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_transaction_seq')
</selectKey>
<include refid="alfresco.node.insert_Transaction_Sequence"/>
<include refid="alfresco.node.insert_Transaction_Sequence"/>
</insert>
<insert id="insert_NodeAssoc" parameterClass="NodeAssoc" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_NodeAssoc" parameterType="NodeAssoc" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_node_assoc_seq')
</selectKey>
<include refid="alfresco.node.insert_NodeAssoc_Sequence"/>
<include refid="alfresco.node.insert_NodeAssoc_Sequence"/>
</insert>
<insert id="insert_ChildAssoc" parameterClass="ChildAssoc" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_ChildAssoc" parameterType="ChildAssoc" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_child_assoc_seq')
</selectKey>
<include refid="alfresco.node.insert_ChildAssoc_Sequence"/>
</insert>
</sqlMap>
</mapper>

View File

@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<sqlMap namespace="alfresco.permissions">
<mapper namespace="alfresco.permissions.insert">
<insert id="insert_Acl" parameterClass="Acl">
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_Acl" parameterType="Acl">
<selectKey resultType="long" keyProperty="id" order="BEFORE">
select nextVal('alf_access_control_list_seq')
</selectKey>
@@ -15,8 +13,8 @@
</insert>
<insert id="insert_AclMember" parameterClass="AclMember">
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_AclMember" parameterType="AclMember">
<selectKey resultType="long" keyProperty="id" order="BEFORE">
select nextVal('alf_acl_member_seq')
</selectKey>
@@ -24,8 +22,8 @@
</insert>
<insert id="insert_AclChangeSet" parameterClass="AclChangeSet">
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_AclChangeSet" parameterType="AclChangeSet">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_acl_change_set_seq')
</selectKey>
@@ -33,8 +31,8 @@
</insert>
<insert id="insert_Ace" parameterClass="Ace">
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_Ace" parameterType="Ace">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_access_control_entry_seq')
</selectKey>
@@ -42,8 +40,8 @@
</insert>
<insert id="insert_AceContext" parameterClass="AceContext">
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_AceContext" parameterType="AceContext">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_ace_context_seq')
</selectKey>
@@ -51,8 +49,8 @@
</insert>
<insert id="insert_Permission" parameterClass="Permission">
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_Permission" parameterType="Permission">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_permission_seq')
</selectKey>
@@ -60,8 +58,8 @@
</insert>
<insert id="insert_Authority" parameterClass="Authority">
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_Authority" parameterType="Authority">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_authority_seq')
</selectKey>
@@ -69,8 +67,8 @@
</insert>
<insert id="insert_AuthorityAlias" parameterClass="AuthorityAlias">
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_AuthorityAlias" parameterType="AuthorityAlias">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_authority_alias_seq')
</selectKey>
@@ -78,4 +76,4 @@
</insert>
</sqlMap>
</mapper>

View File

@@ -1,77 +1,57 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<sqlMap namespace="alfresco.propval">
<mapper namespace="alfresco.propval.insert">
<insert id="insert_PropertyClass" parameterClass="PropertyClass" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_PropertyClass" parameterType="PropertyClass" >
<selectKey resultType=
"long" keyProperty="id" order="BEFORE" >
select nextVal('alf_prop_class_seq')
</selectKey>
insert into alf_prop_class (id, java_class_name, java_class_name_short, java_class_name_crc)
values (#id#, #javaClassName#, #javaClassNameShort#, #javaClassNameCrc#)
<include refid="insert_PropertyClass_Sequence"/>
</insert>
<insert id="insert_PropertyStringValue" parameterClass="PropertyStringValue" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_PropertyStringValue" parameterType="PropertyStringValue" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_prop_string_value_seq')
</selectKey>
insert into alf_prop_string_value (id, string_value, string_end_lower, string_crc)
values (#id#, #stringValue#, #stringEndLower#, #stringCrc#)
<include refid="insert_PropertyStringValue_Sequence"/>
</insert>
<insert id="insert_PropertyDoubleValue" parameterClass="PropertyDoubleValue" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_PropertyDoubleValue" parameterType="PropertyDoubleValue" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_prop_double_value_seq')
</selectKey>
insert into alf_prop_double_value (id, double_value)
values (#id#, #doubleValue#)
<include refid="insert_PropertyDoubleValue_Sequence"/>
</insert>
<insert id="insert_PropertySerializableValue" parameterMap="parameter_IdPropertySerializableValue" >
<selectKey resultClass="long" keyProperty="id">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_prop_serializable_value_seq')
</selectKey>
insert into alf_prop_serializable_value (id, serializable_value)
values (?, ?)
<include refid="insert_PropertySerializableValue_Sequence"/>
</insert>
<insert id="insert_PropertyValue" parameterClass="PropertyValue" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_PropertyValue" parameterType="PropertyValue" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_prop_value_seq')
</selectKey>
insert into alf_prop_value (id, actual_type_id, persisted_type, long_value)
values (#id#, #actualTypeId#, #persistedType#, #longValue#)
<include refid="insert_PropertyValue_Sequence"/>
</insert>
<insert id="insert_PropertyRoot" parameterMap="parameter_IdPropertyRoot" >
<selectKey resultClass="long" keyProperty="id" type="pre">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_prop_root_seq')
</selectKey>
<include refid="insert_PropertyRoot_Sequence"/>
</insert>
<insert id="insert_PropertyUniqueContext" parameterClass="PropertyUniqueContext" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_PropertyUniqueContext" parameterType="PropertyUniqueContext" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_prop_unique_ctx_seq')
</selectKey>
<include refid="insert_PropertyUniqueContext_Sequence"/>
</insert>
</sqlMap>
</mapper>

View File

@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<sqlMap namespace="alfresco.qname">
<mapper namespace="alfresco.qname.insert">
<insert id="insert_Namespace" parameterClass="Namespace" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_Namespace" parameterType="Namespace" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_namespace_seq')
</selectKey>
<include refid="alfresco.qname.insert_Namespace_Sequence"/>
<include refid="alfresco.qname.insert_Namespace_Sequence"/>
</insert>
<insert id="insert_QName" parameterClass="QName" >
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_QName" parameterType="QName" >
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_qname_seq')
</selectKey>
@@ -23,4 +21,4 @@
</insert>
</sqlMap>
</mapper>

View File

@@ -1,17 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMap
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<sqlMap namespace="alfresco.usage">
<mapper namespace="alfresco.usage.insert">
<insert id="insert_UsageDelta" parameterClass="UsageDelta">
<selectKey resultClass="long" keyProperty="id">
<insert id="insert_UsageDelta" parameterType="UsageDelta">
<selectKey resultType="long" keyProperty="id" order="BEFORE" >
select nextVal('alf_usage_delta_seq')
</selectKey>
<include refid="insert_UsageDelta_Sequence"/>
<include refid="insert_UsageDelta_Sequence"/>
</insert>
</sqlMap>
</mapper>