Update of /cvsroot/monetdb/sql/src/common
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15816
Modified Files:
sql_types.mx
Log Message:
Reverted previous checkin "added binary import support (using new
BATattach)". We don't need it after all, and it causes an
incompatibility between the database format of the Nov2008 branch and
this version.
(So, any database created using the now reverted change will be
incompatible with the version after this commit.)
U sql_types.mx
Index: sql_types.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/common/sql_types.mx,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- sql_types.mx 22 Jan 2009 21:58:06 -0000 1.120
+++ sql_types.mx 27 Jan 2009 16:14:23 -0000 1.121
@@ -1242,14 +1242,14 @@
sql_type **strings, **numerical;
sql_type **decimals, **floats, **dates, **end, **t;
sql_type *STR, *BTE, *SHT, *INT, *LNG, *OID, *BIT, *DBL, *WRD;
- sql_type *TABLE, *SECINT, *MONINT, *DTE;
+ sql_type *SECINT, *MONINT, *DTE;
sql_type *TME, *TMETZ, *TMESTAMP, *TMESTAMPTZ;
sql_type *ANY;
ANY = sql_create_type("ANY", 0, 0, 0, EC_ANY, "any");
t = ts;
- TABLE = *t++ = sql_create_type("TABLE", 0, 0, 0, EC_TABLE, "bat");
+ *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");
@@ -1579,8 +1579,6 @@
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);
}
}
- /* TODO varargs */
- sql_create_func("import", "sql", "importTable", STR, STR, TABLE,
SCALE_NONE);
}
void
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
