MonetDB: Dec2016 - also replica's have a set of tables

[Niels Nes]

Changeset: 470553ec27f8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=470553ec27f8
Modified Files:
        sql/backends/monet5/sql.c
        sql/test/mergetables/Tests/addtable.stable.err
Branch: Dec2016
Log Message:

also replica's have a set of tables


diffs (26 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
@@ -1199,8 +1199,8 @@ alter_table_add_table(mvc *sql, char *ms
                mt = mvc_bind_table(sql, ms, mtname);
        if (ps)
                pt = mvc_bind_table(sql, ps, ptname);
-       if (mt && mt->type != tt_merge_table)
-               return sql_message("42S02!ALTER TABLE: cannot add table '%s.%s' 
to table '%s.%s' (not a merge table)", psname, ptname, msname, mtname);
+       if (mt && (mt->type != tt_merge_table && mt->type != tt_replica_table))
+               return sql_message("42S02!ALTER TABLE: cannot add table '%s.%s' 
to table '%s.%s'", psname, ptname, msname, mtname);
        if (mt && pt) {
                char *msg;
                node *n = cs_find_id(&mt->tables, pt->base.id);
diff --git a/sql/test/mergetables/Tests/addtable.stable.err 
b/sql/test/mergetables/Tests/addtable.stable.err
--- a/sql/test/mergetables/Tests/addtable.stable.err
+++ b/sql/test/mergetables/Tests/addtable.stable.err
@@ -29,7 +29,7 @@ stderr of test 'addtable` in directory '
 
 MAPI  = (monetdb) /var/tmp/mtest-19670/.s.monetdb.38251
 QUERY = alter table tmp1 add table tmp2;
-ERROR = !ALTER TABLE: cannot add table 'sys.tmp2' to table 'sys.tmp1' (not a 
merge table)
+ERROR = !ALTER TABLE: cannot add table 'sys.tmp2' to table 'sys.tmp1'
 
 # 13:47:16 >  
 # 13:47:16 >  "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list