Return-Path: Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: (qmail 79758 invoked from network); 5 Dec 2003 15:57:27 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 5 Dec 2003 15:57:27 -0000 Received: (qmail 41975 invoked by uid 500); 5 Dec 2003 15:57:21 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 41960 invoked by uid 500); 5 Dec 2003 15:57:20 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 41947 invoked by uid 500); 5 Dec 2003 15:57:20 -0000 Received: (qmail 41938 invoked from network); 5 Dec 2003 15:57:20 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 5 Dec 2003 15:57:20 -0000 Received: (qmail 79741 invoked by uid 1280); 5 Dec 2003 15:57:25 -0000 Date: 5 Dec 2003 15:57:25 -0000 Message-ID: <20031205155725.79740.qmail@minotaur.apache.org> From: mpoeschl@apache.org To: db-torque-cvs@apache.org Subject: cvs commit: db-torque/src/generator/src/java/org/apache/torque/engine/database/model TypeMap.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mpoeschl 2003/12/05 07:57:25 Modified: src/generator/src/java/org/apache/torque/engine/database/model TypeMap.java Log: use VARCHAR if the jdbc type is unknown (to get a incorrect schema.xml is better as to get no schema.xml) Revision Changes Path 1.5 +15 -3 db-torque/src/generator/src/java/org/apache/torque/engine/database/model/TypeMap.java Index: TypeMap.java =================================================================== RCS file: /home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/model/TypeMap.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TypeMap.java 5 Dec 2003 14:28:28 -0000 1.4 +++ TypeMap.java 5 Dec 2003 15:57:25 -0000 1.5 @@ -54,9 +54,12 @@ * . */ +import java.sql.Types; import java.util.Hashtable; import java.util.Iterator; -import java.sql.Types; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; // I don't know if the peer system deals // with the recommended mappings. @@ -110,6 +113,9 @@ */ public class TypeMap { + /** Logging class from commons.logging */ + private static Log log = LogFactory.getLog(Column.class); + private static final SchemaType[] TEXT_TYPES = { SchemaType.CHAR, SchemaType.VARCHAR, SchemaType.LONGVARCHAR, @@ -586,7 +592,13 @@ { initialize(); } - return (SchemaType) jdbcToTorqueTypeMap.get(sqlType); + SchemaType st = (SchemaType) jdbcToTorqueTypeMap.get(sqlType); + if (st == null) + { + log.warn("SchemaType for JdbcType " + sqlType + " is not defined"); + st = SchemaType.VARCHAR; + } + return st; } /** --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org