MonetDB: Dec2011 - ODBC: SQLSTATE is now terminated by !.

[Sjoerd Mullender]

Changeset: 6bb51f19aff3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bb51f19aff3
Modified Files:
        clients/odbc/driver/SQLExecDirect.c
Branch: Dec2011
Log Message:

ODBC: SQLSTATE is now terminated by !.


diffs (33 lines):

diff --git a/clients/odbc/driver/SQLExecDirect.c 
b/clients/odbc/driver/SQLExecDirect.c
--- a/clients/odbc/driver/SQLExecDirect.c
+++ b/clients/odbc/driver/SQLExecDirect.c
@@ -45,10 +45,6 @@ static struct errors {
        const char *msg;
 } errors[] = {
        {"syntax error", "42000"},
-       {"DROP TABLE: no such table", "42S02"},
-       {"DROP VIEW: unknown view", "42S02"},
-       {"ALTER TABLE: no such table", "42S02"},
-       {"CREATE INDEX: no such table", "42S02"},
        {"SELECT: no such table", "42S02"},
        {"INSERT INTO: no such table", "42S02"},
        {"DELETE FROM: no such table", "42S02"},
@@ -62,7 +58,7 @@ ODBCErrorType(const char *msg, const cha
 {
        struct errors *e;
 
-       if (strlen(msg) > 6 && msg[5] == ':' &&
+       if (strlen(msg) > 6 && msg[5] == '!' &&
            ((msg[0] >= '0' && msg[0] <= '9') ||
             (msg[0] >= 'A' && msg[0] <= 'Z')) &&
            ((msg[1] >= '0' && msg[1] <= '9') ||
@@ -72,8 +68,7 @@ ODBCErrorType(const char *msg, const cha
            ((msg[3] >= '0' && msg[3] <= '9') ||
             (msg[3] >= 'A' && msg[3] <= 'Z')) &&
            ((msg[4] >= '0' && msg[4] <= '9') ||
-            (msg[4] >= 'A' && msg[4] <= 'Z')) &&
-           strncmp(msg, "ERROR", 5) != 0) {
+            (msg[4] >= 'A' && msg[4] <= 'Z'))) {
                *emsg = msg + 6;
                while (**emsg == ' ')
                        (*emsg)++;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list