Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28694/src/server
Modified Files:
rel_select.mx
Log Message:
switched to using parallel loader only. Also for non file case.
Still some tests fail, but we want the same rules for csv data for
both files and stream input.
U rel_select.mx
Index: rel_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_select.mx,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- rel_select.mx 4 Aug 2009 07:24:28 -0000 1.153
+++ rel_select.mx 7 Aug 2009 15:49:31 -0000 1.154
@@ -88,6 +88,7 @@
#include "rel_dump.h"
#include "rel_prop.h"
+#define ERR_AMBIGUOUS 050000
#define rel_groupby_gbe(r,e) rel_groupby(r, append(new_exp_list(), e))
sql_rel *
@@ -1152,7 +1153,7 @@
*p = rel;
l = rel_bind_column_(sql, p, rel->l, cname);
if (l && r && !is_subquery(r)) {
- (void) sql_error(sql, 02, "SELECT: identifier
'%s' unknown or ambiguous", cname);
+ (void) sql_error(sql, ERR_AMBIGUOUS, "SELECT:
identifier '%s' ambiguous", cname);
return NULL;
}
}
@@ -1482,10 +1483,10 @@
exp = rel_bind_column(sql, *rel, name, f);
if (exp) {
if (var || a)
- return sql_error(sql, 02, "SELECT: identifier
'%s' ambiguous", name);
+ return sql_error(sql, ERR_AMBIGUOUS, "SELECT:
identifier '%s' ambiguous", name);
} else if (a) {
if (var)
- return sql_error(sql, 02, "SELECT: identifier
'%s' ambiguous", name);
+ return sql_error(sql, ERR_AMBIGUOUS, "SELECT:
identifier '%s' ambiguous", name);
exp = exp_param(a->name, &a->type, 0);
}
if (!exp && var)
@@ -1969,7 +1970,7 @@
are correlations with the outer relation */
sql_rel *r = rel_subquery(sql, NULL, ro, ek);
- if (!r) {
+ if (!r && sql->session->status != -ERR_AMBIGUOUS) {
/* reset error */
sql->session->status = 0;
sql->errstr[0] = 0;
@@ -2078,7 +2079,7 @@
are correlations with the outer relation */
sql_rel *r = rel_subquery(sql, NULL, ro, ek);
- if (!r) { /* correlation, ie return new relation */
+ if (!r && sql->session->status != -ERR_AMBIGUOUS) { /*
correlation, ie return new relation */
sql_exp *e;
/* reset error */
@@ -2491,7 +2492,7 @@
int correlated = 0, vals_only = 1;
int l_is_value = 1;
- if (!l) {
+ if (!l && sql->session->status != -ERR_AMBIGUOUS) {
l_is_value = 0;
/* reset error */
left = rel;
@@ -2531,7 +2532,7 @@
sql_rel *rl;
r = rel_value_exp(sql, &z, sval, f, ek);
- if (!r) {
+ if (!r && sql->session->status !=
-ERR_AMBIGUOUS) {
/* reset error */
sql->session->status = 0;
sql->errstr[0] = 0;
@@ -2652,7 +2653,7 @@
ek.card = card_set;
r = rel_subquery(sql, NULL, lo, ek);
- if (!r && rel) { /* correlation */
+ if (!r && rel && sql->session->status != -ERR_AMBIGUOUS) { /*
correlation */
sql_exp *le, *re;
/* reset error */
sql->session->status = 0;
@@ -3979,7 +3980,7 @@
*is_last=1;
return e;
}
- if (!r) {
+ if (!r && sql->session->status != -ERR_AMBIGUOUS) {
if (!*rel)
return NULL;
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
