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

Fixed ALF-4589: patch.updateAvmPermissionData fails during upgrade from 2.1.x to 3.4.0

Browse Source 
- Mix-up between 'qname_id' and 'type_qname_id'
 - Fixed update statement and renamed bean members to conform to 'type_qname_id'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-09-06 09:18:23 +00:00
parent 82b8b16c06
commit efef368e47
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/alfresco/ibatis/org.hibernate.dialect.Dialect/permissions-common-SqlMap.xml
View File

@@ -72,7 +72,7 @@
<resultMap id="result_Permission" class="Permission">
<result property="id" column="id" jdbcType="BIGINT" javaType="long"/>
<result property="version" column="version" jdbcType="BIGINT" javaType="long"/>
<result property="qnameId" column="type_qname_id" jdbcType="BIGINT" javaType="long"/>
<result property="typeQnameId" column="type_qname_id" jdbcType="BIGINT" javaType="long"/>
<result property="name" column="name" jdbcType="VARCHAR" javaType="string"/>
</resultMap>
@@ -216,14 +216,14 @@
insert into alf_permission
(version, type_qname_id, name)
values
(#version#, #qnameId#, #name#)
(#version#, #typeQnameId#, #name#)
</sql>
<sql id="insert_Permission_Sequence">
insert into alf_permission
(id, version, type_qname_id, name)
values
(#id#, #version#, #qnameId#, #name#)
(#id#, #version#, #typeQnameId#, #name#)
</sql>
<sql id="insert_Authority_AutoIncrement">
@@ -318,7 +318,7 @@
update
alf_permission
set
qname_id = #qnameId#,
type_qname_id = #typeQnameId#,
name = #name#,
version = #version#
where

18
source/java/org/alfresco/repo/domain/permissions/PermissionEntity.java
View File

@@ -41,7 +41,7 @@ public class PermissionEntity implements Permission, Serializable
private Long id;
private Long version;
private Long qnameId;
private Long typeQnameId;
private String name;
/**
@@ -51,9 +51,9 @@ public class PermissionEntity implements Permission, Serializable
{
}
public PermissionEntity(Long qnameId, String name)
public PermissionEntity(Long typeQnameId, String name)
{
this.qnameId = qnameId;
this.typeQnameId = typeQnameId;
this.name = name;
}
@@ -91,12 +91,12 @@ public class PermissionEntity implements Permission, Serializable
public Long getTypeQNameId()
{
return qnameId;
return typeQnameId;
}
public void setTypeQNameId(Long qnameId)
public void setTypeQNameId(Long typenameId)
{
this.qnameId = qnameId;
this.typeQnameId = typenameId;
}
public String getName()
@@ -112,7 +112,7 @@ public class PermissionEntity implements Permission, Serializable
@Override
public int hashCode()
{
return qnameId.hashCode() + (37 * name.hashCode());
return typeQnameId.hashCode() + (37 * name.hashCode());
}
@Override
@@ -125,7 +125,7 @@ public class PermissionEntity implements Permission, Serializable
else if (obj instanceof PermissionEntity)
{
PermissionEntity that = (PermissionEntity)obj;
return (EqualsHelper.nullSafeEquals(this.qnameId, that.qnameId) &&
return (EqualsHelper.nullSafeEquals(this.typeQnameId, that.typeQnameId) &&
EqualsHelper.nullSafeEquals(this.name, that.name));
}
else
@@ -141,7 +141,7 @@ public class PermissionEntity implements Permission, Serializable
sb.append("PermissionEntity")
.append("[ ID=").append(id)
.append(", version=").append(version)
.append(", qnameId=").append(qnameId)
.append(", typeQnameId=").append(typeQnameId)
.append(", name=").append(name)
.append("]");
return sb.toString();