Skip to content

Commit

Permalink
SAK-22332 SAK-22339 SAK-22336 reverting hibernate changes related to …
Browse files Browse the repository at this point in the history 
…KNL-515

git-svn-id: https://source.sakaiproject.org/svn/common/trunk@109870 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information
Aaron Zeckoski committed Jun 28, 2012
1 parent 884982e commit 29286aa
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
2 changes: 0 additions & 2 deletions ...-composite-component/src/java/org/sakaiproject/component/common/type/TypeManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ public Object doInHibernate(Session session) throws HibernateException, SQLExcep
Query q = session.getNamedQuery(FINDTYPEBYUUID);
q.setString(UUID, uuid);
q.setCacheable(cacheFindTypeByUuid);
q.setCacheRegion(Type.class.getCanonicalName());
return q.uniqueResult();
}
};
Expand Down Expand Up @@ -190,7 +189,6 @@ public Object doInHibernate(Session session) throws HibernateException, SQLExcep
q.setString(DOMAIN, domain);
q.setString(KEYWORD, keyword);
q.setCacheable(cacheFindTypeByTuple);
q.setCacheRegion(Type.class.getCanonicalName());
return q.uniqueResult();
}
};
Expand Down
24 changes: 12 additions & 12 deletions common/impl/src/java/org/sakaiproject/component/common/edu/person/SakaiPersonImpl.hbm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,28 +114,28 @@
<property name="campus" column="CAMPUS" />
<property name="hidePrivateInfo" column="HIDE_PRIVATE_INFO" />
<property name="hidePublicInfo" column="HIDE_PUBLIC_INFO" />
<property name="notes" column="NOTES" type="string" length="75000" />
<property name="notes" column="NOTES" type="text" length="75000" />
<property name="pictureUrl" column="PICTURE_URL" />
<property name="systemPicturePreferred" column="SYSTEM_PICTURE_PREFERRED" />
<property name="ferpaEnabled" column="ferpaEnabled" index="SAKAI_PERSON_ferpaEnabled_I" />
<property name="dateOfBirth" column="dateOfBirth" type="date" />
<property name="locked" column="locked" type="boolean" />

<property name="favouriteBooks" column="FAVOURITE_BOOKS" type="string" length="75000" />
<property name="favouriteTvShows" column="FAVOURITE_TV_SHOWS" type="string" length="75000" />
<property name="favouriteMovies" column="FAVOURITE_MOVIES" type="string" length="75000" />
<property name="favouriteQuotes" column="FAVOURITE_QUOTES" type="string" length="75000" />
<property name="favouriteBooks" column="FAVOURITE_BOOKS" type="text" length="75000" />
<property name="favouriteTvShows" column="FAVOURITE_TV_SHOWS" type="text" length="75000" />
<property name="favouriteMovies" column="FAVOURITE_MOVIES" type="text" length="75000" />
<property name="favouriteQuotes" column="FAVOURITE_QUOTES" type="text" length="75000" />

<property name="educationCourse" column="EDUCATION_COURSE" type="string" length="75000" />
<property name="educationSubjects" column="EDUCATION_SUBJECTS" type="string" length="75000" />
<property name="educationCourse" column="EDUCATION_COURSE" type="text" length="75000" />
<property name="educationSubjects" column="EDUCATION_SUBJECTS" type="text" length="75000" />

<property name="normalizedMobile" column="NORMALIZEDMOBILE" />

<property name="staffProfile" column="STAFF_PROFILE" type="string" length="75000" />
<property name="universityProfileUrl" column="UNIVERSITY_PROFILE_URL" type="string" length="75000" />
<property name="academicProfileUrl" column="ACADEMIC_PROFILE_URL" type="string" length="75000" />
<property name="publications" column="PUBLICATIONS" type="string" length="75000" />
<property name="businessBiography" column="BUSINESS_BIOGRAPHY" type="string" length="75000" />
<property name="staffProfile" column="STAFF_PROFILE" type="text" length="75000" />
<property name="universityProfileUrl" column="UNIVERSITY_PROFILE_URL" type="text" length="75000" />
<property name="academicProfileUrl" column="ACADEMIC_PROFILE_URL" type="text" length="75000" />
<property name="publications" column="PUBLICATIONS" type="text" length="75000" />
<property name="businessBiography" column="BUSINESS_BIOGRAPHY" type="text" length="75000" />

</subclass>
</subclass>
Expand Down

0 comments on commit 29286aa

Please sign in to comment.