Changeset: 424333a13c63 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=424333a13c63
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
Branch: malparsing
Log Message:
Fix the error message
diffs (33 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2759,7 +2759,7 @@ zero_or_one(ptr ret, const bat *bid)
char buf[BUFSIZ];
p = NULL;
- snprintf(buf, BUFSIZ, "21000!cardinality violation (" BUNFMT
">1)", c);
+ snprintf(buf, BUFSIZ, "21000!more than one row returned by a
subquery used as an expression (" BUNFMT ">1)", c);
throw(SQL, "zero_or_one", "%s", buf);
}
_s = ATOMsize(ATOMtype(b->ttype));
diff --git a/sql/backends/monet5/sql.mal b/sql/backends/monet5/sql.mal
--- a/sql/backends/monet5/sql.mal
+++ b/sql/backends/monet5/sql.mal
@@ -340,7 +340,7 @@ inline function sql.subzero_or_one( b:ba
c1 := calc.>(m,1:lng);
c11 := calc.and(c01,c1);
ms := calc.str(m);
- msg := str.+("21000!zero_or_one: cardinality violation (", ms);
+ msg := str.+("21000!zero_or_one: more than one row returned by a
subquery used as an expression (", ms);
msg1 := str.+(msg, ">1)");
sql.assert(c11, msg1);
return zero_or_one := b;
@@ -359,7 +359,7 @@ inline function sql.all( b:bat[:any_1],
c1 := calc.>(m,1:lng);
c11 := calc.and(c01,c1);
ms := calc.str(m);
- msg := str.+("21000!zero_or_one: cardinality violation (", ms);
+ msg := str.+("21000!zero_or_one: more than one row returned by a
subquery used as an expression (", ms);
msg1 := str.+(msg, ">1)");
sql.assert(c11, msg1);
return all := b;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
