Update of /cvsroot/monetdb/sql/src/test/sql_xml/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2283/src/test/sql_xml/Tests
Modified Files:
funcs.stable.out xml.stable.out
xml_attribute_parsing.SF-1855673.stable.out
Log Message:
Use libxml2 to implement some more xml support in M5.
Approve changed test output.
U xml.stable.out
Index: xml.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/sql_xml/Tests/xml.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xml.stable.out 21 Feb 2008 13:42:42 -0000 1.3
+++ xml.stable.out 24 Oct 2008 14:57:04 -0000 1.4
@@ -36,7 +36,7 @@
% . # table_name
% element_Customer # name
% xml # type
-% 97 # length
+% 98 # length
[
<Customer><CustId>1</CustId><CustName>WoodWorks</CustName><City>Baltimore</City></Customer>
]
[ <Customer><CustId>2</CustId><CustName>Software
Solutions</CustName><City>Boston</City></Customer> ]
[ <Customer><CustId>3</CustId><CustName>Food Supplies</CustName><City>New
York</City></Customer> ]
@@ -45,7 +45,7 @@
% . # table_name
% element_Customer # name
% xml # type
-% 97 # length
+% 98 # length
[
<Customer><custid>1</custid><custname>WoodWorks</custname><city>Baltimore</city></Customer>
]
[ <Customer><custid>2</custid><custname>Software
Solutions</custname><city>Boston</city></Customer> ]
[ <Customer><custid>3</custid><custname>Food Supplies</custname><city>New
York</city></Customer> ]
@@ -62,7 +62,7 @@
% . # table_name
% element_CustomerProj # name
% xml # type
-% 127 # length
+% 128 # length
[
<CustomerProj><custid>1</custid><custname>WoodWorks</custname><projid>1</projid><projname>Medusa</projname></CustomerProj>
]
[ <CustomerProj><custid>4</custid><custname>Hardware
Shop</custname><projid>2</projid><projname>Pegasus</projname></CustomerProj>
]
[ <CustomerProj><custid>4</custid><custname>Hardware
Shop</custname><projid>8</projid><projname>Typhon</projname></CustomerProj>
]
@@ -78,23 +78,23 @@
% . # table_name
% customer_projects # name
% xml # type
-% 192 # length
+% 190 # length
[ <Customer
id="1"><name>WoodWorks</name><city>Baltimore</city><projects><project
id="1"><name>Medusa</name></project></projects></Customer> ]
-[ <Customer id="2"><name>Software
Solutions</name><city>Boston</city><projects></projects></Customer> ]
-[ <Customer id="3"><name>Food Supplies</name><city>New
York</city><projects></projects></Customer> ]
+[ <Customer id="2"><name>Software
Solutions</name><city>Boston</city><projects/></Customer> ]
+[ <Customer id="3"><name>Food Supplies</name><city>New
York</city><projects/></Customer> ]
[ <Customer id="4"><name>Hardware
Shop</name><city>Washington</city><projects><project
id="2"><name>Pegasus</name></project><project
id="8"><name>Typhon</name></project></projects></Customer> ]
[ <Customer id="5"><name>Books Inc</name><city>New
Orleans</city><projects><project
id="10"><name>Sphinx</name></project></projects></Customer> ]
% . # table_name
% element_Customer # name
% xml # type
-% 57 # length
-[ <Customer id="1"><!-- simple comment test --></Customer> ]
-[ <Customer id="2"><!-- simple comment test --></Customer> ]
-[ <Customer id="3"><!-- simple comment test --></Customer> ]
-[ <Customer id="4"><!-- simple comment test --></Customer> ]
-[ <Customer id="5"><!-- simple comment test --></Customer> ]
+% 55 # length
+[ <Customer id="1"><!--simple comment test--></Customer> ]
+[ <Customer id="2"><!--simple comment test--></Customer> ]
+[ <Customer id="3"><!--simple comment test--></Customer> ]
+[ <Customer id="4"><!--simple comment test--></Customer> ]
+[ <Customer id="5"><!--simple comment test--></Customer> ]
-# 18:26:50 >
-# 18:26:50 > Done.
-# 18:26:50 >
+# 16:53:32 >
+# 16:53:32 > Done.
+# 16:53:32 >
U funcs.stable.out
Index: funcs.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/sql_xml/Tests/funcs.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- funcs.stable.out 21 Dec 2007 16:57:44 -0000 1.1
+++ funcs.stable.out 24 Oct 2008 14:57:04 -0000 1.2
@@ -1,16 +1,17 @@
stdout of test 'funcs` in directory 'src/test/sql_xml` itself:
-# 17:54:53 >
-# 17:54:53 > mserver5
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=35176 --set
xrpc_port=43869 --set monet_prompt= --trace "--dbname=mTests_src_test_sql_xml"
--set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 17:54:53 >
+# 16:53:32 >
+# 16:53:32 > mserver5 "--config=/ufs/sjoerd/Monet-virgin/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/src/MonetDB/virgin/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/sjoerd/src/MonetDB/virgin/sql/x86_64-unknown-linux-gnu/dbfarm"
--set
"sql_logdir=/ufs/sjoerd/src/MonetDB/virgin/sql/x86_64-unknown-linux-gnu/sql_logs"
--set
"xquery_logdir=/ufs/sjoerd/src/MonetDB/virgin/sql/x86_64-unknown-linux-gnu/xquery_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=35317 --set
xrpc_port=45075 --set monet_prompt= --trace "--dbname=mTests_src_test_sql_xml"
--set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
+# 16:53:32 >
-# MonetDB server v5.3.0, based on kernel v1.21.0
-# Serving database 'mTests_src_test_sql_xml'
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2007 CWI, all rights reserved
+# MonetDB server v5.7.0, based on kernel v1.25.0
+# Serving database 'mTests_src_test_sql_xml', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 32bit OIDs dynamically
linked
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008- MonetDB B.V., all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://koala.ins.cwi.nl:35176/
# MonetDB/SQL module v2.21.0 loaded
U xml_attribute_parsing.SF-1855673.stable.out
Index: xml_attribute_parsing.SF-1855673.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/sql_xml/Tests/xml_attribute_parsing.SF-1855673.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xml_attribute_parsing.SF-1855673.stable.out 5 Jan 2008 11:36:11 -0000
1.3
+++ xml_attribute_parsing.SF-1855673.stable.out 24 Oct 2008 14:57:04 -0000
1.4
@@ -27,8 +27,8 @@
% . # table_name
% element_element # name
% xml # type
-% 53 # length
-[ <element single_value="unnamed and wrong"></element> ]
+% 44 # length
+[ <element single_value="unnamed and wrong"/> ]
# 17:54:53 >
# 17:54:53 > Done.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
