Shouldn't this have gone to the Nov2009 branch?
Martin Kersten wrote:
> Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
> In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8289
>
> Modified Files:
> tablet_sql.mx
> Log Message:
> Handle the case that an integer column is fed a string value that
> appears to match the null string.
>
>
> U tablet_sql.mx
> Index: tablet_sql.mx
> ===================================================================
> RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/tablet_sql.mx,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -d -r1.9 -r1.10
> --- tablet_sql.mx 2 Oct 2009 14:31:39 -0000 1.9
> +++ tablet_sql.mx 6 Oct 2009 13:33:45 -0000 1.10
> @@ -88,12 +88,21 @@
> #endif
> adt = fmt->nildata;
> fmt->c[0]->T->nonil = 0;
> - } else if ( quote && *s == quote ) {
> - s++; /* find the last quote */
> + } else
> + if ( quote && *s == quote ) {
> + /* strip the quotes when present */
> + s++;
> for ( t = e = s; *t ; t++)
> if ( *t == quote) e = t;
> *e = 0;
> adt = fmt->frstr(fmt, fmt->adt, s, e, 0);
> + /* The user might have specified a null string escape
> + e.g. NULL as '', which should be tested */
> + if (adt == NULL && s == e && fmt->nullstr &&
> + strncasecmp(s, fmt->nullstr, fmt->null_length+1) == 0){
> + adt = fmt->nildata;
> + fmt->c[0]->T->nonil = 0;
> + }
> } else {
> for( e=s; *e; e++)
> ;
>
>
> ------------------------------------------------------------------------------
> Come build with us! The BlackBerry® Developer Conference in SF, CA
> is the only developer event you need to attend this year. Jumpstart your
> developing skills, take BlackBerry mobile applications to market and stay
> ahead of the curve. Join us from November 9-12, 2009. Register now!
> http://p.sf.net/sfu/devconf
> _______________________________________________
> Monetdb-checkins mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/monetdb-checkins-- Sjoerd Mullender
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf
_______________________________________________ Monetdb-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/monetdb-developers
