You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by to...@apache.org on 2008/01/19 22:20:52 UTC

svn commit: r613453 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/SetNotNullToModel.java

Author: torehalset
Date: Sat Jan 19 13:20:52 2008
New Revision: 613453

URL: http://svn.apache.org/viewvc?rev=613453&view=rev
Log:
CAY-885: merge changes between model and db
missing SetNotNullToModel token name and value

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/SetNotNullToModel.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/SetNotNullToModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/SetNotNullToModel.java?rev=613453&r1=613452&r2=613453&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/SetNotNullToModel.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/SetNotNullToModel.java Sat Jan 19 13:20:52 2008
@@ -45,11 +45,11 @@
     }
 
     public String getTokenName() {
-        return null;
+        return "Set Not Null";
     }
 
     public String getTokenValue() {
-        return null;
+        return entity.getName() + "." + column.getName();
     }
 
 }