Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16:/tmp/cvs-serv31468/src/server
Modified Files:
sql_parser.mx sql_schema.mx
Log Message:
cleanup some more pre-remap.optimzer code
approved some output of tests
bumped the SQL_VERSION (ie the catalog got changed by romulo)
Index: sql_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_parser.mx,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- sql_parser.mx 1 Apr 2007 22:08:57 -0000 1.240
+++ sql_parser.mx 17 Apr 2007 12:27:07 -0000 1.241
@@ -1017,6 +1017,14 @@
append_string(l, $2);
append_symbol(l, $5);
$$ = _symbol_create_list( SQL_DEFAULT, l); }
+ | opt_column ident SET NULLX
+ { dlist *l = L();
+ append_string(l, $2);
+ $$ = _symbol_create_list( SQL_NULL, l); }
+ | opt_column ident SET NOT NULLX
+ { dlist *l = L();
+ append_string(l, $2);
+ $$ = _symbol_create_list( SQL_NOT_NULL, l); }
| opt_column ident DROP DEFAULT
{ $$ = _symbol_create( SQL_DROP_DEFAULT, $2); }
;
Index: sql_schema.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_schema.mx,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- sql_schema.mx 17 Apr 2007 10:31:47 -0000 1.121
+++ sql_schema.mx 17 Apr 2007 12:27:07 -0000 1.122
@@ -1180,6 +1180,15 @@
res = SQL_OK;
}
break;
+ case SQL_NOT_NULL:
+ case SQL_NULL:
+ {
+ int null = (s->token == SQL_NOT_NULL) ? 0 : 1;
+
+ mvc_null(sql, cs, null);
+ res = SQL_OK;
+ }
+ break;
}
if (res == SQL_ERR) {
(void) sql_error(sql, 02, "unknown column option (%ld)->token =
%s\n", (long) s, token2string(s->token));
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
