svn commit: r397979 - in /incubator/cayenne/trunk/cayenne-jpa/src: main/java/org/apache/cayenne/jpa/map/JpaColumn.java test/java/org/apache/cayenne/jpa/map/ test/java/org/apache/cayenne/jpa/map/JpaColumnTest.java

[aa...@apache.org]

Author: aadamchik
Date: Fri Apr 28 11:41:01 2006
New Revision: 397979

URL: http://svn.apache.org/viewcvs?rev=397979&view=rev
Log:
fixing default values in JpaColumn constructor

Added:
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/map/
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/map/JpaColumnTest.java
Modified:
    incubator/cayenne/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaColumn.java

Modified: incubator/cayenne/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaColumn.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaColumn.java?rev=397979&r1=397978&r2=397979&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaColumn.java (original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaColumn.java Fri Apr 28 11:41:01 2006
@@ -48,7 +48,10 @@
             columnDefinition = annotation.columnDefinition();
         }
 
-        table = annotation.table();
+        if (!"".equals(annotation.table())) {
+            table = annotation.table();
+        }
+
         length = annotation.length();
         precision = annotation.precision();
         scale = annotation.scale();

Added: incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/map/JpaColumnTest.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/map/JpaColumnTest.java?rev=397979&view=auto
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/map/JpaColumnTest.java (added)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/map/JpaColumnTest.java Fri Apr 28 11:41:01 2006
@@ -0,0 +1,36 @@
+/*
+ *  Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.cayenne.jpa.map;
+
+import javax.persistence.Column;
+
+import junit.framework.TestCase;
+
+public class JpaColumnTest extends TestCase {
+
+    @Column
+    public void testEmptyAnnotationConstructor() throws Exception {
+        Column annotation = getClass().getMethod(
+                "testEmptyAnnotationConstructor",
+                (Class[]) null).getAnnotation(Column.class);
+
+        JpaColumn c = new JpaColumn(annotation);
+        assertNull(c.getName());
+        assertNull(c.getTable());
+        assertNull(c.getColumnDefinition());
+        assertEquals(255, c.getLength());
+    }
+}