MonetDB: default - It's SQLSTATE, not SQLTYPE.

[Sjoerd Mullender]

Changeset: f03493863b72 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f03493863b72
Modified Files:
        sql/backends/monet5/generator/generator.c
        sql/server/rel_dump.c
Branch: default
Log Message:

It's SQLSTATE, not SQLTYPE.


diffs (40 lines):

diff --git a/sql/backends/monet5/generator/generator.c 
b/sql/backends/monet5/generator/generator.c
--- a/sql/backends/monet5/generator/generator.c
+++ b/sql/backends/monet5/generator/generator.c
@@ -51,12 +51,12 @@ VLTgenerator_noop(Client cntxt, MalBlkPt
                        /* with timestamp, step is of SQL type "interval 
seconds",
                         * i.e., MAL / C type "lng" */
                         VLTnoop(lng);
-               } else throw(MAL,"generator.noop", "SQLTYPE 42000 !""uUknown 
data type %d", getArgType(mb,pci,1));
+               } else throw(MAL,"generator.noop", SQLSTATE(42000) "unknown 
data type %d", getArgType(mb,pci,1));
        }
        if( zeroerror)
-               throw(MAL,"generator.noop", "SQLTYPE 42000 !""Zero step size 
not allowed");
+               throw(MAL,"generator.noop", SQLSTATE(42000) "Zero step size not 
allowed");
        if( nullerr)
-               throw(MAL,"generator.noop", "SQLTYPE 42000 !""Null step size 
not allowed");
+               throw(MAL,"generator.noop", SQLSTATE(42000) "Null step size not 
allowed");
        return MAL_SUCCEED;
 }
 
@@ -73,7 +73,7 @@ VLTgenerator_noop(Client cntxt, MalBlkPt
                else s =  *getArgReference_##TPE(stk,pci, 3);           \
                if (s == 0 || (s > 0 && f > l) || (s < 0 && f < l) || f == 
TPE##_nil || l == TPE##_nil) \
                        throw(MAL, "generator.table",                   \
-                              "SQLTYPE 42000 !""Illegal generator range");     
        \
+                             SQLSTATE(42000) "Illegal generator range"); \
                n = (BUN) ((l - f) / s);                                \
                if ((TPE) (n * s + f) != l)                             \
                        n++;                                            \
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -806,7 +806,7 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
                        if (filter) {
                                sql_subfunc *func = sql_find_func(sql->sa, 
mvc_bind_schema(sql, "sys"), fname, 1+list_length(exps), F_FILT, NULL);
                                if (!func)
-                                       return sql_error(sql, -1, "SQLTYPE 
42000 !""Filter: missing function '%s'\n", fname);
+                                       return sql_error(sql, -1, 
SQLSTATE(42000) "Filter: missing function '%s'\n", fname);
                                        
                                return exp_filter(sql->sa, lexps, rexps, func, 
0/* anti*/);
                        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list