Return-Path: Delivered-To: apmail-db-ddlutils-dev-archive@www.apache.org Received: (qmail 31413 invoked from network); 15 Oct 2006 23:49:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Oct 2006 23:49:52 -0000 Received: (qmail 81292 invoked by uid 500); 15 Oct 2006 23:49:52 -0000 Delivered-To: apmail-db-ddlutils-dev-archive@db.apache.org Received: (qmail 81270 invoked by uid 500); 15 Oct 2006 23:49:52 -0000 Mailing-List: contact ddlutils-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ddlutils-dev@db.apache.org Delivered-To: mailing list ddlutils-dev@db.apache.org Received: (qmail 81253 invoked by uid 500); 15 Oct 2006 23:49:51 -0000 Delivered-To: apmail-db-ddlutils-commits@db.apache.org Received: (qmail 81250 invoked by uid 99); 15 Oct 2006 23:49:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Oct 2006 16:49:51 -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, 15 Oct 2006 16:49:51 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id AF66D1A981A; Sun, 15 Oct 2006 16:49:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r464324 - in /db/ddlutils/trunk/src: java/org/apache/ddlutils/io/converters/TimeConverter.java test/org/apache/ddlutils/io/RoundtripTestBase.java test/org/apache/ddlutils/io/TestDatatypes.java Date: Sun, 15 Oct 2006 23:49:30 -0000 To: ddlutils-commits@db.apache.org From: tomdz@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061015234930.AF66D1A981A@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 Oct 15 16:49:28 2006 New Revision: 464324 URL: http://svn.apache.org/viewvc?view=rev&rev=464324 Log: Fixed error in the time converter Enhanced datatypes tests to also test data import from/export to XML Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/TimeConverter.java db/ddlutils/trunk/src/test/org/apache/ddlutils/io/RoundtripTestBase.java db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatatypes.java Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/TimeConverter.java URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/TimeConverter.java?view=diff&rev=464324&r1=464323&r2=464324 ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/TimeConverter.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/TimeConverter.java Sun Oct 15 16:49:28 2006 @@ -87,7 +87,7 @@ } _calendar.clear(); - _calendar.set(Calendar.HOUR, hours); + _calendar.set(Calendar.HOUR_OF_DAY, hours); _calendar.set(Calendar.MINUTE, minutes); _calendar.set(Calendar.SECOND, seconds); return new Time(_calendar.getTimeInMillis()); Modified: db/ddlutils/trunk/src/test/org/apache/ddlutils/io/RoundtripTestBase.java URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/org/apache/ddlutils/io/RoundtripTestBase.java?view=diff&rev=464324&r1=464323&r2=464324 ============================================================================== --- db/ddlutils/trunk/src/test/org/apache/ddlutils/io/RoundtripTestBase.java (original) +++ db/ddlutils/trunk/src/test/org/apache/ddlutils/io/RoundtripTestBase.java Sun Oct 15 16:49:28 2006 @@ -323,7 +323,7 @@ dbIo.write(expected, writer); getLog().error("Expected model:\n" + writer.toString()); - + writer = new StringWriter(); dbIo.write(actual, writer); Modified: db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatatypes.java URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatatypes.java?view=diff&rev=464324&r1=464323&r2=464324 ============================================================================== --- db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatatypes.java (original) +++ db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatatypes.java Sun Oct 15 16:49:28 2006 @@ -19,6 +19,8 @@ * under the License. */ +import java.io.StringReader; +import java.io.StringWriter; import java.math.BigDecimal; import java.sql.Date; import java.sql.Time; @@ -29,6 +31,7 @@ import java.util.TreeSet; import org.apache.ddlutils.model.Database; +import org.apache.ddlutils.model.Table; import junit.framework.Test; @@ -114,6 +117,45 @@ assertEquals("", alterTablesSql); + + StringWriter stringWriter = new StringWriter(); + DataWriter dataWriter = new DataWriter(stringWriter, "UTF-8"); + + dataWriter.writeDocumentStart(); + for (int idx = 0; idx < getModel().getTableCount(); idx++) + { + Table[] tables = { (Table)getModel().getTable(idx) }; + + dataWriter.write(getPlatform().query(getModel(), "select * from " + tables[0].getName(), tables)); + } + dataWriter.writeDocumentEnd(); + + String dataSql = stringWriter.toString(); + + getPlatform().dropTables(getModel(), false); + + createDatabase(modelXml); + + DataToDatabaseSink sink = new DataToDatabaseSink(getPlatform(), getModel()); + DataReader reader = new DataReader(); + + sink.setEnsureForeignKeyOrder(true); + sink.setUseBatchMode(false); + reader.setModel(getModel()); + reader.setSink(sink); + try + { + reader.parse(new StringReader(dataSql)); + } + catch (Exception ex) + { + throw new RuntimeException(ex); + } + + beans = getRows("roundtrip"); + + assertEquals(expected1, beans.get(0), "avalue"); + assertEquals(expected2, beans.get(1), "avalue"); } /**