Changeset: 79191a04d906 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=79191a04d906
Modified Files:
monetdb5/mal/mal_instruction.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_user.c
Branch: Jun2016
Log Message:
Cleanup.
diffs (73 lines):
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -1539,7 +1539,7 @@ pushArgument(MalBlkPtr mb, InstrPtr p, i
freeInstruction(p);
return NULL;
}
- memcpy((char *) pn, (char *) p, space);
+ memcpy(pn, p, space);
GDKfree(p);
pn->maxarg += MAXARG;
/* we have to keep track on the maximal arguments/block
diff --git a/sql/backends/monet5/sql_cast.c b/sql/backends/monet5/sql_cast.c
--- a/sql/backends/monet5/sql_cast.c
+++ b/sql/backends/monet5/sql_cast.c
@@ -310,7 +310,7 @@ batstr_2_date(bat *res, const bat *bid)
}
str
-str_2_sqlblob(sqlblob * *res, const str *val)
+str_2_sqlblob(sqlblob **res, const str *val)
{
ptr p = NULL;
int len = 0;
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -194,7 +194,13 @@ monet5_create_privileges(ptr _mvc, sql_s
with the approriate scenario (sql) */
mvc_create_func(m, NULL, s, "db_users", ops, res, F_UNION,
FUNC_LANG_SQL, "sql", "db_users", "CREATE FUNCTION db_users () RETURNS TABLE(
name varchar(2048)) EXTERNAL NAME sql.db_users;", FALSE, FALSE);
- t = mvc_create_view(m, s, "users", SQL_PERSIST, "SELECT u.\"name\" AS
\"name\", " "ui.\"fullname\", ui.\"default_schema\" " "FROM db_users() AS u
LEFT JOIN " "\"sys\".\"db_user_info\" AS ui " "ON u.\"name\" = ui.\"name\" "
";", 1);
+ t = mvc_create_view(m, s, "users", SQL_PERSIST,
+ "SELECT u.\"name\" AS \"name\", "
+ "ui.\"fullname\", ui.\"default_schema\" "
+ "FROM db_users() AS u LEFT JOIN "
+ "\"sys\".\"db_user_info\" AS ui "
+ "ON u.\"name\" = ui.\"name\" "
+ ";", 1);
mvc_create_column_(m, t, "name", "varchar", 1024);
mvc_create_column_(m, t, "fullname", "varchar", 2024);
mvc_create_column_(m, t, "default_schema", "int", 9);
@@ -277,7 +283,10 @@ monet5_alter_user(ptr _mvc, str user, st
free(pwd);
free(opwd);
}
- (void) sql_error(m, 02, "ALTER USER: " "use
'ALTER USER SET [ ENCRYPTED ] PASSWORD xxx " "USING OLD PASSWORD yyy' " "when
changing your own password");
+ (void) sql_error(m, 02, "ALTER USER: "
+ "use 'ALTER USER SET [ ENCRYPTED ]
PASSWORD xxx "
+ "USING OLD PASSWORD yyy' "
+ "when changing your own password");
return (FALSE);
}
err = AUTHsetPassword(c, &user, &pwd);
@@ -332,14 +341,16 @@ monet5_rename_user(ptr _mvc, str olduser
rid = table_funcs.column_find_row(m->session->tr, users_name, olduser,
NULL);
if (rid == oid_nil) {
- (void) sql_error(m, 02, "ALTER USER: local inconsistency, "
"your database is damaged, user not found in SQL catalog");
+ (void) sql_error(m, 02, "ALTER USER: local inconsistency, "
+ "your database is damaged, user not found in
SQL catalog");
return (FALSE);
}
table_funcs.column_update_value(m->session->tr, users_name, rid,
newuser);
rid = table_funcs.column_find_row(m->session->tr, auths_name, olduser,
NULL);
if (rid == oid_nil) {
- (void) sql_error(m, 02, "ALTER USER: local inconsistency, "
"your database is damaged, auth not found in SQL catalog");
+ (void) sql_error(m, 02, "ALTER USER: local inconsistency, "
+ "your database is damaged, auth not found in
SQL catalog");
return (FALSE);
}
table_funcs.column_update_value(m->session->tr, auths_name, rid,
newuser);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
