Changeset: 87763220014d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/87763220014d
Branch: Mar2025
Log Message:
merged
diffs (38 lines):
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -2197,7 +2197,7 @@ SQLrename_schema(Client cntxt, MalBlkPtr
throw(SQL, "sql.rename_schema", SQLSTATE(3F000)
"ALTER SCHEMA: there is a schema named '%s' in the
database", new_name);
- if (mvc_check_dependency(sql, s->base.id, SCHEMA_DEPENDENCY, NULL) ==
HAS_DEPENDENCY) {
+ if (mvc_check_dependency(sql, s->base.id, SCHEMA_DEPENDENCY, NULL)) {
throw(SQL, "sql.rename_schema", "ALTER SCHEMA: unable to"
" rename schema '%s', there are database objects"
" which depend on it", old_name);
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -2851,7 +2851,7 @@ rel_rename_schema(mvc *sql, char *old_na
return sql_error(sql, 02, SQLSTATE(3F000)
"ALTER SCHEMA: there is a
schema named '%s' in the database", new_name);
- if (mvc_check_dependency(sql, s->base.id, SCHEMA_DEPENDENCY, NULL) !=
NO_DEPENDENCY) {
+ if (mvc_check_dependency(sql, s->base.id, SCHEMA_DEPENDENCY, NULL)) {
return sql_error(sql, 02,
SQLSTATE(2BM37) "ALTER SCHEMA:
unable to"
" rename schema '%s', there
are database objects"
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -1451,9 +1451,7 @@ mvc_check_dependency(mvc *m, sqlid id, s
dep_list =
sql_trans_owner_schema_dependencies(m->session->tr, id);
break;
case SCHEMA_DEPENDENCY:
- dep_list =
sql_trans_schema_user_dependencies(m->session->tr, id);
- if (!dep_list)
- dep_list =
sql_trans_get_dependents(m->session->tr, id, SCHEMA_DEPENDENCY, NULL);
+ dep_list = sql_trans_get_dependents(m->session->tr, id,
SCHEMA_DEPENDENCY, NULL);
break;
case TABLE_DEPENDENCY:
dep_list = sql_trans_get_dependents(m->session->tr, id,
TABLE_DEPENDENCY, NULL);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
