From e7dbb66881b690f8d809710ecd9f944ad61ceb6b Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 5 Sep 2012 18:16:20 +0200
Subject: [PATCH] [#1674] Export data types with Result.formatXML() and
 Result.formatJSON() exports - Documented changes in manual and Javadoc

---
 .../src/main/resources/manual-2.6.xml         | 20 +++++++++++++------
 jOOQ/src/main/java/org/jooq/Result.java       |  9 ++++++---
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/jOOQ-website/src/main/resources/manual-2.6.xml b/jOOQ-website/src/main/resources/manual-2.6.xml
index 9fd31b8308..d0380b8573 100644
--- a/jOOQ-website/src/main/resources/manual-2.6.xml
+++ b/jOOQ-website/src/main/resources/manual-2.6.xml
@@ -6160,11 +6160,11 @@ String xml = create.selectFrom(BOOK).fetch().formatXML();</java>
 										The above query will result in an XML document looking like the following one:
 									</p>
 
-<xml><![CDATA[<result xmlns="http://www.jooq.org/xsd/jooq-export-1.6.2.xsd">
+<xml><![CDATA[<result xmlns="http://www.jooq.org/xsd/jooq-export-2.6.0.xsd">
   <fields>
-    <field name="ID"/>
-    <field name="AUTHOR_ID"/>
-    <field name="TITLE"/>
+    <field name="ID" type="INTEGER"/>
+    <field name="AUTHOR_ID" type="INTEGER"/>
+    <field name="TITLE" type="VARCHAR"/>
   </fields>
   <records>
     <record>
@@ -6234,8 +6234,16 @@ String json = create.selectFrom(BOOK).fetch().formatJSON();</java>
 										The above query will result in a JSON document looking like the following one:
 									</p>
 
-<text>{fields:["ID","AUTHOR_ID","TITLE"],
- records:[[1,1,"1984"],[2,1,"Animal Farm"]]}</text>
+<text>{"fields":[{"name":"field-1","type":"type-1"},
+           {"name":"field-2","type":"type-2"},
+           ...,
+           {"name":"field-n","type":"type-n"}],
+ "records":[[value-1-1,value-1-2,...,value-1-n],
+            [value-2-1,value-2-2,...,value-2-n]]}</text>
+             
+             						<p>
+             							Note: This format has changed in jOOQ 2.6.0
+             						</p>
 								</content>
 							</section>
 
diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java
index a1b3bc5aaa..bc09155c9f 100644
--- a/jOOQ/src/main/java/org/jooq/Result.java
+++ b/jOOQ/src/main/java/org/jooq/Result.java
@@ -1754,7 +1754,10 @@ public interface Result<R extends Record> extends FieldProvider, List<R>, Attach
     /**
      * Get a simple formatted representation of this result as a JSON array of
      * array. The format is the following: <code><pre>
-     * {"fields":["field-1","field-2",...,"field-n"],
+     * {"fields":[{"name":"field-1","type":"type-1"},
+     *            {"name":"field-2","type":"type-2"},
+     *            ...,
+     *            {"name":"field-n","type":"type-n"}],
      *  "records":[[value-1-1,value-1-2,...,value-1-n],
      *             [value-2-1,value-2-2,...,value-2-n]]}
      * </pre></code>
@@ -1767,7 +1770,7 @@ public interface Result<R extends Record> extends FieldProvider, List<R>, Attach
      * Get this result formatted as XML
      *
      * @see <a
-     *      href="http://www.jooq.org/xsd/jooq-export-1.6.2.xsd">http://www.jooq.org/xsd/jooq-export-1.6.2.xsd</a>
+     *      href="http://www.jooq.org/xsd/jooq-export-2.6.0.xsd">http://www.jooq.org/xsd/jooq-export-2.6.0.xsd</a>
      */
     String formatXML();
 
@@ -1784,7 +1787,7 @@ public interface Result<R extends Record> extends FieldProvider, List<R>, Attach
      *
      * @see #formatXML()
      * @see <a
-     *      href="http://www.jooq.org/xsd/jooq-export-1.6.2.xsd">http://www.jooq.org/xsd/jooq-export-1.6.2.xsd</a>
+     *      href="http://www.jooq.org/xsd/jooq-export-2.6.0.xsd">http://www.jooq.org/xsd/jooq-export-2.6.0.xsd</a>
      */
     Document intoXML();