MonetDB: Aug2018 - Throw error messages from the SQL optimizer a...

[Pedro Ferreira]

Changeset: d4865f294af6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4865f294af6
Modified Files:
        sql/backends/monet5/sql_execute.c
Branch: Aug2018
Log Message:

Throw error messages from the SQL optimizer as well.


diffs (15 lines):

diff --git a/sql/backends/monet5/sql_execute.c 
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -627,8 +627,10 @@ SQLstatementIntern(Client c, str *expr, 
                        c->curprg->def->errors = 0;
                        if (strlen(m->errstr) > 6 && m->errstr[5] == '!')
                                msg = createException(PARSE, "SQLparser", "%s", 
m->errstr);
+                       else if (*m->errstr)
+                               msg = createException(PARSE, "SQLparser", 
SQLSTATE(42000) "%s", m->errstr);
                        else
-                               msg = createException(PARSE, "SQLparser", 
SQLSTATE(42000) "%s", m->errstr);
+                               msg = createException(PARSE, "SQLparser", 
SQLSTATE(42000) "%s", msg);
                        *m->errstr = 0;
                        goto endofcompile;
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list