MonetDB: sciql - minor corrections in error messages

[Jennie Zhang]

Changeset: 4843107b84ab for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4843107b84ab
Modified Files:
        sql/server/rel_schema.c
Branch: sciql
Log Message:

minor corrections in error messages


diffs (22 lines):

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
@@ -595,7 +595,7 @@ create_column(mvc *sql, symbol *s, sql_s
 
 (void)ss;
        if (alter && !isTableOrArray(t)) {
-               sql_error(sql, 02, "ALTER %s: cannot add column to VIEW 
'%s'\n", isTable(t)?"TABLE":"ARRAY", t->base.name);
+               sql_error(sql, 02, "ALTER %s: cannot add column to VIEW 
'%s'\n", isTable(t)?"TABLE":(isARRAY(t)?"ARRAY":"TABLE/ARRAY"), t->base.name);
                return SQL_ERR;
        }
        if (l->h->next->next)
@@ -764,8 +764,7 @@ table_element(mvc *sql, symbol *s, sql_s
                        break;
                }
                sql_error(sql, 02, "ALTER %s: cannot %s %s '%s'\n",
-                               /* TODO: check if we only have TABLE or ARRAY */
-                               isTable(t)?"TABLE":"ARRAY",
+                               
isTable(t)?"TABLE":(isARRAY(t)?"ARRAY":"TABLE/ARRAY"),
                                msg, 
                                isMergeTable(t)?"MERGE TABLE":"VIEW",
                                t->base.name);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list