Return-Path: 
 <ojb-dev-return-13870-apmail-db-ojb-dev-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-ojb-dev-archive@www.apache.org
Received: (qmail 14138 invoked from network); 18 Jun 2006 22:11:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 Jun 2006 22:11:04 -0000
Received: (qmail 85391 invoked by uid 500); 18 Jun 2006 22:11:03 -0000
Delivered-To: apmail-db-ojb-dev-archive@db.apache.org
Received: (qmail 85371 invoked by uid 500); 18 Jun 2006 22:11:03 -0000
Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ojb-dev-unsubscribe@db.apache.org>
List-Help: <mailto:ojb-dev-help@db.apache.org>
List-Post: <mailto:ojb-dev@db.apache.org>
List-Id: "OJB Developers List" <ojb-dev.db.apache.org>
Reply-To: "OJB Developers List" <ojb-dev@db.apache.org>
Delivered-To: mailing list ojb-dev@db.apache.org
Received: (qmail 85360 invoked by uid 500); 18 Jun 2006 22:11:03 -0000
Received: (qmail 85357 invoked by uid 99); 18 Jun 2006 22:11:03 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Jun 2006 15:11:03 -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; Sun, 18 Jun 2006 15:11:02 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9F76F1A983A; Sun, 18 Jun 2006 15:10:42 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r415210 - in /db/ojb/branches/OJB_1_0_RELEASE: build.xml
 lib/DdlUtils-1.0-dev.jar
 src/java/org/apache/ojb/broker/ant/DdlUtilsDataHandling.java
Date: Sun, 18 Jun 2006 22:10:42 -0000
To: ojb-commits@db.apache.org
From: tomdz@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060618221042.9F76F1A983A@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: tomdz
Date: Sun Jun 18 15:10:41 2006
New Revision: 415210

URL: http://svn.apache.org/viewvc?rev=415210&view=rev
Log:
Updated DdlUtils-DB-Handling so that converters are now used

Modified:
    db/ojb/branches/OJB_1_0_RELEASE/build.xml
    db/ojb/branches/OJB_1_0_RELEASE/lib/DdlUtils-1.0-dev.jar
    db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/ant/DdlUtilsDataHandling.java

Modified: db/ojb/branches/OJB_1_0_RELEASE/build.xml
URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/build.xml?rev=415210&r1=415209&r2=415210&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/build.xml (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/build.xml Sun Jun 18 15:10:41 2006
@@ -420,6 +420,7 @@
                      includes="*schema.xml"/>
 
             <createdatabase failonerror="false"/>
+            <writeschemasqltofile alterdatabase="false" outputfile="${build.test}/ojbtest-schema.sql"/>
             <writeschematodatabase alterdatabase="false"/>
         </ddl2Database>
         <ojbData usedelimitedsqlidentifiers="false"

Modified: db/ojb/branches/OJB_1_0_RELEASE/lib/DdlUtils-1.0-dev.jar
URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/lib/DdlUtils-1.0-dev.jar?rev=415210&r1=415209&r2=415210&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/ant/DdlUtilsDataHandling.java
URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/ant/DdlUtilsDataHandling.java?rev=415210&r1=415209&r2=415210&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/ant/DdlUtilsDataHandling.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/ant/DdlUtilsDataHandling.java Sun Jun 18 15:10:41 2006
@@ -1,6 +1,6 @@
 package org.apache.ojb.broker.ant;
 
-/* Copyright 2004-2005 The Apache Software Foundation
+/* Copyright 2004-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.
@@ -28,8 +28,11 @@
 import org.apache.commons.digester.Rule;
 import org.apache.commons.digester.RuleSetBase;
 import org.apache.ddlutils.Platform;
+import org.apache.ddlutils.io.ConverterConfiguration;
+import org.apache.ddlutils.io.converters.SqlTypeConverter;
 import org.apache.ddlutils.model.Column;
 import org.apache.ddlutils.model.Database;
+import org.apache.ddlutils.model.Table;
 import org.apache.ojb.broker.metadata.ClassDescriptor;
 import org.apache.ojb.broker.metadata.DescriptorRepository;
 import org.xml.sax.Attributes;
@@ -39,6 +42,8 @@
 /**
  * Provides data input and output via DdlUtils.
  * 
+ * TODO: It might be useful to extend {@link org.apache.ddlutils.io.DataReader}
+ * 
  * @author Thomas Dudziak
  */
 public class DdlUtilsDataHandling
@@ -61,13 +66,18 @@
             {
                 String attrName  = attributes.getLocalName(idx);
                 String attrValue = attributes.getValue(idx);
+                Table  table     = _preparedModel.getTableFor(name);
                 Column column    = _preparedModel.getColumnFor(name, attrName);
 
                 if (column == null)
                 {
                     throw new DataTaskException("Unknown attribute "+attrName+" of element "+name);
                 }
-                bean.set(column.getName(), attrValue);
+
+                SqlTypeConverter converter = DdlUtilsDataHandling.this._converterConf.getRegisteredConverter(table, column);
+                Object           propValue = (converter != null ? converter.convertFromString(attrValue, column.getTypeCode()) : attrValue);
+
+                bean.set(column.getName(), propValue);
             }
             DdlUtilsDataHandling.this._digester.push(bean);
         }
@@ -103,6 +113,8 @@
     private PreparedModel _preparedModel;
     /** The digester for parsing the XML */
     private Digester _digester;
+    /** The converters. */
+    private ConverterConfiguration _converterConf = new ConverterConfiguration();
 
     /**
      * Creates a new data handling object.



---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org