Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Up 3488 : Preferences : encoding pb with postgresql - UTF-8 non ascii characters #47

Closed
wants to merge 2 commits into from
Closed

Up 3488 : Preferences : encoding pb with postgresql - UTF-8 non ascii characters #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
145a358
UP-3488: test : improve JpaPortletDaoTest by storing portlet preferen…
vbonamy Jun 5, 2012
ae0cc08
UP-3488: use @Type(type = org.hibernate.type.StringClobType) for @Lob…
vbonamy Jun 5, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions uportal-war/src/main/java/org/jasig/portal/events/handlers/db/PersistentPortalEvent.java
View file
Open in desktop
Expand Up @@ -89,6 +89,7 @@ public class PersistentPortalEvent implements Serializable {

@Column(name = "EVENT_DATA", nullable=false, updatable=false)
@Lob
@Type(type="org.hibernate.type.StringClobType")
private final String eventData;

@Column(name = "AGGREGATED")
Expand Down
3 changes: 3 additions & 0 deletions uportal-war/src/main/java/org/jasig/portal/portlet/dao/jpa/PortletPreferenceImpl.java
View file
Open in desktop
Expand Up @@ -49,6 +49,7 @@
import org.hibernate.annotations.FetchMode;
import org.hibernate.annotations.Index;
import org.hibernate.annotations.IndexColumn;
import org.hibernate.annotations.Type;
import org.jasig.portal.dao.usertype.NullSafeStringColumnMapper;
import org.jasig.portal.portlet.om.IPortletPreference;

Expand Down Expand Up @@ -85,6 +86,7 @@ public class PortletPreferenceImpl implements IPortletPreference, Cloneable {

@Column(name = "PREF_NAME")
@Lob
@Type(type="org.hibernate.type.StringClobType")
private String name = null;

@Column(name = "READ_ONLY", nullable = false)
Expand All @@ -100,6 +102,7 @@ public class PortletPreferenceImpl implements IPortletPreference, Cloneable {
@Column(name = "PREF_VALUE")
@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
@Fetch(FetchMode.JOIN)
@Type(type="org.hibernate.type.StringClobType")
private List<String> values = new ArrayList<String>(0);

@Column(name = "NULL_VALUES", nullable = false)
Expand Down
7 changes: 5 additions & 2 deletions uportal-war/src/test/java/org/jasig/portal/portlet/dao/jpa/JpaPortletDaoTest.java
View file
Open in desktop
Expand Up @@ -140,6 +140,7 @@ protected void callWithoutResult() {
final List<IPortletPreference> prefsList2 = chanDef2.getPortletPreferences();
prefsList2.add(new PortletPreferenceImpl("prefName1", false, "val1", "val2"));
prefsList2.add(new PortletPreferenceImpl("prefName2", true, "val3", "val4"));
prefsList2.add(new PortletPreferenceImpl("prefNuméro1", true, "val3", "numéro1-non-ascii-char"));

jpaPortletDefinitionDao.updatePortletDefinition(chanDef2);
}
Expand All @@ -152,7 +153,7 @@ protected void callWithoutResult() {

// verify preferences
final List<IPortletPreference> prefsList2 = chanDef2.getPortletPreferences();
assertEquals(2, prefsList2.size());
assertEquals(3, prefsList2.size());
}
});

Expand All @@ -167,10 +168,12 @@ protected void callWithoutResult() {
final List<IPortletPreference> expectedPrefsList3 = new ArrayList<IPortletPreference>();
expectedPrefsList3.add(new PortletPreferenceImpl("prefName1", false, "val1", "val2"));
expectedPrefsList3.add(new PortletPreferenceImpl("prefName2", true, "val3", "val4"));

expectedPrefsList3.add(new PortletPreferenceImpl("prefNuméro1", true, "val3", "numéro1-non-ascii-char"));

assertEquals(expectedPrefsList3, prefsList3);


prefsList3.remove(2);
prefsList3.remove(1);
prefsList3.add(new PortletPreferenceImpl("prefName3", false, "val5", "val6"));

Expand Down