Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6375/src/server
Modified Files:
sql_parser.mx sql_scan.mx
Log Message:
datacell extensions
Index: sql_scan.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_scan.mx,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- sql_scan.mx 7 Jan 2010 15:24:32 -0000 1.158
+++ sql_scan.mx 30 Jan 2010 12:33:29 -0000 1.159
@@ -234,6 +234,7 @@
keywords_insert("TABLE", TABLE);
keywords_insert("TEMPORARY", TEMPORARY);
keywords_insert("TEMP", TEMPORARY);
+ keywords_insert("STREAM", STREAM);
keywords_insert("TO", TO);
keywords_insert("UNION", UNION);
keywords_insert("EXCEPT", EXCEPT);
@@ -805,6 +806,8 @@
case ')':
case ',':
case '=':
+ case '[':
+ case ']':
lc->started = 1;
return scanner_token(lc, cur);
case '@':
Index: sql_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_parser.mx,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- sql_parser.mx 10 Jan 2010 20:33:40 -0000 1.330
+++ sql_parser.mx 30 Jan 2010 12:33:27 -0000 1.331
@@ -694,7 +694,7 @@
SQLCODE SQLERROR UNDER WHENEVER
*/
-%token TEMPORARY
+%token TEMPORARY STREAM
%token<sval> ASC DESC AUTHORIZATION
%token CHECK CONSTRAINT CREATE
%token TYPE PROCEDURE FUNCTION AGGREGATE RETURNS EXTERNAL sqlNAME DECLARE
@@ -1454,6 +1454,7 @@
| TEMPORARY { $$ = SQL_LOCAL_TEMP; }
| LOCAL TEMPORARY { $$ = SQL_LOCAL_TEMP; }
| GLOBAL TEMPORARY { $$ = SQL_GLOBAL_TEMP; }
+ | STREAM { $$ = SQL_STREAM; }
;
opt_on_commit: /* only for temporary tables */
@@ -3031,6 +3032,22 @@
{ $$ = $2;
append_symbol($2->data.lval, $4); }
*/
+
+/* Basket expression, TODO window */
+ | '[' select_no_parens ']' table_name
+ {
+ dlist *basket_table_func = L();
+ dlist *basket_func = L();
+ dlist *basket_func_name = append_string(L(), "basket");
+ dlist *arg_list = L();
+
+ append_list(basket_func, basket_func_name);
+ append_list(basket_func, append_symbol(arg_list, $2));
+
+ append_symbol(basket_table_func, _symbol_create_list( SQL_NOP,
basket_func ));
+ append_symbol(basket_table_func, $4);
+ $$ = _symbol_create_list(SQL_TABLE, basket_table_func);
+ }
;
table_name:
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
