MonetDB: Jul2021 - Throw better error

[Pedro Ferreira]

Changeset: f22a16dc7391 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f22a16dc7391
Modified Files:
        sql/backends/monet5/sql_orderidx.c
Branch: Jul2021
Log Message:

Throw better error


diffs (27 lines):

diff --git a/sql/backends/monet5/sql_orderidx.c 
b/sql/backends/monet5/sql_orderidx.c
--- a/sql/backends/monet5/sql_orderidx.c
+++ b/sql/backends/monet5/sql_orderidx.c
@@ -43,8 +43,10 @@ sql_createorderindex(Client cntxt, MalBl
                throw(SQL, "sql.createorderindex", SQLSTATE(3FOOO) "Unknown 
schema %s", sch);
        if (!mvc_schema_privs(m, s))
                throw(SQL, "sql.createorderindex", SQLSTATE(42000) "Access 
denied for %s to schema '%s'", get_string_global_var(m, "current_user"), 
s->base.name);
-       if (!(t = mvc_bind_table(m, s, tbl)) || !isTable(t))
+       if (!(t = mvc_bind_table(m, s, tbl)))
                throw(SQL, "sql.createorderindex", SQLSTATE(42S02) "Unknown 
table %s.%s", sch, tbl);
+       if (!isTable(t))
+               throw(SQL, "sql.createorderindex", SQLSTATE(42000) "%s '%s' is 
not persistent", TABLE_TYPE_DESCRIPTION(t->type, t->properties), t->base.name);
        if (!(c = mvc_bind_column(m, t, col)))
                throw(SQL, "sql.createorderindex", SQLSTATE(38000) "Unknown 
column %s.%s.%s", sch, tbl, col);
        sqlstore *store = m->session->tr->store;
@@ -79,8 +81,10 @@ sql_droporderindex(Client cntxt, MalBlkP
                throw(SQL, "sql.droporderindex", SQLSTATE(3FOOO) "Unknown 
schema %s", sch);
        if (!mvc_schema_privs(m, s))
                throw(SQL, "sql.droporderindex", SQLSTATE(42000) "Access denied 
for %s to schema '%s'", get_string_global_var(m, "current_user"), s->base.name);
-       if (!(t = mvc_bind_table(m, s, tbl)) || !isTable(t))
+       if (!(t = mvc_bind_table(m, s, tbl)))
                throw(SQL, "sql.droporderindex", SQLSTATE(42S02) "Unknown table 
%s.%s", sch, tbl);
+       if (!isTable(t))
+               throw(SQL, "sql.droporderindex", SQLSTATE(42000) "%s '%s' is 
not persistent", TABLE_TYPE_DESCRIPTION(t->type, t->properties), t->base.name);
        if (!(c = mvc_bind_column(m, t, col)))
                throw(SQL, "sql.droporderindex", SQLSTATE(38000) "Unknown 
column %s.%s.%s", sch, tbl, col);
        sqlstore *store = m->session->tr->store;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list