Changeset: 1d49175eb6eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d49175eb6eb
Modified Files:
sql/test/Tests/mclient-t-s.SQL.py
sql/test/Tests/mclient-t-s.stable.err
sql/test/Tests/mclient-t-s.stable.out
sql/test/bugs/Tests/predicate_or-sf-1409824.stable.out
Branch: default
Log Message:
adapted test after config variables and mclient options changed.
mclient -t isn't a valid option, ie returns 'usage' now.
'host' no longer is listed in select * from env() e, so we use
sql_debug now, to test the 'or' expression.
diffs (116 lines):
diff --git a/sql/test/Tests/mclient-t-s.SQL.py
b/sql/test/Tests/mclient-t-s.SQL.py
--- a/sql/test/Tests/mclient-t-s.SQL.py
+++ b/sql/test/Tests/mclient-t-s.SQL.py
@@ -11,6 +11,4 @@
sys.stdout.write(out)
sys.stderr.write(err)
-sys.stderr.write('#~BeginVariableOutput~#\n')
client(['-t', '-s', 'select 123;'])
-sys.stderr.write('#~EndVariableOutput~#\n')
diff --git a/sql/test/Tests/mclient-t-s.stable.err
b/sql/test/Tests/mclient-t-s.stable.err
--- a/sql/test/Tests/mclient-t-s.stable.err
+++ b/sql/test/Tests/mclient-t-s.stable.err
@@ -72,15 +72,38 @@
#warning: please don't forget to set your vault key!
#(see
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf)
-# 19:27:54 >
-# 19:27:54 > /usr/bin/python mclient-t-s.SQL.py mclient-t-s
-# 19:27:54 >
+# 11:08:32 >
+# 11:08:32 > /usr/bin/python mclient-t-s.SQL.py mclient-t-s
+# 11:08:32 >
-#~BeginVariableOutput~#
-Timer 1.683 msec
-#~EndVariableOutput~#
+mclient: invalid option -- 't'
+Usage: mclient [ options ]
-# 19:27:54 >
-# 19:27:54 > Done.
-# 19:27:54 >
+Options are:
+ -h hostname | --host=hostname host or UNIX domain socket to connect to
+ -p portnr | --port=portnr port to connect to
+ -u user | --user=user user id
+ -d database | --database=database database to connect to
+ -e | --echo echo the query
+ -E charset | --encoding=charset specify encoding (character set) of the
terminal
+ -f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
+ -H | --history load/save cmdline history (default off)
+ -i | --interactive read stdin after command line args
+ -l language | --language=lang {sql,mal}
+ -L logfile | --log=logfile save client/server interaction
+ -s stmt | --statement=stmt run single statement
+ -X | --Xdebug trace mapi network interaction
+ -| cmd | --pager=cmd for pagination
+ -? | --help show this usage message
+SQL specific opions
+ -n nullstr | --null=nullstr change NULL representation for sql, csv and
tab output modes
+ -r nr | --rows=nr for pagination
+ -w nr | --width=nr for pagination
+ -D | --dump create an SQL dump
+ -N | --inserts use INSERT INTO statements when dumping
+
+# 11:08:32 >
+# 11:08:32 > Done.
+# 11:08:32 >
+
diff --git a/sql/test/Tests/mclient-t-s.stable.out
b/sql/test/Tests/mclient-t-s.stable.out
--- a/sql/test/Tests/mclient-t-s.stable.out
+++ b/sql/test/Tests/mclient-t-s.stable.out
@@ -22,17 +22,12 @@
Over..
-# 19:27:54 >
-# 19:27:54 > /usr/bin/python mclient-t-s.SQL.py mclient-t-s
-# 19:27:54 >
+# 11:08:32 >
+# 11:08:32 > /usr/bin/python mclient-t-s.SQL.py mclient-t-s
+# 11:08:32 >
-% . # table_name
-% single_value # name
-% tinyint # type
-% 3 # length
-[ 123 ]
-# 19:27:54 >
-# 19:27:54 > Done.
-# 19:27:54 >
+# 11:08:32 >
+# 11:08:32 > Done.
+# 11:08:32 >
diff --git a/sql/test/bugs/Tests/predicate_or-sf-1409824.stable.out
b/sql/test/bugs/Tests/predicate_or-sf-1409824.stable.out
--- a/sql/test/bugs/Tests/predicate_or-sf-1409824.stable.out
+++ b/sql/test/bugs/Tests/predicate_or-sf-1409824.stable.out
@@ -41,15 +41,17 @@
% .env, .env # table_name
% name, value # name
% varchar, varchar # type
-% 4, 9 # length
-[ "host", "localhost" ]
+% 9, 1 # length
+[ "sql_debug", "0" ]
+#select * from env() as env where name = 'sql_debug' or 0 = 1;
% .env, .env # table_name
% name, value # name
% varchar, varchar # type
-% 4, 9 # length
-[ "host", "localhost" ]
+% 9, 1 # length
+[ "sql_debug", "0" ]
+#drop table p1409824;
-# 22:21:36 >
-# 22:21:36 > Done.
-# 22:21:36 >
+# 11:02:58 >
+# 11:02:58 > Done.
+# 11:02:58 >
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
