Return-Path: Delivered-To: apmail-incubator-cayenne-commits-archive@locus.apache.org Received: (qmail 38014 invoked from network); 1 Sep 2006 20:30:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Sep 2006 20:30:59 -0000 Received: (qmail 12919 invoked by uid 500); 1 Sep 2006 20:30:59 -0000 Delivered-To: apmail-incubator-cayenne-commits-archive@incubator.apache.org Received: (qmail 12904 invoked by uid 500); 1 Sep 2006 20:30:59 -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 12895 invoked by uid 99); 1 Sep 2006 20:30:59 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Sep 2006 13:30:59 -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; Fri, 01 Sep 2006 13:30:57 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D61AC1A981A; Fri, 1 Sep 2006 13:30:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r439468 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types: CalendarType.java UtilDateType.java Date: Fri, 01 Sep 2006 20:30:37 -0000 To: cayenne-commits@incubator.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060901203037.D61AC1A981A@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: Fri Sep 1 13:30:36 2006 New Revision: 439468 URL: http://svn.apache.org/viewvc?rev=439468&view=rev Log: CAY-645 - better error diagnostics Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types/CalendarType.java incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types/UtilDateType.java Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types/CalendarType.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types/CalendarType.java?rev=439468&r1=439467&r2=439468&view=diff ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types/CalendarType.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types/CalendarType.java Fri Sep 1 13:30:36 2006 @@ -27,6 +27,7 @@ import java.util.GregorianCalendar; import org.apache.cayenne.CayenneRuntimeException; +import org.apache.cayenne.dba.TypesMapping; import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.validation.ValidationResult; @@ -168,9 +169,11 @@ else if (type == Types.TIMESTAMP) return new java.sql.Timestamp(calendar.getTimeInMillis()); else - throw new IllegalArgumentException("Only date/time types can be used for '" - + getClassName() - + "'."); + throw new IllegalArgumentException( + "Only DATE, TIME or TIMESTAMP can be mapped as '" + + getClassName() + + "', got " + + TypesMapping.getSqlNameByType(type)); } public boolean validateProperty( Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types/UtilDateType.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types/UtilDateType.java?rev=439468&r1=439467&r2=439468&view=diff ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types/UtilDateType.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/types/UtilDateType.java Fri Sep 1 13:30:36 2006 @@ -68,9 +68,11 @@ else if (type == Types.TIMESTAMP) return new java.sql.Timestamp(((Date) val).getTime()); else - throw new IllegalArgumentException("Only date/time types can be used for '" - + getClassName() - + "'."); + throw new IllegalArgumentException( + "Only DATE, TIME or TIMESTAMP can be mapped as '" + + getClassName() + + "', got " + + TypesMapping.getSqlNameByType(type)); } public Object materializeObject(ResultSet rs, int index, int type) throws Exception {