Changeset: 23a7e5f608cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23a7e5f608cd
Modified Files:
sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.sql
sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.out
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (252 lines):
diff --git a/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.sql
b/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.sql
--- a/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.sql
+++ b/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.sql
@@ -1,5 +1,5 @@
-create table t (s varchar(100));
-insert into t values ('42.42');
-select avg ( cast (s as double)) from t;
-drop table t;
+create table t3071 (s varchar(100));
+insert into t3071 values ('42.42');
+select avg ( cast (s as double)) from t3071;
+drop table t3071;
diff --git
a/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
b/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
--- a/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
+++ b/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
@@ -46,16 +46,16 @@ Ready.
# 12:41:05 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=riga"
"--port=31763"
# 12:41:05 >
-#create table t (s varchar(100));
-#insert into t values ('42.42');
+#create table t3071 (s varchar(100));
+#insert into t3071 values ('42.42');
[ 1 ]
-#select avg ( cast (s as double)) from t;
+#select avg ( cast (s as double)) from t3071;
% sys.L1 # table_name
% L1 # name
% double # type
% 24 # length
[ 42.42 ]
-#drop table t;
+#drop table t3071;
# 12:41:05 >
# 12:41:05 > "Done."
diff --git a/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
b/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
--- a/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
+++ b/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
@@ -1,32 +1,32 @@
-create table t(u url);
-insert into t values('http://www.cwi.nl/~mk/vision2011.pdf');
-insert into t values('http://www.monetdb.com?x=2');
-insert into t
values('http://www.monetdb.org:8080/Documentation/Manuals/SQLreference/Datamanipulation');
+create table t2972(u url);
+insert into t2972 values('http://www.cwi.nl/~mk/vision2011.pdf');
+insert into t2972 values('http://www.monetdb.com?x=2');
+insert into t2972
values('http://www.monetdb.org:8080/Documentation/Manuals/SQLreference/Datamanipulation');
-select getAnchor(u) from t;
+select getAnchor(u) from t2972;
-select getBasename(u) from t;
+select getBasename(u) from t2972;
-select getContext(u) from t;
+select getContext(u) from t2972;
-select getDomain(u) from t;
+select getDomain(u) from t2972;
-select getExtension(u) from t;
+select getExtension(u) from t2972;
-select getFile(u) from t;
+select getFile(u) from t2972;
-select getHost(u) from t;
+select getHost(u) from t2972;
-select getPort(u) from t;
+select getPort(u) from t2972;
-select getQuery(u) from t;
+select getQuery(u) from t2972;
-select getUser(u) from t;
+select getUser(u) from t2972;
-select getRobotURL(u) from t;
+select getRobotURL(u) from t2972;
-select isaURL(u) from t;
+select isaURL(u) from t2972;
select isaURL('http://www.monetdb.org');
select isaURL('http://www.monetdb.org');
@@ -35,12 +35,12 @@ select isaURL('htp:///www.monetdb.org');
select newurl('https','www.monetdb.org',8080,'blah');
select newurl('https','localhost','boe');
-drop table t;
+drop table t2972;
-create table t(u url);
+create table t2972(u url);
-insert into t values ('$UTSTSRCDIR/url_script_test.Bug-2972.txt');
+insert into t2972 values ('$UTSTSRCDIR/url_script_test.Bug-2972.txt');
-select getContent(u) from t;
+select getContent(u) from t2972;
-drop table t;
+drop table t2972;
diff --git a/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.out
b/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.out
--- a/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.out
+++ b/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.out
@@ -44,14 +44,14 @@ Ready.
# 06:50:54 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=zonnestraal" "--port=38767"
# 06:50:54 >
-#create table t(u url);
-#insert into t values('http://www.cwi.nl/~mk/vision2011.pdf');
+#create table t2972(u url);
+#insert into t2972 values('http://www.cwi.nl/~mk/vision2011.pdf');
[ 1 ]
-#insert into t values('http://www.monetdb.com?x=2');
+#insert into t2972 values('http://www.monetdb.com?x=2');
[ 1 ]
-#insert into t
values('http://www.monetdb.org:8080/Documentation/Manuals/SQLreference/Datamanipulation');
+#insert into t2972
values('http://www.monetdb.org:8080/Documentation/Manuals/SQLreference/Datamanipulation');
[ 1 ]
-#select getAnchor(u) from t;
+#select getAnchor(u) from t2972;
% sys.L # table_name
% getanchor_u # name
% clob # type
@@ -59,7 +59,7 @@ Ready.
[ NULL ]
[ NULL ]
[ NULL ]
-#select getBasename(u) from t;
+#select getBasename(u) from t2972;
% sys.L # table_name
% getbasename_u # name
% clob # type
@@ -67,7 +67,7 @@ Ready.
[ "vision2011" ]
[ "www" ]
[ "Datamanipulation" ]
-#select getContext(u) from t;
+#select getContext(u) from t2972;
% sys.L # table_name
% getcontext_u # name
% clob # type
@@ -75,7 +75,7 @@ Ready.
[ "/~mk/vision2011.pdf" ]
[ NULL ]
[ "/Documentation/Manuals/SQLreference/Datamanipulation" ]
-#select getDomain(u) from t;
+#select getDomain(u) from t2972;
% sys.L # table_name
% getdomain_u # name
% clob # type
@@ -83,7 +83,7 @@ Ready.
[ "nl" ]
[ "com?x=2" ]
[ "org" ]
-#select getExtension(u) from t;
+#select getExtension(u) from t2972;
% sys.L # table_name
% getextension_u # name
% clob # type
@@ -91,7 +91,7 @@ Ready.
[ "pdf" ]
[ "monetdb.com?x=2" ]
[ NULL ]
-#select getFile(u) from t;
+#select getFile(u) from t2972;
% sys.L # table_name
% getfile_u # name
% clob # type
@@ -99,7 +99,7 @@ Ready.
[ "vision2011.pdf" ]
[ "www.monetdb.com?x=2" ]
[ "Datamanipulation" ]
-#select getHost(u) from t;
+#select getHost(u) from t2972;
% sys.L # table_name
% gethost_u # name
% clob # type
@@ -107,7 +107,7 @@ Ready.
[ "www.cwi.nl" ]
[ "www.monetdb.com?x=2" ]
[ "www.monetdb.org:8080" ]
-#select getPort(u) from t;
+#select getPort(u) from t2972;
% sys.L # table_name
% getport_u # name
% clob # type
@@ -115,7 +115,7 @@ Ready.
[ NULL ]
[ NULL ]
[ "8080" ]
-#select getQuery(u) from t;
+#select getQuery(u) from t2972;
% sys.L # table_name
% getquery_u # name
% clob # type
@@ -123,7 +123,7 @@ Ready.
[ NULL ]
[ "x=2" ]
[ NULL ]
-#select getUser(u) from t;
+#select getUser(u) from t2972;
% sys.L # table_name
% getuser_u # name
% clob # type
@@ -131,7 +131,7 @@ Ready.
[ "mk" ]
[ NULL ]
[ NULL ]
-#select getRobotURL(u) from t;
+#select getRobotURL(u) from t2972;
% sys.L # table_name
% getroboturl_u # name
% clob # type
@@ -139,7 +139,7 @@ Ready.
[ "http://www.cwi.nl/robots.txt"; ]
[ "http://www.monetdb.com?x=2/robots.txt"; ]
[ "http://www.monetdb.org:8080/robots.txt"; ]
-#select isaURL(u) from t;
+#select isaURL(u) from t2972;
% sys.L # table_name
% isaurl_u # name
% boolean # type
@@ -177,17 +177,17 @@ Ready.
% url # type
% 21 # length
[ https://localhost/boe ]
-#drop table t;
-#create table t(u url);
-#insert into t values
('file:///export/home/fabian/monetdb/Apr2012/hgrepo/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.txt');
+#drop table t2972;
+#create table t2972(u url);
+#insert into t2972 values
('file:///export/home/fabian/monetdb/Apr2012/hgrepo/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.txt');
[ 1 ]
-#select getContent(u) from t;
+#select getContent(u) from t2972;
% sys.L # table_name
% getcontent_u # name
% clob # type
% 141 # length
[ "This file is read by the url_script_test.Bug-2972 test.\nIf you change
this, you likely want to change the stable output of the\ntest as well.\n" ]
-#drop table t;
+#drop table t2972;
# 06:50:55 >
# 06:50:55 > "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
