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

Merged V3.2 to HEAD

Browse Source 
17403: ETHREEOH-3288: Corrected SQL statement used to obtain the local name from the qname (two locations) in MySQL upgrade.
   17405: ETHREEOH-3255: build 205: unable to upgrade on Oracle.
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.2:r17403,17405


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-01-19 12:51:53 +00:00
parent b865ef7d88
commit 60a9007e8e
9 changed files with 1155 additions and 1105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/avm-insert-SqlMap.xml
View File

@@ -4,27 +4,12 @@
PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd">
<sqlMap namespace="alfresco.avm">
<parameterMap id="parameter_IdStorePropertyPatternMap" class="AVMStoreProperty">
<parameter property="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="actualType" jdbcType="INT" javaType="java.lang.Integer"/>
<parameter property="persistedType" jdbcType="INT" javaType="java.lang.Integer"/>
<parameter property="isMultiValued" jdbcType="BIT" javaType="java.lang.Boolean"/>
<parameter property="booleanValue" jdbcType="BIT" javaType="java.lang.Boolean"/>
<parameter property="longValue" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="floatValue" jdbcType="FLOAT" javaType="java.lang.Float"/>
<parameter property="doubleValue" jdbcType="DOUBLE" javaType="java.lang.Double"/>
<parameter property="stringValue" jdbcType="VARCHAR" javaType="java.lang.String"/>
<parameter property="serializableValue" jdbcType="BLOB" javaType="java.io.Serializable"/>
<parameter property="avmStoreId" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="qnameId" jdbcType="BIGINT" javaType="java.lang.Long"/>
</parameterMap>
<sqlMap namespace="alfresco.avm">
<insert id="insert_AVMStore" parameterClass="AVMStore">
<selectKey resultClass="long" keyProperty="id">
select nextVal('avm_stores_seq')
select nextVal('hibernate_sequence')
</selectKey>
insert into avm_stores (id, next_version_id, name, vers, current_root_id, acl_id)
@@ -32,21 +17,21 @@
</insert>
<insert id="insert_AVMStoreProperty" parameterMap="parameter_IdStorePropertyPatternMap">
<insert id="insert_AVMStoreProperty" parameterClass="AVMStoreProperty">
<selectKey resultClass="long" keyProperty="id" type="pre">
select avm_store_properties_seq.nextval as value from dual
<selectKey resultClass="long" keyProperty="id">
select nextVal('hibernate_sequence')
</selectKey>
insert into avm_store_properties (id, actual_type_n, persisted_type_n, multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value, avm_store_id, qname_id)
values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
values (#id#, #actualType#, #persistedType#, #isMultiValued#, #booleanValue#, #longValue#, #floatValue#, #doubleValue#, #stringValue#, #serializableValue#, #avmStoreId#, #qnameId#)
</insert>
<insert id="insert_AVMNode" parameterClass="AVMNode">
<selectKey resultClass="long" keyProperty="id">
select nextVal('avm_nodes_seq')
select nextVal('hibernate_sequence')
</selectKey>
insert into avm_nodes (id, class_type, deletedType, version_id, vers, store_new_id, acl_id, guid, owner, creator, createDate, lastModifier, modDate, accessDate, is_root, layer_id, indirection, indirection_version, primary_indirection, opacity, content_url, mime_type, encoding, length)
@@ -57,7 +42,7 @@
<insert id="insert_AVMVersionRoot" parameterClass="AVMVersionRoot">
<selectKey resultClass="long" keyProperty="id">
select nextVal('avm_version_roots_seq')
select nextVal('hibernate_sequence')
</selectKey>
insert into avm_version_roots (id, avm_store_id, root_id, version_id, creator, create_date, tag, description)