Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | added IN and BETWEEN operators (CVS 57) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
54d198189b58366e4e40139102bc6de9 |
User & Date: | drh 2000-06-06 13:54:15.000 |
Context
2000-06-06
| ||
17:27 | GROUP BY and HAVING installed (CVS 58) (check-in: db88a0c2d4 user: drh tags: trunk) | |
13:54 | added IN and BETWEEN operators (CVS 57) (check-in: 54d198189b user: drh tags: trunk) | |
03:31 | :-) (CVS 56) (check-in: b52dd82fe3 user: drh tags: trunk) | |
Changes
Changes to src/delete.c.
︙ | ︙ | |||
20 21 22 23 24 25 26 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle DELETE FROM statements. ** | | > | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle DELETE FROM statements. ** ** $Id: delete.c,v 1.3 2000/06/06 13:54:15 drh Exp $ */ #include "sqliteInt.h" /* ** Process a DELETE FROM statement. */ void sqliteDeleteFrom( Parse *pParse, /* The parser context */ Token *pTableName, /* The table from which we should delete things */ Expr *pWhere /* The WHERE clause. May be null */ ){ Vdbe *v; /* The virtual database engine */ Table *pTab; /* The table from which records will be deleted */ IdList *pTabList; /* An ID list holding pTab and nothing else */ int end, addr; /* A couple addresses of generated code */ int i; /* Loop counter */ WhereInfo *pWInfo; /* Information about the WHERE clause */ Index *pIdx; /* For looping over indices of the table */ int base; /* Index of the first available table cursor */ /* Locate the table which we want to update. This table has to be ** put in an IdList structure because some of the subroutines will ** will be calling are designed to work with multiple tables and expect ** an IdList* parameter instead of just a Table* parameger. */ pTabList = sqliteIdListAppend(0, pTableName); |
︙ | ︙ | |||
66 67 68 69 70 71 72 73 74 75 76 77 78 79 | } } pTab = pTabList->a[0].pTab; /* Resolve the field names in all the expressions. */ if( pWhere ){ if( sqliteExprResolveIds(pParse, pTabList, pWhere) ){ goto delete_from_cleanup; } if( sqliteExprCheck(pParse, pWhere, 0, 0) ){ goto delete_from_cleanup; } } | > | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | } } pTab = pTabList->a[0].pTab; /* Resolve the field names in all the expressions. */ if( pWhere ){ sqliteExprResolveInSelect(pParse, pWhere); if( sqliteExprResolveIds(pParse, pTabList, pWhere) ){ goto delete_from_cleanup; } if( sqliteExprCheck(pParse, pWhere, 0, 0) ){ goto delete_from_cleanup; } } |
︙ | ︙ | |||
98 99 100 101 102 103 104 105 | /* End the database scan loop. */ sqliteWhereEnd(pWInfo); /* Delete every item identified in the list. */ sqliteVdbeAddOp(v, OP_ListRewind, 0, 0, 0, 0); | > | | | | | | | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | /* End the database scan loop. */ sqliteWhereEnd(pWInfo); /* Delete every item identified in the list. */ base = pParse->nTab; sqliteVdbeAddOp(v, OP_ListRewind, 0, 0, 0, 0); sqliteVdbeAddOp(v, OP_Open, base, 1, pTab->zName, 0); for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){ sqliteVdbeAddOp(v, OP_Open, base+i, 1, pIdx->zName, 0); } end = sqliteVdbeMakeLabel(v); addr = sqliteVdbeAddOp(v, OP_ListRead, 0, end, 0, 0); if( pTab->pIndex ){ sqliteVdbeAddOp(v, OP_Dup, 0, 0, 0, 0); sqliteVdbeAddOp(v, OP_Fetch, base, 0, 0, 0); for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){ int j; sqliteVdbeAddOp(v, OP_Dup, 0, 0, 0, 0); for(j=0; j<pIdx->nField; j++){ sqliteVdbeAddOp(v, OP_Field, base, pIdx->aiField[j], 0, 0); } sqliteVdbeAddOp(v, OP_MakeKey, pIdx->nField, 0, 0, 0); sqliteVdbeAddOp(v, OP_DeleteIdx, base+i, 0, 0, 0); } } sqliteVdbeAddOp(v, OP_Delete, base, 0, 0, 0); sqliteVdbeAddOp(v, OP_Goto, 0, addr, 0, 0); sqliteVdbeAddOp(v, OP_ListClose, 0, 0, 0, end); delete_from_cleanup: sqliteIdListDelete(pTabList); sqliteExprDelete(pWhere); return; } |
Changes to src/expr.c.
︙ | ︙ | |||
19 20 21 22 23 24 25 | ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains C code routines used for processing expressions ** | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains C code routines used for processing expressions ** ** $Id: expr.c,v 1.9 2000/06/06 13:54:15 drh Exp $ */ #include "sqliteInt.h" /* ** Walk an expression tree. Return 1 if the expression is constant ** and 0 if it involves variables. */ |
︙ | ︙ | |||
47 48 49 50 51 52 53 54 55 56 57 58 59 60 | } } break; } } return 1; } /* ** This routine walks an expression tree and resolves references to ** table fields. Nodes of the form ID.ID or ID resolve into an ** index to the table in the table list and a field offset. The opcode ** for such nodes is changed to TK_FIELD. The iTable value is changed ** to the index of the referenced table in pTabList plus the pParse->nTab | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | } } break; } } return 1; } /* ** Walk the expression tree and process operators of the form: ** ** expr IN (SELECT ...) ** ** These operators have to be processed before field names are ** resolved because each such operator increments pParse->nTab ** to reserve a cursor number for its own use. But pParse->nTab ** needs to be constant once we begin resolving field names. ** ** Actually, the processing of IN-SELECT is only started by this ** routine. This routine allocates a cursor number to the IN-SELECT ** and then moves on. The code generation is done by ** sqliteExprResolveIds() which must be called afterwards. */ void sqliteExprResolveInSelect(Parse *pParse, Expr *pExpr){ if( pExpr==0 ) return; if( pExpr->op==TK_IN && pExpr->pSelect!=0 ){ pExpr->iTable = pParse->nTab++; }else{ if( pExpr->pLeft ) sqliteExprResolveInSelect(pParse, pExpr->pLeft); if( pExpr->pRight ) sqliteExprResolveInSelect(pParse, pExpr->pRight); if( pExpr->pList ){ int i; ExprList *pList = pExpr->pList; for(i=0; i<pList->nExpr; i++){ sqliteExprResolveInSelect(pParse, pList->a[i].pExpr); } } } } /* ** This routine walks an expression tree and resolves references to ** table fields. Nodes of the form ID.ID or ID resolve into an ** index to the table in the table list and a field offset. The opcode ** for such nodes is changed to TK_FIELD. The iTable value is changed ** to the index of the referenced table in pTabList plus the pParse->nTab |
︙ | ︙ | |||
182 183 184 185 186 187 188 | if( sqliteExprResolveIds(pParse, pTabList, pExpr->pLeft) ){ return 1; } if( pExpr->pSelect ){ /* Case 1: expr IN (SELECT ...) ** ** Generate code to write the results of the select into a temporary | | | < | < < < > > > | 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | if( sqliteExprResolveIds(pParse, pTabList, pExpr->pLeft) ){ return 1; } if( pExpr->pSelect ){ /* Case 1: expr IN (SELECT ...) ** ** Generate code to write the results of the select into a temporary ** table. The cursor number of the temporary table has already ** been put in iTable by sqliteExprResolveInSelect(). */ sqliteVdbeAddOp(v, OP_Open, pExpr->iTable, 1, 0, 0); if( sqliteSelect(pParse, pExpr->pSelect, SRT_Set, pExpr->iTable) ); }else if( pExpr->pList ){ /* Case 2: expr IN (exprlist) ** ** Create a set to put the exprlist values in. The Set id is stored ** in iTable. */ int i, iSet; for(i=0; i<pExpr->pList->nExpr; i++){ Expr *pE2 = pExpr->pList->a[i].pExpr; if( !isConstant(pE2) ){ sqliteSetString(&pParse->zErrMsg, "right-hand side of IN operator must be constant", 0); pParse->nErr++; return 1; } if( sqliteExprCheck(pParse, pE2, 0, 0) ){ return 1; } } iSet = pExpr->iTable = pParse->nSet++; for(i=0; i<pExpr->pList->nExpr; i++){ Expr *pE2 = pExpr->pList->a[i].pExpr; switch( pE2->op ){ case TK_FLOAT: |
︙ | ︙ | |||
244 245 246 247 248 249 250 | return 1; } break; } /* For all else, just recursively walk the tree */ default: { | | | | | 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 | return 1; } break; } /* For all else, just recursively walk the tree */ default: { if( pExpr->pLeft && sqliteExprResolveIds(pParse, pTabList, pExpr->pLeft) ){ return 1; } if( pExpr->pRight && sqliteExprResolveIds(pParse, pTabList, pExpr->pRight) ){ return 1; } if( pExpr->pList ){ int i; ExprList *pList = pExpr->pList; for(i=0; i<pList->nExpr; i++){ if( sqliteExprResolveIds(pParse, pTabList, pList->a[i].pExpr) ){ |
︙ | ︙ | |||
508 509 510 511 512 513 514 | } case TK_SELECT: { sqliteVdbeAddOp(v, OP_MemLoad, pExpr->iField, 0, 0, 0); break; } case TK_IN: { int addr; | | | | 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 | } case TK_SELECT: { sqliteVdbeAddOp(v, OP_MemLoad, pExpr->iField, 0, 0, 0); break; } case TK_IN: { int addr; sqliteVdbeAddOp(v, OP_Integer, 1, 0, 0, 0); sqliteExprCode(pParse, pExpr->pLeft); addr = sqliteVdbeCurrentAddr(v); if( pExpr->pSelect ){ sqliteVdbeAddOp(v, OP_Found, pExpr->iTable, addr+2, 0, 0); }else{ sqliteVdbeAddOp(v, OP_SetFound, pExpr->iTable, addr+2, 0, 0); } sqliteVdbeAddOp(v, OP_AddImm, -1, 0, 0, 0); break; } case TK_BETWEEN: { int lbl = sqliteVdbeMakeLabel(v); sqliteVdbeAddOp(v, OP_Integer, 0, 0, 0, 0); sqliteExprIfFalse(pParse, pExpr, lbl); sqliteVdbeAddOp(v, OP_AddImm, 1, 0, 0, 0); |
︙ | ︙ |
Changes to src/parse.y.
︙ | ︙ | |||
22 23 24 25 26 27 28 | ** ************************************************************************* ** This file contains SQLite's grammar for SQL. Process this file ** using the lemon parser generator to generate C code that runs ** the parser. Lemon will also generate a header file containing ** numeric codes for all of the tokens. ** | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | ** ************************************************************************* ** This file contains SQLite's grammar for SQL. Process this file ** using the lemon parser generator to generate C code that runs ** the parser. Lemon will also generate a header file containing ** numeric codes for all of the tokens. ** ** @(#) $Id: parse.y,v 1.12 2000/06/06 13:54:15 drh Exp $ */ %token_prefix TK_ %token_type {Token} %extra_argument {Parse *pParse} %syntax_error { sqliteSetNString(&pParse->zErrMsg,"syntax error near \"",0,TOKEN.z,TOKEN.n, "\"", 1, 0); |
︙ | ︙ | |||
104 105 106 107 108 109 110 | // In addition to the type name, we also care about the primary key. // ccons ::= NOT NULL. ccons ::= PRIMARY KEY sortorder. {sqliteCreateIndex(pParse,0,0,0,0,0);} ccons ::= UNIQUE. | | | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | // In addition to the type name, we also care about the primary key. // ccons ::= NOT NULL. ccons ::= PRIMARY KEY sortorder. {sqliteCreateIndex(pParse,0,0,0,0,0);} ccons ::= UNIQUE. ccons ::= CHECK LP expr RP. // For the time being, the only constraint we care about is the primary // key. // conslist_opt ::= . conslist_opt ::= COMMA conslist. conslist ::= conslist COMMA tcons. |
︙ | ︙ | |||
297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 | expr(A) ::= expr(X) LT expr(Y). {A = sqliteExpr(TK_LT, X, Y, 0);} expr(A) ::= expr(X) GT expr(Y). {A = sqliteExpr(TK_GT, X, Y, 0);} expr(A) ::= expr(X) LE expr(Y). {A = sqliteExpr(TK_LE, X, Y, 0);} expr(A) ::= expr(X) GE expr(Y). {A = sqliteExpr(TK_GE, X, Y, 0);} expr(A) ::= expr(X) NE expr(Y). {A = sqliteExpr(TK_NE, X, Y, 0);} expr(A) ::= expr(X) EQ expr(Y). {A = sqliteExpr(TK_EQ, X, Y, 0);} expr(A) ::= expr(X) LIKE expr(Y). {A = sqliteExpr(TK_LIKE, X, Y, 0);} expr(A) ::= expr(X) GLOB expr(Y). {A = sqliteExpr(TK_GLOB,X,Y,0);} expr(A) ::= expr(X) PLUS expr(Y). {A = sqliteExpr(TK_PLUS, X, Y, 0);} expr(A) ::= expr(X) MINUS expr(Y). {A = sqliteExpr(TK_MINUS, X, Y, 0);} expr(A) ::= expr(X) STAR expr(Y). {A = sqliteExpr(TK_STAR, X, Y, 0);} expr(A) ::= expr(X) SLASH expr(Y). {A = sqliteExpr(TK_SLASH, X, Y, 0);} expr(A) ::= expr(X) ISNULL. {A = sqliteExpr(TK_ISNULL, X, 0, 0);} expr(A) ::= expr(X) NOTNULL. {A = sqliteExpr(TK_NOTNULL, X, 0, 0);} expr(A) ::= NOT expr(X). {A = sqliteExpr(TK_NOT, X, 0, 0);} expr(A) ::= MINUS expr(X). [UMINUS] {A = sqliteExpr(TK_UMINUS, X, 0, 0);} expr(A) ::= PLUS expr(X). [UMINUS] {A = X;} expr(A) ::= LP select(X) RP. { A = sqliteExpr(TK_SELECT, 0, 0, 0); A->pSelect = X; } expr(A) ::= expr(W) BETWEEN expr(X) AND expr(Y). { ExprList *pList = sqliteExprListAppend(0, X, 0); pList = sqliteExprListAppend(pList, Y, 0); A = sqliteExpr(TK_BETWEEN, W, 0, 0); A->pList = pList; } expr(A) ::= expr(X) IN LP exprlist(Y) RP. { A = sqliteExpr(TK_IN, X, 0, 0); A->pList = Y; } expr(A) ::= expr(X) IN LP select(Y) RP. { A = sqliteExpr(TK_IN, X, 0, 0); A->pSelect = Y; } %type exprlist {ExprList*} %destructor exprlist {sqliteExprListDelete($$);} %type expritem {Expr*} | > > > > > > > > > > > > > > > > > > > > > > > > > | 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 | expr(A) ::= expr(X) LT expr(Y). {A = sqliteExpr(TK_LT, X, Y, 0);} expr(A) ::= expr(X) GT expr(Y). {A = sqliteExpr(TK_GT, X, Y, 0);} expr(A) ::= expr(X) LE expr(Y). {A = sqliteExpr(TK_LE, X, Y, 0);} expr(A) ::= expr(X) GE expr(Y). {A = sqliteExpr(TK_GE, X, Y, 0);} expr(A) ::= expr(X) NE expr(Y). {A = sqliteExpr(TK_NE, X, Y, 0);} expr(A) ::= expr(X) EQ expr(Y). {A = sqliteExpr(TK_EQ, X, Y, 0);} expr(A) ::= expr(X) LIKE expr(Y). {A = sqliteExpr(TK_LIKE, X, Y, 0);} expr(A) ::= expr(X) NOT LIKE expr(Y). { A = sqliteExpr(TK_LIKE, X, Y, 0); A = sqliteExpr(TK_NOT, A, 0, 0); } expr(A) ::= expr(X) GLOB expr(Y). {A = sqliteExpr(TK_GLOB,X,Y,0);} expr(A) ::= expr(X) NOT GLOB expr(Y). { A = sqliteExpr(TK_GLOB, X, Y, 0); A = sqliteExpr(TK_NOT, A, 0, 0); } expr(A) ::= expr(X) PLUS expr(Y). {A = sqliteExpr(TK_PLUS, X, Y, 0);} expr(A) ::= expr(X) MINUS expr(Y). {A = sqliteExpr(TK_MINUS, X, Y, 0);} expr(A) ::= expr(X) STAR expr(Y). {A = sqliteExpr(TK_STAR, X, Y, 0);} expr(A) ::= expr(X) SLASH expr(Y). {A = sqliteExpr(TK_SLASH, X, Y, 0);} expr(A) ::= expr(X) ISNULL. {A = sqliteExpr(TK_ISNULL, X, 0, 0);} expr(A) ::= expr(X) NOTNULL. {A = sqliteExpr(TK_NOTNULL, X, 0, 0);} expr(A) ::= NOT expr(X). {A = sqliteExpr(TK_NOT, X, 0, 0);} expr(A) ::= MINUS expr(X). [UMINUS] {A = sqliteExpr(TK_UMINUS, X, 0, 0);} expr(A) ::= PLUS expr(X). [UMINUS] {A = X;} expr(A) ::= LP select(X) RP. { A = sqliteExpr(TK_SELECT, 0, 0, 0); A->pSelect = X; } expr(A) ::= expr(W) BETWEEN expr(X) AND expr(Y). { ExprList *pList = sqliteExprListAppend(0, X, 0); pList = sqliteExprListAppend(pList, Y, 0); A = sqliteExpr(TK_BETWEEN, W, 0, 0); A->pList = pList; } expr(A) ::= expr(W) NOT BETWEEN expr(X) AND expr(Y). { ExprList *pList = sqliteExprListAppend(0, X, 0); pList = sqliteExprListAppend(pList, Y, 0); A = sqliteExpr(TK_BETWEEN, W, 0, 0); A->pList = pList; A = sqliteExpr(TK_NOT, A, 0, 0); } expr(A) ::= expr(X) IN LP exprlist(Y) RP. { A = sqliteExpr(TK_IN, X, 0, 0); A->pList = Y; } expr(A) ::= expr(X) IN LP select(Y) RP. { A = sqliteExpr(TK_IN, X, 0, 0); A->pSelect = Y; } expr(A) ::= expr(X) NOT IN LP exprlist(Y) RP. { A = sqliteExpr(TK_IN, X, 0, 0); A->pList = Y; A = sqliteExpr(TK_NOT, A, 0, 0); } expr(A) ::= expr(X) NOT IN LP select(Y) RP. { A = sqliteExpr(TK_IN, X, 0, 0); A->pSelect = Y; A = sqliteExpr(TK_NOT, A, 0, 0); } %type exprlist {ExprList*} %destructor exprlist {sqliteExprListDelete($$);} %type expritem {Expr*} |
︙ | ︙ |
Changes to src/select.c.
︙ | ︙ | |||
20 21 22 23 24 25 26 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements. ** | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements. ** ** $Id: select.c,v 1.10 2000/06/06 13:54:15 drh Exp $ */ #include "sqliteInt.h" /* ** Allocate a new Select structure and return a pointer to that ** structure. |
︙ | ︙ | |||
161 162 163 164 165 166 167 168 169 170 171 172 173 174 | "a SELECT that is part of an expression", 0); pParse->nErr++; return 1; } /* Resolve the field names and do a semantics check on all the expressions. */ for(i=0; i<pEList->nExpr; i++){ if( sqliteExprResolveIds(pParse, pTabList, pEList->a[i].pExpr) ){ return 1; } if( sqliteExprCheck(pParse, pEList->a[i].pExpr, 1, &pEList->a[i].isAgg) ){ return 1; } | > > > > > > > > > | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | "a SELECT that is part of an expression", 0); pParse->nErr++; return 1; } /* Resolve the field names and do a semantics check on all the expressions. */ for(i=0; i<pEList->nExpr; i++){ sqliteExprResolveInSelect(pParse, pEList->a[i].pExpr); } if( pWhere ) sqliteExprResolveInSelect(pParse, pWhere); if( pOrderBy ){ for(i=0; i<pOrderBy->nExpr; i++){ sqliteExprResolveInSelect(pParse, pOrderBy->a[i].pExpr); } } for(i=0; i<pEList->nExpr; i++){ if( sqliteExprResolveIds(pParse, pTabList, pEList->a[i].pExpr) ){ return 1; } if( sqliteExprCheck(pParse, pEList->a[i].pExpr, 1, &pEList->a[i].isAgg) ){ return 1; } |
︙ | ︙ |
Changes to src/sqliteInt.h.
︙ | ︙ | |||
19 20 21 22 23 24 25 | ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** Internal interface definitions for SQLite. ** | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** Internal interface definitions for SQLite. ** ** @(#) $Id: sqliteInt.h,v 1.17 2000/06/06 13:54:15 drh Exp $ */ #include "sqlite.h" #include "dbbe.h" #include "vdbe.h" #include "parse.h" #include <gdbm.h> #include <stdio.h> |
︙ | ︙ | |||
310 311 312 313 314 315 316 | void sqliteVacuum(Parse*, Token*); int sqliteGlobCompare(const char*,const char*); int sqliteLikeCompare(const unsigned char*,const unsigned char*); char *sqliteTableNameFromToken(Token*); int sqliteExprCheck(Parse*, Expr*, int, int*); int sqliteFuncId(Token*); int sqliteExprResolveIds(Parse*, IdList*, Expr*); | > | 310 311 312 313 314 315 316 317 | void sqliteVacuum(Parse*, Token*); int sqliteGlobCompare(const char*,const char*); int sqliteLikeCompare(const unsigned char*,const unsigned char*); char *sqliteTableNameFromToken(Token*); int sqliteExprCheck(Parse*, Expr*, int, int*); int sqliteFuncId(Token*); int sqliteExprResolveIds(Parse*, IdList*, Expr*); void sqliteExprResolveInSelect(Parse*, Expr*); |
Changes to src/update.c.
︙ | ︙ | |||
20 21 22 23 24 25 26 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle UPDATE statements. ** | | > | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle UPDATE statements. ** ** $Id: update.c,v 1.4 2000/06/06 13:54:16 drh Exp $ */ #include "sqliteInt.h" /* ** Process an UPDATE statement. */ void sqliteUpdate( Parse *pParse, /* The parser context */ Token *pTableName, /* The table in which we should change things */ ExprList *pChanges, /* Things to be changed */ Expr *pWhere /* The WHERE clause. May be null */ ){ int i, j; /* Loop counters */ Table *pTab; /* The table to be updated */ IdList *pTabList = 0; /* List containing only pTab */ int end, addr; /* A couple of addresses in the generated code */ WhereInfo *pWInfo; /* Information about the WHERE clause */ Vdbe *v; /* The virtual database engine */ Index *pIdx; /* For looping over indices */ int nIdx; /* Number of indices that need updating */ int base; /* Index of first available table cursor */ Index **apIdx = 0; /* An array of indices that need updating too */ int *aXRef = 0; /* aXRef[i] is the index in pChanges->a[] of the ** an expression for the i-th field of the table. ** aXRef[i]==-1 if the i-th field is not changed. */ /* Locate the table which we want to update. This table has to be ** put in an IdList structure because some of the subroutines will |
︙ | ︙ | |||
76 77 78 79 80 81 82 83 84 85 86 87 88 89 | if( aXRef==0 ) goto update_cleanup; for(i=0; i<pTab->nCol; i++) aXRef[i] = -1; /* Resolve the field names in all the expressions in both the ** WHERE clause and in the new values. Also find the field index ** for each field to be updated in the pChanges array. */ if( pWhere ){ if( sqliteExprResolveIds(pParse, pTabList, pWhere) ){ goto update_cleanup; } if( sqliteExprCheck(pParse, pWhere, 0, 0) ){ goto update_cleanup; } | > > > > > > | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | if( aXRef==0 ) goto update_cleanup; for(i=0; i<pTab->nCol; i++) aXRef[i] = -1; /* Resolve the field names in all the expressions in both the ** WHERE clause and in the new values. Also find the field index ** for each field to be updated in the pChanges array. */ if( pWhere ){ sqliteExprResolveInSelect(pParse, pWhere); } for(i=0; i<pChanges->nExpr; i++){ sqliteExprResolveInSelect(pParse, pChanges->a[i].pExpr); } if( pWhere ){ if( sqliteExprResolveIds(pParse, pTabList, pWhere) ){ goto update_cleanup; } if( sqliteExprCheck(pParse, pWhere, 0, 0) ){ goto update_cleanup; } |
︙ | ︙ | |||
151 152 153 154 155 156 157 | */ sqliteWhereEnd(pWInfo); /* Rewind the list of records that need to be updated and ** open every index that needs updating. */ sqliteVdbeAddOp(v, OP_ListRewind, 0, 0, 0, 0); | > | | | | | | | | | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 | */ sqliteWhereEnd(pWInfo); /* Rewind the list of records that need to be updated and ** open every index that needs updating. */ sqliteVdbeAddOp(v, OP_ListRewind, 0, 0, 0, 0); base = pParse->nTab; sqliteVdbeAddOp(v, OP_Open, base, 1, pTab->zName, 0); for(i=0; i<nIdx; i++){ sqliteVdbeAddOp(v, OP_Open, base+i+1, 1, apIdx[i]->zName, 0); } /* Loop over every record that needs updating. We have to load ** the old data for each record to be updated because some fields ** might not change and we will need to copy the old value, therefore. ** Also, the old data is needed to delete the old index entires. */ end = sqliteVdbeMakeLabel(v); addr = sqliteVdbeAddOp(v, OP_ListRead, 0, end, 0, 0); sqliteVdbeAddOp(v, OP_Dup, 0, 0, 0, 0); sqliteVdbeAddOp(v, OP_Fetch, base, 0, 0, 0); /* Delete the old indices for the current record. */ for(i=0; i<nIdx; i++){ sqliteVdbeAddOp(v, OP_Dup, 0, 0, 0, 0); pIdx = apIdx[i]; for(j=0; j<pIdx->nField; j++){ sqliteVdbeAddOp(v, OP_Field, base, pIdx->aiField[j], 0, 0); } sqliteVdbeAddOp(v, OP_MakeKey, pIdx->nField, 0, 0, 0); sqliteVdbeAddOp(v, OP_DeleteIdx, base+i+1, 0, 0, 0); } /* Compute a completely new data for this record. */ for(i=0; i<pTab->nCol; i++){ j = aXRef[i]; if( j<0 ){ sqliteVdbeAddOp(v, OP_Field, base, i, 0, 0); }else{ sqliteExprCode(pParse, pChanges->a[j].pExpr); } } /* Insert new index entries that correspond to the new data */ for(i=0; i<nIdx; i++){ sqliteVdbeAddOp(v, OP_Dup, pTab->nCol, 0, 0, 0); /* The KEY */ pIdx = apIdx[i]; for(j=0; j<pIdx->nField; j++){ sqliteVdbeAddOp(v, OP_Dup, j+pTab->nCol-pIdx->aiField[j], 0, 0, 0); } sqliteVdbeAddOp(v, OP_MakeKey, pIdx->nField, 0, 0, 0); sqliteVdbeAddOp(v, OP_PutIdx, base+i+1, 0, 0, 0); } /* Write the new data back into the database. */ sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0, 0, 0); sqliteVdbeAddOp(v, OP_Put, base, 0, 0, 0); /* Repeat the above with the next record to be updated, until ** all record selected by the WHERE clause have been updated. */ sqliteVdbeAddOp(v, OP_Goto, 0, addr, 0, 0); sqliteVdbeAddOp(v, OP_ListClose, 0, 0, 0, end); |
︙ | ︙ |
Changes to src/vdbe.c.
︙ | ︙ | |||
37 38 39 40 41 42 43 | ** inplicit conversion from one type to the other occurs as necessary. ** ** Most of the code in this file is taken up by the sqliteVdbeExec() ** function which does the work of interpreting a VDBE program. ** But other routines are also provided to help in building up ** a program instruction by instruction. ** | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | ** inplicit conversion from one type to the other occurs as necessary. ** ** Most of the code in this file is taken up by the sqliteVdbeExec() ** function which does the work of interpreting a VDBE program. ** But other routines are also provided to help in building up ** a program instruction by instruction. ** ** $Id: vdbe.c,v 1.20 2000/06/06 13:54:16 drh Exp $ */ #include "sqliteInt.h" #include <unistd.h> /* ** SQL is translated into a sequence of instructions to be ** executed by a virtual machine. Each instruction is an instance |
︙ | ︙ | |||
791 792 793 794 795 796 797 | if( xCallback==0 ) return 0; azField[0] = zAddr; azField[2] = zP1; azField[3] = zP2; azField[5] = 0; rc = SQLITE_OK; | | | 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 | if( xCallback==0 ) return 0; azField[0] = zAddr; azField[2] = zP1; azField[3] = zP2; azField[5] = 0; rc = SQLITE_OK; /* if( pzErrMsg ){ *pzErrMsg = 0; } */ for(i=0; rc==SQLITE_OK && i<p->nOp; i++){ sprintf(zAddr,"%d",i); sprintf(zP1,"%d", p->aOp[i].p1); sprintf(zP2,"%d", p->aOp[i].p2); azField[4] = p->aOp[i].p3; azField[1] = zOpName[p->aOp[i].opcode]; if( xCallback(pArg, 5, azField, azColumnNames) ){ |
︙ | ︙ | |||
874 875 876 877 878 879 880 | p->tos = -1; rc = SQLITE_OK; #ifdef MEMORY_DEBUG if( access("vdbe_trace",0)==0 ){ p->trace = stderr; } #endif | | | 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 | p->tos = -1; rc = SQLITE_OK; #ifdef MEMORY_DEBUG if( access("vdbe_trace",0)==0 ){ p->trace = stderr; } #endif /* if( pzErrMsg ){ *pzErrMsg = 0; } */ for(pc=0; rc==SQLITE_OK && pc<p->nOp && pc>=0; pc++){ pOp = &p->aOp[pc]; if( p->trace ){ fprintf(p->trace,"%4d %-12s %4d %4d %s\n", pc, zOpName[pOp->opcode], pOp->p1, pOp->p2, pOp->p3 ? pOp->p3 : ""); } |
︙ | ︙ |
Changes to src/where.c.
︙ | ︙ | |||
21 22 23 24 25 26 27 | ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This module contains C code that generates VDBE code used to process ** the WHERE clause of SQL statements. Also found here are subroutines ** to generate VDBE code to evaluate expressions. ** | | | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This module contains C code that generates VDBE code used to process ** the WHERE clause of SQL statements. Also found here are subroutines ** to generate VDBE code to evaluate expressions. ** ** $Id: where.c,v 1.7 2000/06/06 13:54:16 drh Exp $ */ #include "sqliteInt.h" /* ** The query generator uses an array of instances of this structure to ** help it analyze the subexpressions of the WHERE clause. Each WHERE ** clause subexpression is separated from the others by an AND operator. |
︙ | ︙ | |||
344 345 346 347 348 349 350 | sqliteExprIfFalse(pParse, aExpr[j].p, cont); aExpr[j].p = 0; } brk = cont; } pWInfo->iContinue = cont; if( pushKey && !haveKey ){ | | | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 | sqliteExprIfFalse(pParse, aExpr[j].p, cont); aExpr[j].p = 0; } brk = cont; } pWInfo->iContinue = cont; if( pushKey && !haveKey ){ sqliteVdbeAddOp(v, OP_Key, base, 0, 0, 0); } sqliteFree(aOrder); return pWInfo; } /* ** Generate the end of the WHERE loop. |
︙ | ︙ |
Changes to test/expr.test.
︙ | ︙ | |||
19 20 21 22 23 24 25 | # drh@hwaci.com # http://www.hwaci.com/drh/ # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing expressions. # | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | # drh@hwaci.com # http://www.hwaci.com/drh/ # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing expressions. # # $Id: expr.test,v 1.5 2000/06/06 13:54:16 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Create a table to work with. # execsql {CREATE TABLE test1(i1 int, i2 int, r1 real, r2 real, t1 text, t2 text)} |
︙ | ︙ | |||
139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | test_expr expr-5.2 {t1='abc', t2='ABC'} {t1 LIKE t2} 1 test_expr expr-5.3 {t1='abc', t2='A_C'} {t1 LIKE t2} 1 test_expr expr-5.4 {t1='abc', t2='abc_'} {t1 LIKE t2} 0 test_expr expr-5.5 {t1='abc', t2='A%C'} {t1 LIKE t2} 1 test_expr expr-5.6 {t1='abxyzzyc', t2='A%C'} {t1 LIKE t2} 1 test_expr expr-5.7 {t1='abxyzzy', t2='A%C'} {t1 LIKE t2} 0 test_expr expr-5.8 {t1='abxyzzycx', t2='A%C'} {t1 LIKE t2} 0 test_expr expr-6.1 {t1='abc', t2='xyz'} {t1 GLOB t2} 0 test_expr expr-6.2 {t1='abc', t2='ABC'} {t1 GLOB t2} 0 test_expr expr-6.3 {t1='abc', t2='A?C'} {t1 GLOB t2} 0 test_expr expr-6.4 {t1='abc', t2='a?c'} {t1 GLOB t2} 1 test_expr expr-6.5 {t1='abc', t2='abc?'} {t1 GLOB t2} 0 test_expr expr-6.6 {t1='abc', t2='A*C'} {t1 GLOB t2} 0 test_expr expr-6.7 {t1='abc', t2='a*c'} {t1 GLOB t2} 1 test_expr expr-6.8 {t1='abxyzzyc', t2='a*c'} {t1 GLOB t2} 1 test_expr expr-6.9 {t1='abxyzzy', t2='a*c'} {t1 GLOB t2} 0 test_expr expr-6.10 {t1='abxyzzycx', t2='a*c'} {t1 GLOB t2} 0 | > > | > | 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | test_expr expr-5.2 {t1='abc', t2='ABC'} {t1 LIKE t2} 1 test_expr expr-5.3 {t1='abc', t2='A_C'} {t1 LIKE t2} 1 test_expr expr-5.4 {t1='abc', t2='abc_'} {t1 LIKE t2} 0 test_expr expr-5.5 {t1='abc', t2='A%C'} {t1 LIKE t2} 1 test_expr expr-5.6 {t1='abxyzzyc', t2='A%C'} {t1 LIKE t2} 1 test_expr expr-5.7 {t1='abxyzzy', t2='A%C'} {t1 LIKE t2} 0 test_expr expr-5.8 {t1='abxyzzycx', t2='A%C'} {t1 LIKE t2} 0 test_expr expr-5.9 {t1='abc', t2='xyz'} {t1 NOT LIKE t2} 1 test_expr expr-5.10 {t1='abc', t2='ABC'} {t1 NOT LIKE t2} 0 test_expr expr-6.1 {t1='abc', t2='xyz'} {t1 GLOB t2} 0 test_expr expr-6.2 {t1='abc', t2='ABC'} {t1 GLOB t2} 0 test_expr expr-6.3 {t1='abc', t2='A?C'} {t1 GLOB t2} 0 test_expr expr-6.4 {t1='abc', t2='a?c'} {t1 GLOB t2} 1 test_expr expr-6.5 {t1='abc', t2='abc?'} {t1 GLOB t2} 0 test_expr expr-6.6 {t1='abc', t2='A*C'} {t1 GLOB t2} 0 test_expr expr-6.7 {t1='abc', t2='a*c'} {t1 GLOB t2} 1 test_expr expr-6.8 {t1='abxyzzyc', t2='a*c'} {t1 GLOB t2} 1 test_expr expr-6.9 {t1='abxyzzy', t2='a*c'} {t1 GLOB t2} 0 test_expr expr-6.10 {t1='abxyzzycx', t2='a*c'} {t1 GLOB t2} 0 test_expr expr-6.11 {t1='abc', t2='xyz'} {t1 NOT GLOB t2} 1 test_expr expr-6.12 {t1='abc', t2='a?c'} {t1 NOT GLOB t2} 0 # The sqliteExprIfFalse and sqliteExprIfTrue routines are only # executed as part of a WHERE clause. Create a table suitable # for testing these functions. # execsql {DROP TABLE test1} execsql {CREATE TABLE test1(a int, b int);} |
︙ | ︙ |
Added test/in.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | # Copyright (c) 1999, 2000 D. Richard Hipp # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public # License as published by the Free Software Foundation; either # version 2 of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public # License along with this library; if not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # # Author contact information: # drh@hwaci.com # http://www.hwaci.com/drh/ # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing the IN and BETWEEN operator. # # $Id: in.test,v 1.1 2000/06/06 13:54:16 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Generate the test data we will need for the first squences of tests. # do_test in-1.0 { set fd [open data1.txt w] for {set i 1} {$i<=10} {incr i} { puts $fd "$i\t[expr {int(pow(2,$i))}]" } close $fd execsql { CREATE TABLE t1(a int, b int); COPY t1 FROM 'data1.txt'; } file delete -force data1.txt execsql {SELECT count(*) FROM t1} } {10} # Do basic testing of BETWEEN. # do_test in-1.1 { execsql {SELECT a FROM t1 WHERE b BETWEEN 10 AND 50 ORDER BY a} } {4 5} do_test in-1.2 { execsql {SELECT a FROM t1 WHERE b NOT BETWEEN 10 AND 50 ORDER BY a} } {1 2 3 6 7 8 9 10} do_test in-1.3 { execsql {SELECT a FROM t1 WHERE b BETWEEN a AND a*5 ORDER BY a} } {1 2 3 4} do_test in-1.4 { execsql {SELECT a FROM t1 WHERE b NOT BETWEEN a AND a*5 ORDER BY a} } {5 6 7 8 9 10} do_test in-1.6 { execsql {SELECT a FROM t1 WHERE b BETWEEN a AND a*5 OR b=512 ORDER BY a} } {1 2 3 4 9} do_test in-1.7 { execsql {SELECT a+ 100*(a BETWEEN 1 and 3) FROM t1 ORDER BY b} } {101 102 103 4 5 6 7 8 9 10} # Testing of the IN operator using static lists on the right-hand side. # do_test in-2.1 { execsql {SELECT a FROM t1 WHERE b IN (8,12,16,24,32) ORDER BY a} } {3 4 5} do_test in-2.2 { execsql {SELECT a FROM t1 WHERE b NOT IN (8,12,16,24,32) ORDER BY a} } {1 2 6 7 8 9 10} do_test in-2.3 { execsql {SELECT a FROM t1 WHERE b IN (8,12,16,24,32) OR b=512 ORDER BY a} } {3 4 5 9} do_test in-2.4 { execsql {SELECT a FROM t1 WHERE b NOT IN (8,12,16,24,32) OR b=512 ORDER BY a} } {1 2 6 7 8 9 10} do_test in-2.5 { execsql {SELECT a+100*(b IN (8,16,24)) FROM t1 ORDER BY b} } {1 2 103 104 5 6 7 8 9 10} do_test in-2.6 { set v [catch {execsql {SELECT a FROM t1 WHERE b IN (b+10,20)}} msg] lappend v $msg } {1 {right-hand side of IN operator must be constant}} do_test in-2.7 { set v [catch {execsql {SELECT a FROM t1 WHERE b IN (max(5,10,b),20)}} msg] lappend v $msg } {1 {right-hand side of IN operator must be constant}} do_test in-2.8 { execsql {SELECT a FROM t1 WHERE b IN (8*2,64/2) ORDER BY b} } {4 5} do_test in-2.9 { set v [catch {execsql {SELECT a FROM t1 WHERE b IN (xyz(5,10),20)}} msg] lappend v $msg } {1 {no such function: xyz}} do_test in-2.10 { set v [catch {execsql {SELECT a FROM t1 WHERE min(0,b IN (a,30))}} msg] lappend v $msg } {1 {right-hand side of IN operator must be constant}} do_test in-2.11 { set v [catch {execsql {SELECT a FROM t1 WHERE c IN (10,20)}} msg] lappend v $msg } {1 {no such field: c}} # Testing the IN operator where the right-hand side is a SELECT # do_test in-3.1 { execsql { SELECT a FROM t1 WHERE b IN (SELECT b FROM t1 WHERE a<5) ORDER BY a } } {1 2 3 4} do_test in-3.2 { execsql { SELECT a FROM t1 WHERE b IN (SELECT b FROM t1 WHERE a<5) OR b==512 ORDER BY a } } {1 2 3 4 9} do_test in-3.3 { execsql { SELECT a + 100*(b IN (SELECT b FROM t1 WHERE a<5)) FROM t1 ORDER BY b } } {101 102 103 104 5 6 7 8 9 10} # Make sure the UPDATE and DELETE commands work with IN-SELECT # do_test in-4.1 { execsql { UPDATE t1 SET b=b*2 WHERE b IN (SELECT b FROM t1 WHERE a>8) } execsql {SELECT b FROM t1 ORDER BY b} } {2 4 8 16 32 64 128 256 1024 2048} do_test in-4.2 { execsql { DELETE FROM t1 WHERE b IN (SELECT b FROM t1 WHERE a>8) } execsql {SELECT a FROM t1 ORDER BY a} } {1 2 3 4 5 6 7 8} finish_test |