Author: eric
Date: Wed May 6 11:11:50 2015
New Revision: 1677959
URL: http://svn.apache.org/r1677959
Log:
Add ORDER BY to make Postgresql happy, patch contributed by Kohei Nozaki
(MAILBOX-228)
Modified:
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
Modified:
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java?rev=1677959&r1=1677958&r2=1677959&view=diff
==============================================================================
---
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
(original)
+++
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
Wed May 6 11:11:50 2015
@@ -55,25 +55,25 @@ import org.apache.openjpa.persistence.jd
@IdClass(AbstractJPAMessage.MailboxIdUidKey.class)
@NamedQueries({
@NamedQuery(name="findRecentMessageUidsInMailbox",
- query="SELECT message.uid FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.recent = TRUE"),
+ query="SELECT message.uid FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.recent = TRUE ORDER BY
message.uid ASC"),
@NamedQuery(name="findUnseenMessagesInMailboxOrderByUid",
query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.seen = FALSE ORDER BY
message.uid ASC"),
@NamedQuery(name="findMessagesInMailbox",
- query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam"),
+ query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam ORDER BY message.uid ASC"),
@NamedQuery(name="findMessagesInMailboxBetweenUIDs",
- query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND
:toParam"),
+ query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND
:toParam ORDER BY message.uid ASC"),
@NamedQuery(name="findMessagesInMailboxWithUID",
- query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid=:uidParam"),
+ query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid=:uidParam ORDER BY
message.uid ASC"),
@NamedQuery(name="findMessagesInMailboxAfterUID",
- query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam"),
+ query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam ORDER BY
message.uid ASC"),
@NamedQuery(name="findDeletedMessagesInMailbox",
- query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.deleted=TRUE"),
+ query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.deleted=TRUE ORDER BY
message.uid ASC"),
@NamedQuery(name="findDeletedMessagesInMailboxBetweenUIDs",
- query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND
:toParam AND message.deleted=TRUE"),
+ query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND
:toParam AND message.deleted=TRUE ORDER BY message.uid ASC"),
@NamedQuery(name="findDeletedMessagesInMailboxWithUID",
- query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid=:uidParam AND
message.deleted=TRUE"),
+ query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid=:uidParam AND
message.deleted=TRUE ORDER BY message.uid ASC"),
@NamedQuery(name="findDeletedMessagesInMailboxAfterUID",
- query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam AND
message.deleted=TRUE"),
+ query="SELECT message FROM Message message WHERE
message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam AND
message.deleted=TRUE ORDER BY message.uid ASC"),
@NamedQuery(name="deleteDeletedMessagesInMailbox",
query="DELETE FROM Message message WHERE message.mailbox.mailboxId
= :idParam AND message.deleted=TRUE"),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
