svn commit: r897600 - /james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/model/JPASubscription.java

[norman]

Author: norman
Date: Sun Jan 10 08:52:22 2010
New Revision: 897600

URL: http://svn.apache.org/viewvc?rev=897600&view=rev
Log:
use username as column name because user is reserved in some dbs (IMAP-103)

Modified:
    
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/model/JPASubscription.java

Modified: 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/model/JPASubscription.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/model/JPASubscription.java?rev=897600&r1=897599&r2=897600&view=diff
==============================================================================
--- 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/model/JPASubscription.java
 (original)
+++ 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/model/JPASubscription.java
 Sun Jan 10 08:52:22 2010
@@ -33,12 +33,12 @@
  * A subscription to a mailbox by a user.
  */
 @Entity(name="Subscription")
-...@table(uniqueconstrain...@uniqueconstraint(columnNames={"USER", "MAILBOX"}))
+...@table(uniqueconstrain...@uniqueconstraint(columnNames={"USERNAME", 
"MAILBOX"}))
 @NamedQueries({
     @NamedQuery(name="findFindMailboxSubscriptionForUser",
-        query="SELECT subscription FROM Subscription subscription WHERE 
subscription.user = :userParam AND subscription.mailbox = :mailboxParam"),      
    
+        query="SELECT subscription FROM Subscription subscription WHERE 
subscription.username = :userParam AND subscription.mailbox = :mailboxParam"),  
        
     @NamedQuery(name="findSubscriptionsForUser",
-        query="SELECT subscription FROM Subscription subscription WHERE 
subscription.user = :userParam")                  
+        query="SELECT subscription FROM Subscription subscription WHERE 
subscription.username = :userParam")                  
 })
 public class JPASubscription implements Subscription {
 
@@ -47,7 +47,7 @@
     @GeneratedValue
     @Id private long id;
     /** Name of the subscribed user */
-    @Basic(optional=false) private String user;
+    @Basic(optional=false) private String username;
     /** Subscribed mailbox */
     @Basic(optional=false) private String mailbox;
     
@@ -59,12 +59,12 @@
     
     /**
      * Constructs a user subscription.
-     * @param user not null
+     * @param username not null
      * @param mailbox not null
      */
-    public JPASubscription(String user, String mailbox) {
+    public JPASubscription(String username, String mailbox) {
         super();
-        this.user = user;
+        this.username = username;
         this.mailbox = mailbox;
     }
 
@@ -79,7 +79,7 @@
      * @see org.apache.james.imap.store.user.model.Subscription#getUser()
      */
     public String getUser() {
-        return user;
+        return username;
     }
 
     @Override
@@ -113,7 +113,7 @@
     {
         final String result = "Subscription ( "
             + "id = " + this.id + TO_STRING_SEPARATOR
-            + "user = " + this.user + TO_STRING_SEPARATOR
+            + "user = " + this.username + TO_STRING_SEPARATOR
             + "mailbox = " + this.mailbox + TO_STRING_SEPARATOR
             + " )";
     



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org