Update of /cvsroot/monetdb/sql/src/common
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12431/src/common
Modified Files:
sql_types.mx
Log Message:
added support for 'create cluster name on tname ( column list )'
which caused lots of changes all over the place.
also fixed (moved code out of sql -> mkey)
moved finally copy into over to a function and into relational alg.
U sql_types.mx
Index: sql_types.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/common/sql_types.mx,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- sql_types.mx 8 Jun 2009 04:43:10 -0000 1.129
+++ sql_types.mx 25 Jul 2009 22:08:37 -0000 1.130
@@ -1295,13 +1295,13 @@
sql_type *STR, *BTE, *SHT, *INT, *LNG, *OID, *BIT, *DBL, *WRD, *DEC;
sql_type *SECINT, *MONINT, *DTE;
sql_type *TME, *TMETZ, *TMESTAMP, *TMESTAMPTZ;
- sql_type *ANY;
+ sql_type *ANY, *TABLE;
sql_func *f;
ANY = sql_create_type("ANY", 0, 0, 0, EC_ANY, "any");
t = ts;
- *t++ = sql_create_type("TABLE", 0, 0, 0, EC_TABLE, "bat");
+ TABLE = *t++ = sql_create_type("TABLE", 0, 0, 0, EC_TABLE, "bat");
BIT = *t++ = sql_create_type("BOOLEAN", 1, 0, 2, EC_BIT, "bit");
sql_create_alias(BIT->sqlname, "BOOL");
@@ -1341,7 +1341,6 @@
*t++ = sql_create_type("REAL", 24, SCALE_NOFIX, 2, EC_FLT, "flt");
DBL = *t++ = sql_create_type("DOUBLE", 53, SCALE_NOFIX, 2, EC_FLT,
"dbl");
-
dates = t;
MONINT = *t++ = sql_create_type("MONTH_INTERVAL", 32, 0, 2,
EC_INTERVAL, "int");
SECINT = *t++ = sql_create_type("SEC_INTERVAL", 19, SCALE_FIX, 10,
EC_INTERVAL, "lng");
@@ -1597,6 +1596,8 @@
sql_create_func3("substring", "str", "substring", *t, INT, INT,
*t, SCALE_NONE);
sql_create_func("like", "str", "like", *t, *t, BIT, SCALE_NONE);
sql_create_func3("like", "str", "like", *t, *t, *t, BIT,
SCALE_NONE);
+ sql_create_func("ilike", "str", "ilike", *t, *t, BIT,
SCALE_NONE);
+ sql_create_func3("ilike", "str", "ilike", *t, *t, *t, BIT,
SCALE_NONE);
sql_create_func("patindex", "pcre", "patindex", *t, *t, INT,
SCALE_NONE);
sql_create_func("truncate", "str", "stringleft", *t, INT, *t,
SCALE_NONE);
sql_create_func("concat", "calc", "+", *t, *t, *t, DIGITS_ADD);
@@ -1636,6 +1637,37 @@
list_append(list_append (list_append
(list_append(list_append(list_create((fdestroy) &arg_destroy), create_arg(NULL,
sql_create_subtype(*t, 0, 0))), create_arg(NULL, sql_create_subtype(*t, 0,
0))), create_arg(NULL, sql_create_subtype(INT, 0, 0))), create_arg(NULL,
sql_create_subtype(INT, 0, 0))), create_arg(NULL, sql_create_subtype(INT, 0,
0))), &sres, FALSE, FALSE, SCALE_FIX);
}
}
+ { sql_subtype sres;
+ sql_init_subtype(&sres, TABLE, 0, 0);
+ /* copyfrom fname (arg 6) */
+ sql_create_func_("copyfrom", "sql", "copy_from",
+ list_append( list_append( list_append( list_append(list_append
(list_append (list_append(list_append(list_create((fdestroy) &arg_destroy),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(LNG, 0, 0))),
+ create_arg(NULL, sql_create_subtype(LNG, 0, 0))),
&sres, FALSE, FALSE, SCALE_FIX);
+
+ /* copyfrom stdin */
+ sql_create_func_("copyfrom", "sql", "copyfrom",
+ list_append( list_append( list_append(list_append (list_append
(list_append(list_append(list_create((fdestroy) &arg_destroy),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(LNG, 0, 0))),
+ create_arg(NULL, sql_create_subtype(LNG, 0, 0))),
&sres, FALSE, FALSE, SCALE_FIX);
+
+ /* bincopyfrom */
+ sql_create_func_("copyfrom", "sql", "importTable",
+ list_append(list_append(list_create((fdestroy) &arg_destroy),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
+ create_arg(NULL, sql_create_subtype(STR, 0, 0))),
&sres, FALSE, FALSE, SCALE_FIX);
+ }
}
void
------------------------------------------------------------------------------
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
