/ Check-in [e8882dac]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:bug fix (CVS 130)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:e8882dac2306afbc7bffdaa93c9a7fc45fdbd8e1
User & Date: drh 2000-08-09 17:17:25
Context
2000-08-17
09:50
allow readonly access when write permission denied (CVS 131) check-in: 897b4bc0 user: drh tags: trunk
2000-08-09
17:17
bug fix (CVS 130) check-in: e8882dac user: drh tags: trunk
2000-08-08
20:19
Add pattern matching to the .table command (CVS 129) check-in: 2b3511ec user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/tokenize.c.

    23     23   *************************************************************************
    24     24   ** An tokenizer for SQL
    25     25   **
    26     26   ** This file contains C code that splits an SQL input string up into
    27     27   ** individual tokens and sends those tokens one-by-one over to the
    28     28   ** parser for analysis.
    29     29   **
    30         -** $Id: tokenize.c,v 1.12 2000/06/16 20:51:26 drh Exp $
           30  +** $Id: tokenize.c,v 1.13 2000/08/09 17:17:25 drh Exp $
    31     31   */
    32     32   #include "sqliteInt.h"
    33     33   #include <ctype.h>
    34     34   #include <stdlib.h>
    35     35   
    36     36   /*
    37     37   ** All the keywords of the SQL language are stored as in a hash
................................................................................
   140    140   ** Return the length of the token that begins at z[0].  Return
   141    141   ** -1 if the token is (or might be) incomplete.  Store the token
   142    142   ** type in *tokenType before returning.
   143    143   */
   144    144   int sqliteGetToken(const char *z, int *tokenType){
   145    145     int i;
   146    146     switch( *z ){
   147         -    case ' ': case '\t': case '\n': case '\f': {
          147  +    case ' ': case '\t': case '\n': case '\f': case '\r': {
   148    148         for(i=1; z[i] && isspace(z[i]); i++){}
   149    149         *tokenType = TK_SPACE;
   150    150         return i;
   151    151       }
   152    152       case '-': {
   153    153         if( z[1]==0 ) return -1;
   154    154         if( z[1]=='-' ){
................................................................................
   346    346             trace = 0;
   347    347             sqliteParserTrace(trace, "parser: ");
   348    348           }else if( sqliteStrNICmp(z,"--vdbe-trace-on--",17)==0 ){
   349    349             pParse->db->flags |= SQLITE_VdbeTrace;
   350    350           }else if( sqliteStrNICmp(z,"--vdbe-trace-off--", 18)==0 ){
   351    351             pParse->db->flags &= ~SQLITE_VdbeTrace;
   352    352   #ifdef MEMORY_DEBUG
   353         -        }else if( sqliteStrNICmp(z,"--malloc-file=",14)==0 ){
          353  +        }else if( sqliteStrNICmp(z,"--malloc-fail=",14)==0 ){
   354    354             sqlite_iMallocFail = atoi(&z[14]);
   355    355           }else if( sqliteStrNICmp(z,"--malloc-stats--", 16)==0 ){
   356    356             if( pParse->xCallback ){
   357    357               static char *azName[4] = {"malloc", "free", "to_fail", 0 };
   358    358               char *azArg[4];
   359    359               char zVal[3][30];
   360    360               sprintf(zVal[0],"%d", sqlite_nMalloc);

Changes to www/changes.tcl.

    12     12   }
    13     13   
    14     14   
    15     15   proc chng {date desc} {
    16     16     puts "<DT><B>$date</B></DT>"
    17     17     puts "<DD><P><UL>$desc</UL></P></DD>"
    18     18   }
           19  +
           20  +chng {2000 Aug 9} {
           21  +<li>Treat carriage returns as white space.</li>
           22  +}
    19     23   
    20     24   chng {2000 Aug 8} {
    21     25   <li>Added pattern matching to the ".table" command in the "sqlite"
    22     26   command shell.</li>
    23     27   }
    24     28   
    25     29   chng {2000 Aug 4} {