Update of /cvsroot/monetdb/pathfinder/runtime/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27423
Modified Files:
serialization.stable.out
Log Message:
added attribute to serialization test
Index: serialization.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/Tests/serialization.stable.out,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serialization.stable.out 3 Jul 2007 19:59:52 -0000 1.10
+++ serialization.stable.out 1 Sep 2007 16:52:48 -0000 1.11
@@ -18,36 +18,36 @@
#
xquery("xml" ,query , 0).printf();
<?xml version="1.0" encoding="utf-8"?>
-<XQueryResult attr="val">1 2.300000 30.000000
string<elem>text<!--comment--><?pi_tgt
pi_data?></elem><elem>text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
+<XQueryResult attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
xquery("xml-typed" ,query , 0).printf();
<?xml version="1.0" encoding="utf-8"?>
-<result:sequence xmlns:result="http://monetdb.cwi.nl/XQuery/results";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><result:atomic-value
xsi:type="xs:integer">1</result:atomic-value><result:atomic-value
xsi:type="xs:decimal">2.300000</result:atomic-value><result:attribute
attr="val"/><result:atomic-value
xsi:type="xs:double">30.000000</result:atomic-value><result:atomic-value
xsi:type="xs:string">string</result:atomic-value><result:document><elem>text<!--comment--><?pi_tgt
pi_data?></elem></result:document><result:element><elem>text<!--comment--><?pi_tgt
pi_data?></elem></result:element><result:text>text</result:text><result:comment><!--comment--></result:comment><result:processing-instruction><?pi_tgt
pi_data?></result:processing-instruction></result:sequence>
+<result:sequence xmlns:result="http://monetdb.cwi.nl/XQuery/results";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><result:atomic-value
xsi:type="xs:integer">1</result:atomic-value><result:atomic-value
xsi:type="xs:decimal">2.300000</result:atomic-value><result:attribute
attr="val"/><result:atomic-value
xsi:type="xs:double">30.000000</result:atomic-value><result:atomic-value
xsi:type="xs:string">string</result:atomic-value><result:document><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem></result:document><result:element><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem></result:element><result:text>text</result:text><result:comment><!--comment--></result:comment><result:processing-instruction><?pi_tgt
pi_data?></result:processing-instruction></result:sequence>
# ... and their corresponding mapi variants
xquery("mapi-xml" ,query , 0).printf();
=<?xml version="1.0" encoding="utf-8"?>
-=<XQueryResult attr="val">1 2.300000 30.000000
string<elem>text<!--comment--><?pi_tgt
pi_data?></elem><elem>text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
+=<XQueryResult attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
xquery("mapi-xml-typed" ,query , 0).printf();
=<?xml version="1.0" encoding="utf-8"?>
-=<result:sequence xmlns:result="http://monetdb.cwi.nl/XQuery/results";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><result:atomic-value
xsi:type="xs:integer">1</result:atomic-value><result:atomic-value
xsi:type="xs:decimal">2.300000</result:atomic-value><result:attribute
attr="val"/><result:atomic-value
xsi:type="xs:double">30.000000</result:atomic-value><result:atomic-value
xsi:type="xs:string">string</result:atomic-value><result:document><elem>text<!--comment--><?pi_tgt
pi_data?></elem></result:document><result:element><elem>text<!--comment--><?pi_tgt
pi_data?></elem></result:element><result:text>text</result:text><result:comment><!--comment--></result:comment><result:processing-instruction><?pi_tgt
pi_data?></result:processing-instruction></result:sequence>
+=<result:sequence xmlns:result="http://monetdb.cwi.nl/XQuery/results";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><result:atomic-value
xsi:type="xs:integer">1</result:atomic-value><result:atomic-value
xsi:type="xs:decimal">2.300000</result:atomic-value><result:attribute
attr="val"/><result:atomic-value
xsi:type="xs:double">30.000000</result:atomic-value><result:atomic-value
xsi:type="xs:string">string</result:atomic-value><result:document><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem></result:document><result:element><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem></result:element><result:text>text</result:text><result:comment><!--comment--></result:comment><result:processing-instruction><?pi_tgt
pi_data?></result:processing-instruction></result:sequence>
# additional XML mode arguments:
#
xquery("xml-noheader" ,query , 0).printf();
-<XQueryResult attr="val">1 2.300000 30.000000
string<elem>text<!--comment--><?pi_tgt
pi_data?></elem><elem>text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
+<XQueryResult attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
# does not work for xml-typed mode
xquery("xml-noroot" ,query , 0).printf();
<?xml version="1.0" encoding="utf-8"?>
-1 2.300000 30.000000 string<elem>text<!--comment--><?pi_tgt
pi_data?></elem><elem>text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?>
+1 2.300000 30.000000 string<elem attr="val">text<!--comment--><?pi_tgt
pi_data?></elem><elem attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?>
# does not work for xml-typed mode
xquery("xml-root-name" ,query , 0).printf();
<?xml version="1.0" encoding="utf-8"?>
-<name attr="val">1 2.300000 30.000000 string<elem>text<!--comment--><?pi_tgt
pi_data?></elem><elem>text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></name>
+<name attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></name>
# data model modes:
@@ -59,9 +59,9 @@
30.000000,
"string",
<?xml version="1.0" encoding="utf-8"?>
-<elem>text<!--comment--><?pi_tgt pi_data?></elem>
+<elem attr="val">text<!--comment--><?pi_tgt pi_data?></elem>
,
-<elem>text<!--comment--><?pi_tgt pi_data?></elem>,
+<elem attr="val">text<!--comment--><?pi_tgt pi_data?></elem>,
text {"text"},
<!--comment-->,
<?pi_tgt pi_data?>
@@ -73,9 +73,9 @@
=30.000000,
="string",
=<?xml version="1.0" encoding="utf-8"?>
-=<elem>text<!--comment--><?pi_tgt pi_data?></elem>
+=<elem attr="val">text<!--comment--><?pi_tgt pi_data?></elem>
=,
-=<elem>text<!--comment--><?pi_tgt pi_data?></elem>,
+=<elem attr="val">text<!--comment--><?pi_tgt pi_data?></elem>,
=text {"text"},
=<!--comment-->,
=<?pi_tgt pi_data?>
@@ -93,14 +93,14 @@
[ "attribute attr { "val" }" ]
[ "30.000000" ]
[ "\"string\"" ]
-[ "<?xml version=\"1.0\"
encoding=\"utf-8\"?>\n<elem>text<!--comment--><?pi_tgt pi_data?></elem>\n" ]
-[ "<elem>text<!--comment--><?pi_tgt pi_data?></elem>" ]
+[ "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<elem
attr=\"val\">text<!--comment--><?pi_tgt pi_data?></elem>\n" ]
+[ "<elem attr=\"val\">text<!--comment--><?pi_tgt pi_data?></elem>" ]
[ "text {\"text\"}" ]
[ "<!--comment-->" ]
[ "<?pi_tgt pi_data?>" ]
xquery("seq" ,query , 0).print();
-[ "&1 0 10 1 10\n% xquery.result\t# table_name\n% xml\t# name\n% varchar\t#
type\n% 60\t# length\n[ \"1\"\t]\n[ \"2.300000\"\t]\n[ \"attribute attr {
\"val\" }\"\t]\n[ \"30.000000\"\t]\n[ \"\\\"string\\\"\"\t]\n[ \"<?xml
version=\\\"1.0\\\" encoding=\\\"utf-8\\\"?>\\n<elem>text<!--comment--><?pi_tgt
pi_data?></elem>\\n\"\t]\n[ \"<elem>text<!--comment--><?pi_tgt
pi_data?></elem>\"\t]\n[ \"text {\\\"text\\\"}\"\t]\n[ \"<!--comment-->\"\t]\n[
\"<?pi_tgt pi_data?>\"\t]\n" ]
+[ "&1 0 10 1 10\n% xquery.result\t# table_name\n% xml\t# name\n% varchar\t#
type\n% 60\t# length\n[ \"1\"\t]\n[ \"2.300000\"\t]\n[ \"attribute attr {
\"val\" }\"\t]\n[ \"30.000000\"\t]\n[ \"\\\"string\\\"\"\t]\n[ \"<?xml
version=\\\"1.0\\\" encoding=\\\"utf-8\\\"?>\\n<elem
attr=\\\"val\\\">text<!--comment--><?pi_tgt pi_data?></elem>\\n\"\t]\n[ \"<elem
attr=\\\"val\\\">text<!--comment--><?pi_tgt pi_data?></elem>\"\t]\n[ \"text
{\\\"text\\\"}\"\t]\n[ \"<!--comment-->\"\t]\n[ \"<?pi_tgt pi_data?>\"\t]\n" ]
# default mode is xml mode (it also works with mapi
@@ -108,11 +108,11 @@
#
xquery("" ,query , 0).printf();
<?xml version="1.0" encoding="utf-8"?>
-<XQueryResult attr="val">1 2.300000 30.000000
string<elem>text<!--comment--><?pi_tgt
pi_data?></elem><elem>text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
+<XQueryResult attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
xquery("mapi" ,query , 0).printf();
=<?xml version="1.0" encoding="utf-8"?>
-=<XQueryResult attr="val">1 2.300000 30.000000
string<elem>text<!--comment--><?pi_tgt
pi_data?></elem><elem>text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
+=<XQueryResult attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
quit();
# 13:48:29 >
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
