Update of /cvsroot/monetdb/sql/src/storage
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14064/src/storage
Modified Files:
store.mx
Log Message:
fixed crash, after add / drop column
fixed passing over seperators, m5 doesn't do de-escaping by default, so
we do it in import and export
Index: store.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/store.mx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- store.mx 16 Jan 2008 08:51:14 -0000 1.8
+++ store.mx 30 Jan 2008 10:41:36 -0000 1.9
@@ -1040,6 +1040,20 @@
}
}
+static int
+table_next_column_nr(sql_table *t)
+{
+ int nr = cs_size(&t->columns);
+ if (nr) {
+ node *n = cs_last_node(&t->columns);
+ if (n) {
+ sql_column *c = n->data;
+
+ nr = c->colnr+1;
+ }
+ }
+ return nr;
+}
static sql_column *
bootstrap_create_column(sql_trans *tr, sql_table *t, char *name, char
*sqltype, int digits)
@@ -1053,7 +1067,7 @@
sql_find_subtype(&col->type, sqltype, digits, 0);
col->def = NULL;
col->null = 1;
- col->colnr = cs_size(&t->columns);
+ col->colnr = table_next_column_nr(t);
col->t = t;
col->unique = 0;
cs_add(&t->columns, col, TR_NEW);
@@ -3326,7 +3340,7 @@
col->type = *tpe;
col->def = NULL;
col->null = 1;
- col->colnr = cs_size(&t->columns);
+ col->colnr = table_next_column_nr(t);
col->t = t;
col->unique = 0;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
