Changeset: d92b7c781b9e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d92b7c781b9e
Modified Files:
sql/server/sql_env.c
sql/test/scoping/Tests/scoping02.stable.out
Branch: scoping
Log Message:
Cleaner
diffs (31 lines):
diff --git a/sql/server/sql_env.c b/sql/server/sql_env.c
--- a/sql/server/sql_env.c
+++ b/sql/server/sql_env.c
@@ -94,13 +94,13 @@ sql_create_env(mvc *m, sql_schema *s)
mvc_create_func(m, NULL, s, "env", ops, res, F_UNION, FUNC_LANG_SQL,
"sql", "sql_environment", "CREATE FUNCTION \"sys\".\"env\"() RETURNS
TABLE(\"name\" varchar(1024), \"value\" varchar(2048)) EXTERNAL NAME
\"sql\".\"sql_environment\";", FALSE, FALSE, TRUE);
res = sa_list(m->sa);
- list_append(res, sql_create_arg(m->sa, "sname",
sql_bind_localtype("str"), ARG_OUT));
+ list_append(res, sql_create_arg(m->sa, "schema",
sql_bind_localtype("str"), ARG_OUT));
list_append(res, sql_create_arg(m->sa, "name",
sql_bind_localtype("str"), ARG_OUT));
list_append(res, sql_create_arg(m->sa, "type",
sql_bind_localtype("str"), ARG_OUT));
list_append(res, sql_create_arg(m->sa, "value",
sql_bind_localtype("str"), ARG_OUT));
/* add function */
ops = sa_list(m->sa);
- mvc_create_func(m, NULL, s, "var", ops, res, F_UNION, FUNC_LANG_SQL,
"sql", "sql_variables", "CREATE FUNCTION \"sys\".\"var\"() RETURNS
TABLE(\"sname\" string, \"name\" string, \"type\" string, \"value\" string)
EXTERNAL NAME \"sql\".\"sql_variables\";", FALSE, FALSE, TRUE);
+ mvc_create_func(m, NULL, s, "var", ops, res, F_UNION, FUNC_LANG_SQL,
"sql", "sql_variables", "CREATE FUNCTION \"sys\".\"var\"() RETURNS
TABLE(\"schema\" string, \"name\" string, \"type\" string, \"value\" string)
EXTERNAL NAME \"sql\".\"sql_variables\";", FALSE, FALSE, TRUE);
return 0;
}
diff --git a/sql/test/scoping/Tests/scoping02.stable.out
b/sql/test/scoping/Tests/scoping02.stable.out
--- a/sql/test/scoping/Tests/scoping02.stable.out
+++ b/sql/test/scoping/Tests/scoping02.stable.out
@@ -82,7 +82,7 @@ stdout of test 'scoping02` in directory
#DROP TABLE "sys";
#SELECT * from sys.var() where "name" not in ('debug', 'cache', 'last_id',
'current_timezone');
% .%1, .%1, .%1, .%1 # table_name
-% sname, name, type, value # name
+% schema, name, type, value # name
% char, char, char, char # type
% 3, 14, 7, 12 # length
[ "sys", "current_schema", "varchar", "sys" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
