Changeset: edba085e3da2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=edba085e3da2
Modified Files:
sql/backends/monet5/sql.c
sql/test/Tests/keys.stable.out
Branch: mbedded
Log Message:
fixed mal interface for variable functions
diffs (58 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5849,8 +5849,8 @@ static mel_func sql_init_funcs[] = {
pattern("sql", "assert", SQLassert, false, "Generate an exception when
b==true", args(1,3, arg("",void),arg("b",bit),arg("msg",str))),
pattern("sql", "assert", SQLassertInt, false, "Generate an exception when
b!=0", args(1,3, arg("",void),arg("b",int),arg("msg",str))),
pattern("sql", "assert", SQLassertLng, false, "Generate an exception when
b!=0", args(1,3, arg("",void),arg("b",lng),arg("msg",str))),
- pattern("sql", "setVariable", setVariable, true, "Set the value of a session
variable", args(1,4,
arg("",int),arg("mvc",int),arg("varname",str),argany("value",1))),
- pattern("sql", "getVariable", getVariable, false, "Get the value of a session
variable", args(1,3, argany("",1),arg("mvc",int),arg("varname",str))),
+ pattern("sql", "setVariable", setVariable, true, "Set the value of a session
variable", args(1,5,
arg("",int),arg("mvc",int),arg("sname",str),arg("varname",str),argany("value",1))),
+ pattern("sql", "getVariable", getVariable, false, "Get the value of a session
variable", args(1,4,
argany("",1),arg("mvc",int),arg("sname",str),arg("varname",str))),
pattern("sql", "logfile", mvc_logfile, true, "Enable/disable saving the sql
statement traces", args(1,2, arg("",void),arg("filename",str))),
pattern("sql", "next_value", mvc_next_value, true, "return the next value of
the sequence", args(1,3, arg("",lng),arg("sname",str),arg("sequence",str))),
pattern("batsql", "next_value", mvc_bat_next_value, true, "return the next
value of the sequence", args(1,3,
batarg("",lng),batarg("sname",str),arg("sequence",str))),
@@ -5922,7 +5922,7 @@ static mel_func sql_init_funcs[] = {
pattern("sql", "optimizer_updates", SQLoptimizersUpdate, false, "", noargs),
pattern("sql", "argRecord", SQLargRecord, false, "Glue together the calling
sequence", args(1,1, arg("",str))),
pattern("sql", "argRecord", SQLargRecord, false, "Glue together the calling
sequence", args(1,2, arg("",str),varargany("a",0))),
- pattern("sql", "sql_variables", sql_variables, false, "return the table with
session variables", args(1,1, batarg("",str))),
+ pattern("sql", "sql_variables", sql_variables, false, "return the table with
session variables", args(4,4,
batarg("sname",str),batarg("name",str),batarg("type",str),batarg("value",str))),
pattern("sql", "sessions", sql_sessions_wrap, false, "SQL export table of
active sessions, their timeouts and idle status", args(9,9,
batarg("id",int),batarg("user",str),batarg("start",timestamp),batarg("idle",timestamp),batarg("optmizer",str),batarg("stimeout",int),batarg("qtimeout",int),batarg("wlimit",int),batarg("mlimit",int))),
pattern("sql", "db_users", db_users_wrap, false, "return table of users with
sql scenario", args(1,1, batarg("",str))),
pattern("sql", "password", db_password_wrap, false, "Return password hash of
user", args(1,2, arg("",str),arg("user",str))),
diff --git a/sql/test/Tests/keys.stable.out b/sql/test/Tests/keys.stable.out
--- a/sql/test/Tests/keys.stable.out
+++ b/sql/test/Tests/keys.stable.out
@@ -63,7 +63,6 @@ stdout of test 'keys` in directory 'sql/
[ "comments_id_pkey", 0, "comments_id_pkey", 0 ]
[ "dependency_types_dependency_type_id_pkey", 0,
"dependency_types_dependency_type_id_pkey", 0 ]
[ "dependency_types_dependency_type_name_unique", 0,
"dependency_types_dependency_type_name_unique", 1 ]
-[ "spatial_ref_sys_srid_pkey", 0, "spatial_ref_sys_srid_pkey", 0
]
[ "keywords_keyword_pkey", 0, "keywords_keyword_pkey", 0
]
[ "table_types_table_type_id_pkey", 0,
"table_types_table_type_id_pkey", 0 ]
[ "table_types_table_type_name_unique", 0,
"table_types_table_type_name_unique", 1 ]
@@ -77,6 +76,7 @@ stdout of test 'keys` in directory 'sql/
[ "index_types_index_type_name_unique", 0,
"index_types_index_type_name_unique", 1 ]
[ "privilege_codes_privilege_code_id_pkey", 0,
"privilege_codes_privilege_code_id_pkey", 0 ]
[ "privilege_codes_privilege_code_name_unique", 0,
"privilege_codes_privilege_code_name_unique", 1 ]
+[ "spatial_ref_sys_srid_pkey", 0, "spatial_ref_sys_srid_pkey", 0
]
[ "unique_key", 0, "unique_key", 1 ]
[ "allnewtriples_subject_idx", 0, NULL, NULL ]
[ "allnewtriples_predicate_idx", 0, NULL, NULL ]
@@ -90,7 +90,6 @@ stdout of test 'keys` in directory 'sql/
[ "comments_id_pkey", 0, "comments_id_pkey", 0 ]
[ "dependency_types_dependency_type_id_pkey", 0,
"dependency_types_dependency_type_id_pkey", 0 ]
[ "dependency_types_dependency_type_name_unique", 0,
"dependency_types_dependency_type_name_unique", 1 ]
-[ "spatial_ref_sys_srid_pkey", 0, "spatial_ref_sys_srid_pkey", 0
]
[ "keywords_keyword_pkey", 0, "keywords_keyword_pkey", 0
]
[ "table_types_table_type_id_pkey", 0,
"table_types_table_type_id_pkey", 0 ]
[ "table_types_table_type_name_unique", 0,
"table_types_table_type_name_unique", 1 ]
@@ -104,6 +103,7 @@ stdout of test 'keys` in directory 'sql/
[ "index_types_index_type_name_unique", 0,
"index_types_index_type_name_unique", 1 ]
[ "privilege_codes_privilege_code_id_pkey", 0,
"privilege_codes_privilege_code_id_pkey", 0 ]
[ "privilege_codes_privilege_code_name_unique", 0,
"privilege_codes_privilege_code_name_unique", 1 ]
+[ "spatial_ref_sys_srid_pkey", 0, "spatial_ref_sys_srid_pkey", 0
]
[ "unique_key", 0, "unique_key", 1 ]
#create table dummyme (a int primary key, b int);
#insert into dummyme values (1,1), (2,1), (3,1);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
