Changeset: d977d22d1916 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d977d22d1916
Modified Files:
sql/backends/monet5/rel_bin.c
sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
sql/server/rel_dump.c
sql/test/pg_regress/Tests/strings_cast.stable.err
sql/test/pg_regress/Tests/strings_cast.stable.out
Branch: Jan2014
Log Message:
cleanup and approved tests
diffs (137 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -648,7 +648,8 @@ exp_bin(mvc *sql, sql_exp *e, stmt *left
}
ops = sa_list(sql->sa);
append(ops, r);
- append(ops, r2);
+ if (r2)
+ append(ops, r2);
r = stmt_list(sql->sa, ops);
s = stmt_genselect(sql->sa, l, r, e->f, sel);
if (s && is_anti(e))
diff --git a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
--- a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
@@ -53,7 +53,7 @@ Ready.
0. false false
0. 6 columns: 6
1. mTests_sql_jdbc_tests
- classname java.lang.Integer
+ classname java.lang.Short
displaysize 8
label intnull
name intnull
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -320,12 +320,11 @@ rel_print_(mvc *sql, stream *fout, sql_
case op_table:
print_indent(sql, fout, depth);
mnstr_printf(fout, "table ");
- /*
- if (rel->l)
- rel_print_(sql, fout, rel->l, depth+1, refs);
- */
+
if (rel->r)
exp_print(sql, fout, rel->r, depth, 1, 0);
+ if (rel->l)
+ rel_print_(sql, fout, rel->l, 0, refs);
if (rel->exps)
exps_print(sql, fout, rel->exps, depth, 1, 0);
break;
diff --git a/sql/test/pg_regress/Tests/strings_cast.stable.err
b/sql/test/pg_regress/Tests/strings_cast.stable.err
--- a/sql/test/pg_regress/Tests/strings_cast.stable.err
+++ b/sql/test/pg_regress/Tests/strings_cast.stable.err
@@ -70,25 +70,28 @@ stderr of test 'strings_cast` in directo
# 22:34:06 >
-# 22:34:06 >
-# 22:34:06 > Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb
--host=pegasus --port=34030 -e <
../../../../../../../../../../mirror/fabian/monetdb/current/sql/src/test/pg_regress/Tests/../monetdb/strings_cast.sql
-# 22:34:06 >
+# 19:52:32 >
+# 19:52:32 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--host=/var/tmp/mtest-15695 --port=36739 -e <
/home/niels/data/rc/clean/sql/test/pg_regress/Tests/../monetdb/strings_cast.sql
+# 19:52:32 >
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-15695/.s.monetdb.36739
+QUERY = SELECT CAST(f1 AS text) AS "text(char)" FROM CHAR_TBL;
+ERROR = !SELECT: no such table 'char_tbl'
+MAPI = (monetdb) /var/tmp/mtest-15695/.s.monetdb.36739
QUERY = SELECT CAST(name 'namefield' AS text) AS "text(name)";
ERROR = !syntax error, unexpected STRING, expecting AS in: "select cast(name
'namefield'"
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-15695/.s.monetdb.36739
QUERY = SELECT CAST(name 'namefield' AS char(10)) AS "char(name)";
ERROR = !syntax error, unexpected STRING, expecting AS in: "select cast(name
'namefield'"
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-15695/.s.monetdb.36739
QUERY = SELECT CAST(f1 AS varchar) AS "varchar(text)" FROM TEXT_TBL;
ERROR = !CHARACTER VARYING needs a mandatory length specification in: "select
cast(f1 as varchar)"
!syntax error, unexpected AS in: "as"
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-15695/.s.monetdb.36739
QUERY = SELECT CAST(f1 AS varchar) AS "varchar(char)" FROM CHAR_TBL;
ERROR = !CHARACTER VARYING needs a mandatory length specification in: "select
cast(f1 as varchar)"
!syntax error, unexpected AS in: "as"
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-15695/.s.monetdb.36739
QUERY = SELECT CAST(name 'namefield' AS varchar) AS "varchar(name)";
ERROR = !syntax error, unexpected STRING, expecting AS in: "select cast(name
'namefield'"
diff --git a/sql/test/pg_regress/Tests/strings_cast.stable.out
b/sql/test/pg_regress/Tests/strings_cast.stable.out
--- a/sql/test/pg_regress/Tests/strings_cast.stable.out
+++ b/sql/test/pg_regress/Tests/strings_cast.stable.out
@@ -15,36 +15,23 @@ stdout of test 'strings_cast` in directo
# MonetDB/SQL module v2.31.0 loaded
Ready.
-#function user.main():void;
-# clients.quit();
-#end main;
+#Bulk operator required for str.stringleft
+#Bulk operator required for str.stringleft
+#Bulk operator required for str.stringleft
+#Bulk operator required for str.stringleft
+#Bulk operator required for str.stringleft
+#Bulk operator required for str.stringleft
+#Bulk operator required for str.stringleft
+# 19:52:32 >
+# 19:52:32 > "./strings_cast.SQL.sh" "strings_cast"
+# 19:52:32 >
-# 22:34:06 >
-# 22:34:06 > ./strings_cast.SQL.sh strings_cast
-# 22:34:06 >
+# 19:52:32 >
+# 19:52:32 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--host=/var/tmp/mtest-15695 --port=36739 -e <
/home/niels/data/rc/clean/sql/test/pg_regress/Tests/../monetdb/strings_cast.sql
+# 19:52:32 >
-# 22:34:06 >
-# 22:34:06 > Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb
--host=pegasus --port=34030 -e <
../../../../../../../../../../mirror/fabian/monetdb/current/sql/src/test/pg_regress/Tests/../monetdb/strings_cast.sql
-# 22:34:06 >
-
-#--
-#-- STRINGS
-#-- Test various data entry syntaxes.
-#--
-#--
-#-- test conversions between various string types
-#-- E021-10 implicit casting among the character data types
-#--
-#SELECT CAST(f1 AS text) AS "text(char)" FROM CHAR_TBL;
-% sys.L # table_name
-% text(char) # name
-% clob # type
-% 4 # length
-[ "a" ]
-[ "ab" ]
-[ "abcd" ]
#SELECT CAST(f1 AS text) AS "text(varchar)" FROM VARCHAR_TBL;
% sys.L # table_name
% text(varchar) # name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
