Return-Path: Delivered-To: apmail-incubator-cayenne-commits-archive@locus.apache.org Received: (qmail 69546 invoked from network); 2 Sep 2006 18:41:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Sep 2006 18:41:02 -0000 Received: (qmail 7810 invoked by uid 500); 2 Sep 2006 18:41:02 -0000 Delivered-To: apmail-incubator-cayenne-commits-archive@incubator.apache.org Received: (qmail 7789 invoked by uid 500); 2 Sep 2006 18:41:02 -0000 Mailing-List: contact cayenne-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cayenne-dev@incubator.apache.org Delivered-To: mailing list cayenne-commits@incubator.apache.org Received: (qmail 7780 invoked by uid 99); 2 Sep 2006 18:41:01 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Sep 2006 11:41:01 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Sep 2006 11:41:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E41DD1A981A; Sat, 2 Sep 2006 11:40:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r439633 - in /incubator/cayenne/main/trunk/core/cayenne-jpa/src: main/java/org/apache/cayenne/jpa/map/ test/java/org/apache/cayenne/jpa/bridge/ test/java/org/apache/cayenne/jpa/entity/ Date: Sat, 02 Sep 2006 18:40:40 -0000 To: cayenne-commits@incubator.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060902184040.E41DD1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: aadamchik Date: Sat Sep 2 11:40:39 2006 New Revision: 439633 URL: http://svn.apache.org/viewvc?rev=439633&view=rev Log: fixing array properties processing when loading JPA defaults Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaPropertyDescriptor.java incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockTypesEntity.java Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaPropertyDescriptor.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaPropertyDescriptor.java?rev=439633&r1=439632&r2=439633&view=diff ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaPropertyDescriptor.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaPropertyDescriptor.java Sat Sep 2 11:40:39 2006 @@ -119,15 +119,17 @@ * an error if no annotation is present and none of the above rules apply. */ public boolean isDefaultNonRelationalType() { + return isDefaultNonRelationalType(getTargetEntityType()); + } - Class type = getTargetEntityType(); - + boolean isDefaultNonRelationalType(Class type) { + if (type.isPrimitive() || type.isEnum()) { return true; } if (type.isArray()) { - type = type.getComponentType(); + return isDefaultNonRelationalType(type.getComponentType()); } // it is sufficient to check serializability as all the types mentioned in the Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java?rev=439633&r1=439632&r2=439633&view=diff ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java Sat Sep 2 11:40:39 2006 @@ -142,5 +142,9 @@ .getAttribute("stringEnum"); assertNotNull(stringEnumColumn); assertEquals(Types.VARCHAR, stringEnumColumn.getType()); + + DbAttribute byteArrayColumn = (DbAttribute) typesTable.getAttribute("byteArray"); + assertNotNull(byteArrayColumn); + assertEquals(Types.BINARY, byteArrayColumn.getType()); } } Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockTypesEntity.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockTypesEntity.java?rev=439633&r1=439632&r2=439633&view=diff ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockTypesEntity.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockTypesEntity.java Sat Sep 2 11:40:39 2006 @@ -47,4 +47,6 @@ @Enumerated(value = EnumType.STRING) protected MockEnum stringEnum; + + protected byte[] byteArray; }