Changeset: e2aafc304c04 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2aafc304c04
Modified Files:
sql/storage/store.c
Branch: Jul2015
Log Message:
fixed bug 3912, improved check for name conflicts
diffs (21 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2018,6 +2018,17 @@ sql_trans_tname_conflict( sql_trans *tr,
return 1;
*tp++ = '_';
}
+ tmp = sa_strdup(tr->sa, cname);
+ tp = tmp;
+ while ((tp = strchr(tp, '_')) != NULL) {
+ char *ntmp;
+ *tp = 0;
+ ntmp = sa_message(tr->sa, "%s_%s", tname, tmp);
+ t = find_sql_table(s, ntmp);
+ if (t && sql_trans_cname_conflict(tr, t, NULL, tp+1))
+ return 1;
+ *tp++ = '_';
+ }
t = find_sql_table(s, tname);
if (t && sql_trans_cname_conflict(tr, t, NULL, cname))
return 1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
