Overview
Comment: | 2.0.3 (CVS 287) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 75e90cf09b64ee1fcb39a711fc9ac6d3d2b849a5 |
User & Date: | drh 2001-10-13 02:59:09 |
Context
2001-10-13
| ||
03:00 | Version 2.0.3 (CVS 467) check-in: a8fee23f user: drh tags: trunk | |
02:59 | 2.0.3 (CVS 287) check-in: 75e90cf0 user: drh tags: trunk | |
01:06 | Remove the P3 and label arguments from the internal sqliteVdbeAddOp() function. This makes the code easier to read and perhaps smaller as well. (CVS 286) check-in: 288ef124 user: drh tags: trunk | |
Changes
Changes to VERSION.
1 |
2.0.2
|
| |
1 |
2.0.3
|
Changes to src/build.c.
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
....
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
|
** COPY ** VACUUM ** BEGIN TRANSACTION ** COMMIT ** ROLLBACK ** PRAGMA ** ** $Id: build.c,v 1.48 2001/10/13 01:06:48 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> /* ** This routine is called after a single SQL statement has been ** parsed and we want to execute the VDBE code to implement ................................................................................ int n = pList->nExpr + 8; pList->a = sqliteRealloc(pList->a, n*sizeof(pList->a[0])); if( pList->a==0 ){ pList->nExpr = 0; return pList; } } i = pList->nExpr++; pList->a[i].pExpr = pExpr; pList->a[i].zName = 0; if( pName ){ sqliteSetNString(&pList->a[i].zName, pName->z, pName->n, 0); sqliteDequote(pList->a[i].zName); } return pList; } /* ** Delete an entire expression list. */ |
|
>
|
|
|
|
|
|
>
|
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
....
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
|
** COPY ** VACUUM ** BEGIN TRANSACTION ** COMMIT ** ROLLBACK ** PRAGMA ** ** $Id: build.c,v 1.49 2001/10/13 02:59:09 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> /* ** This routine is called after a single SQL statement has been ** parsed and we want to execute the VDBE code to implement ................................................................................ int n = pList->nExpr + 8; pList->a = sqliteRealloc(pList->a, n*sizeof(pList->a[0])); if( pList->a==0 ){ pList->nExpr = 0; return pList; } } if( pExpr ){ i = pList->nExpr++; pList->a[i].pExpr = pExpr; pList->a[i].zName = 0; if( pName ){ sqliteSetNString(&pList->a[i].zName, pName->z, pName->n, 0); sqliteDequote(pList->a[i].zName); } } return pList; } /* ** Delete an entire expression list. */ |
Changes to src/expr.c.
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 ... 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 ... 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 ... 492 493 494 495 496 497 498 499 500 501 502 503 504 505 ... 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 ... 576 577 578 579 580 581 582 583 584 585 586 587 588 589 ... 620 621 622 623 624 625 626 627 628 629 630 631 632 633 |
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** ** $Id: expr.c,v 1.30 2001/10/13 01:06:48 drh Exp $ */ #include "sqliteInt.h" /* ** Walk an expression tree. Return 1 if the expression is constant ** and 0 if it involves variables. */ ................................................................................ */ int sqliteFuncId(Token *pToken){ static const struct { char *zName; int len; int id; } aFunc[] = { { "count", 5, FN_Count }, { "min", 3, FN_Min }, { "max", 3, FN_Max }, { "sum", 3, FN_Sum }, { "avg", 3, FN_Avg }, { "fcnt", 4, FN_Fcnt }, /* Used for testing only */ { "length", 6, FN_Length}, { "substr", 6, FN_Substr}, }; int i; for(i=0; i<ArraySize(aFunc); i++){ if( aFunc[i].len==pToken->n && sqliteStrNICmp(pToken->z, aFunc[i].zName, aFunc[i].len)==0 ){ return aFunc[i].id; } ................................................................................ case FN_Sum: { no_such_func = !allowAgg; too_many_args = n>1; too_few_args = n<1; is_agg = 1; break; } case FN_Length: { too_few_args = n<1; too_many_args = n>1; break; } case FN_Substr: { too_few_args = n<3; too_many_args = n>3; break; } /* The "fcnt(*)" function always returns the number of fetch ** operations that have occurred so far while processing the ** SQL statement. This information can be used by test procedures ** to verify that indices are being used properly to minimize ** searching. All arguments to fcnt() are ignored. fcnt() has ** no use (other than testing) that we are aware of. */ case FN_Fcnt: { ................................................................................ case TK_EQ: op = OP_Eq; break; case TK_LIKE: op = OP_Like; break; case TK_GLOB: op = OP_Glob; break; case TK_ISNULL: op = OP_IsNull; break; case TK_NOTNULL: op = OP_NotNull; break; case TK_NOT: op = OP_Not; break; case TK_UMINUS: op = OP_Negative; break; default: break; } switch( pExpr->op ){ case TK_COLUMN: { if( pParse->useAgg ){ sqliteVdbeAddOp(v, OP_AggGet, 0, pExpr->iAgg); }else if( pExpr->iColumn>=0 ){ ................................................................................ break; } case TK_AND: case TK_OR: case TK_PLUS: case TK_STAR: case TK_MINUS: case TK_SLASH: { sqliteExprCode(pParse, pExpr->pLeft); sqliteExprCode(pParse, pExpr->pRight); sqliteVdbeAddOp(v, op, 0, 0); break; } case TK_CONCAT: { sqliteExprCode(pParse, pExpr->pLeft); sqliteExprCode(pParse, pExpr->pRight); sqliteVdbeAddOp(v, OP_Concat, 2, 0); break; } ................................................................................ sqliteVdbeAddOp(v, OP_String, 0, 0); sqliteVdbeChangeP3(v, -1, z, p->n+1); sqliteFree(z); break; } /* Fall through into TK_NOT */ } case TK_NOT: { sqliteExprCode(pParse, pExpr->pLeft); sqliteVdbeAddOp(v, op, 0, 0); break; } case TK_ISNULL: case TK_NOTNULL: { ................................................................................ for(i=0; i<pList->nExpr; i++){ sqliteExprCode(pParse, pList->a[i].pExpr); if( i>0 ){ sqliteVdbeAddOp(v, op, 0, 0); } } break; } case FN_Length: { sqliteExprCode(pParse, pList->a[0].pExpr); sqliteVdbeAddOp(v, OP_Strlen, 0, 0); break; } case FN_Substr: { |
| | | | | | | | | > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 ... 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 ... 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 ... 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 ... 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 ... 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 ... 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 |
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** ** $Id: expr.c,v 1.31 2001/10/13 02:59:09 drh Exp $ */ #include "sqliteInt.h" /* ** Walk an expression tree. Return 1 if the expression is constant ** and 0 if it involves variables. */ ................................................................................ */ int sqliteFuncId(Token *pToken){ static const struct { char *zName; int len; int id; } aFunc[] = { { "count", 5, FN_Count }, { "min", 3, FN_Min }, { "max", 3, FN_Max }, { "sum", 3, FN_Sum }, { "avg", 3, FN_Avg }, { "fcnt", 4, FN_Fcnt }, /* Used for testing only */ { "length", 6, FN_Length }, { "substr", 6, FN_Substr }, { "abs", 3, FN_Abs }, { "round", 5, FN_Round }, }; int i; for(i=0; i<ArraySize(aFunc); i++){ if( aFunc[i].len==pToken->n && sqliteStrNICmp(pToken->z, aFunc[i].zName, aFunc[i].len)==0 ){ return aFunc[i].id; } ................................................................................ case FN_Sum: { no_such_func = !allowAgg; too_many_args = n>1; too_few_args = n<1; is_agg = 1; break; } case FN_Abs: case FN_Length: { too_few_args = n<1; too_many_args = n>1; break; } case FN_Round: { too_few_args = n<1; too_many_args = n>2; break; } case FN_Substr: { too_few_args = n<3; too_many_args = n>3; break; } /* The "fcnt(*)" function always returns the number of OP_MoveTo ** operations that have occurred so far while processing the ** SQL statement. This information can be used by test procedures ** to verify that indices are being used properly to minimize ** searching. All arguments to fcnt() are ignored. fcnt() has ** no use (other than testing) that we are aware of. */ case FN_Fcnt: { ................................................................................ case TK_EQ: op = OP_Eq; break; case TK_LIKE: op = OP_Like; break; case TK_GLOB: op = OP_Glob; break; case TK_ISNULL: op = OP_IsNull; break; case TK_NOTNULL: op = OP_NotNull; break; case TK_NOT: op = OP_Not; break; case TK_UMINUS: op = OP_Negative; break; case TK_BITAND: op = OP_BitAnd; break; case TK_BITOR: op = OP_BitOr; break; case TK_BITNOT: op = OP_BitNot; break; case TK_LSHIFT: op = OP_ShiftLeft; break; case TK_RSHIFT: op = OP_ShiftRight; break; case TK_REM: op = OP_Remainder; break; default: break; } switch( pExpr->op ){ case TK_COLUMN: { if( pParse->useAgg ){ sqliteVdbeAddOp(v, OP_AggGet, 0, pExpr->iAgg); }else if( pExpr->iColumn>=0 ){ ................................................................................ break; } case TK_AND: case TK_OR: case TK_PLUS: case TK_STAR: case TK_MINUS: case TK_REM: case TK_BITAND: case TK_BITOR: case TK_SLASH: { sqliteExprCode(pParse, pExpr->pLeft); sqliteExprCode(pParse, pExpr->pRight); sqliteVdbeAddOp(v, op, 0, 0); break; } case TK_LSHIFT: case TK_RSHIFT: { sqliteExprCode(pParse, pExpr->pRight); sqliteExprCode(pParse, pExpr->pLeft); sqliteVdbeAddOp(v, op, 0, 0); break; } case TK_CONCAT: { sqliteExprCode(pParse, pExpr->pLeft); sqliteExprCode(pParse, pExpr->pRight); sqliteVdbeAddOp(v, OP_Concat, 2, 0); break; } ................................................................................ sqliteVdbeAddOp(v, OP_String, 0, 0); sqliteVdbeChangeP3(v, -1, z, p->n+1); sqliteFree(z); break; } /* Fall through into TK_NOT */ } case TK_BITNOT: case TK_NOT: { sqliteExprCode(pParse, pExpr->pLeft); sqliteVdbeAddOp(v, op, 0, 0); break; } case TK_ISNULL: case TK_NOTNULL: { ................................................................................ for(i=0; i<pList->nExpr; i++){ sqliteExprCode(pParse, pList->a[i].pExpr); if( i>0 ){ sqliteVdbeAddOp(v, op, 0, 0); } } break; } case FN_Abs: { sqliteExprCode(pParse, pList->a[0].pExpr); sqliteVdbeAddOp(v, OP_AbsValue, 0, 0); break; } case FN_Round: { if( pList->nExpr==2 ){ sqliteExprCode(pParse, pList->a[1].pExpr); }else{ sqliteVdbeAddOp(v, OP_Integer, 0, 0); } sqliteExprCode(pParse, pList->a[0].pExpr); sqliteVdbeAddOp(v, OP_Precision, 0, 0); break; } case FN_Length: { sqliteExprCode(pParse, pList->a[0].pExpr); sqliteVdbeAddOp(v, OP_Strlen, 0, 0); break; } case FN_Substr: { |
Changes to src/parse.y.
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 ... 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 ... 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 |
** ************************************************************************* ** 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.36 2001/10/12 17:30:05 drh Exp $ */ %token_prefix TK_ %token_type {Token} %default_type {Token} %extra_argument {Parse *pParse} %syntax_error { sqliteSetString(&pParse->zErrMsg,"syntax error",0); ................................................................................ %left OR. %left AND. %right NOT. %left EQ NE ISNULL NOTNULL IS LIKE GLOB BETWEEN IN. %left GT GE LT LE. %left BITAND BITOR LSHIFT RSHIFT. %left PLUS MINUS. %left STAR SLASH MOD. %left CONCAT. %right UMINUS BITNOT. %type expr {Expr*} %destructor expr {sqliteExprDelete($$);} expr(A) ::= LP(B) expr(X) RP(E). {A = X; sqliteExprSpan(A,&B,&E);} ................................................................................ A = sqliteExpr(TK_NOT, A, 0, 0); sqliteExprSpan(A,&X->span,&Y->span); } 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) MOD expr(Y). {A = sqliteExpr(TK_MOD, X, Y, 0);} expr(A) ::= expr(X) CONCAT expr(Y). {A = sqliteExpr(TK_CONCAT, X, Y, 0);} expr(A) ::= expr(X) ISNULL(E). { A = sqliteExpr(TK_ISNULL, X, 0, 0); sqliteExprSpan(A,&X->span,&E); } expr(A) ::= expr(X) IS NULL(E). { A = sqliteExpr(TK_ISNULL, X, 0, 0); |
| | | |
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 ... 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 ... 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 |
** ************************************************************************* ** 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.37 2001/10/13 02:59:09 drh Exp $ */ %token_prefix TK_ %token_type {Token} %default_type {Token} %extra_argument {Parse *pParse} %syntax_error { sqliteSetString(&pParse->zErrMsg,"syntax error",0); ................................................................................ %left OR. %left AND. %right NOT. %left EQ NE ISNULL NOTNULL IS LIKE GLOB BETWEEN IN. %left GT GE LT LE. %left BITAND BITOR LSHIFT RSHIFT. %left PLUS MINUS. %left STAR SLASH REM. %left CONCAT. %right UMINUS BITNOT. %type expr {Expr*} %destructor expr {sqliteExprDelete($$);} expr(A) ::= LP(B) expr(X) RP(E). {A = X; sqliteExprSpan(A,&B,&E);} ................................................................................ A = sqliteExpr(TK_NOT, A, 0, 0); sqliteExprSpan(A,&X->span,&Y->span); } 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) REM expr(Y). {A = sqliteExpr(TK_REM, X, Y, 0);} expr(A) ::= expr(X) CONCAT expr(Y). {A = sqliteExpr(TK_CONCAT, X, Y, 0);} expr(A) ::= expr(X) ISNULL(E). { A = sqliteExpr(TK_ISNULL, X, 0, 0); sqliteExprSpan(A,&X->span,&E); } expr(A) ::= expr(X) IS NULL(E). { A = sqliteExpr(TK_ISNULL, X, 0, 0); |
Changes to src/sqliteInt.h.
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
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
|
** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Internal interface definitions for SQLite. ** ** @(#) $Id: sqliteInt.h,v 1.60 2001/10/12 17:30:05 drh Exp $ */ #include "sqlite.h" #include "hash.h" #include "vdbe.h" #include "parse.h" #include "btree.h" #include <stdio.h> ................................................................................ #define FN_Min 2 #define FN_Max 3 #define FN_Sum 4 #define FN_Avg 5 #define FN_Fcnt 6 #define FN_Length 7 #define FN_Substr 8 #if 0 #define FN_Abs 9 #define FN_Ceil 10 #define FN_Floor 11 #define FN_Frac 12 #define FN_Sin 13 #define FN_Cos 14 #define FN_Tan 15 #define FN_Asin 16 #define FN_Acos 17 #define FN_Atan 18 #define FN_Exp 19 #define FN_Ln 20 #define FN_Pow 21 #endif /* ** Forward references to structures */ typedef struct Column Column; typedef struct Table Table; typedef struct Index Index; |
|
<
|
<
<
<
<
<
<
<
<
<
<
<
<
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Internal interface definitions for SQLite. ** ** @(#) $Id: sqliteInt.h,v 1.61 2001/10/13 02:59:09 drh Exp $ */ #include "sqlite.h" #include "hash.h" #include "vdbe.h" #include "parse.h" #include "btree.h" #include <stdio.h> ................................................................................ #define FN_Min 2 #define FN_Max 3 #define FN_Sum 4 #define FN_Avg 5 #define FN_Fcnt 6 #define FN_Length 7 #define FN_Substr 8 #define FN_Abs 9 #define FN_Round 10 /* ** Forward references to structures */ typedef struct Column Column; typedef struct Table Table; typedef struct Index Index; |
Changes to src/tokenize.c.
11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 ... 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 ... 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 |
************************************************************************* ** An tokenizer for SQL ** ** This file contains C code that splits an SQL input string up into ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** ** $Id: tokenize.c,v 1.26 2001/10/09 04:19:47 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> #include <stdlib.h> /* ................................................................................ *tokenType = TK_STAR; return 1; } case '/': { *tokenType = TK_SLASH; return 1; } case '=': { *tokenType = TK_EQ; return 1 + (z[1]=='='); } case '<': { if( z[1]=='=' ){ *tokenType = TK_LE; return 2; }else if( z[1]=='>' ){ *tokenType = TK_NE; return 2; }else{ *tokenType = TK_LT; return 1; } } case '>': { if( z[1]=='=' ){ *tokenType = TK_GE; return 2; }else{ *tokenType = TK_GT; return 1; } } case '!': { if( z[1]!='=' ){ ................................................................................ }else{ *tokenType = TK_NE; return 2; } } case '|': { if( z[1]!='|' ){ *tokenType = TK_ILLEGAL; return 1; }else{ *tokenType = TK_CONCAT; return 2; } } case ',': { *tokenType = TK_COMMA; return 1; } case '\'': case '"': { int delim = z[0]; for(i=1; z[i]; i++){ if( z[i]==delim ){ if( z[i+1]==delim ){ i++; |
| > > > > > > > > > > | > > > > > > > > |
11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 ... 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 ... 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 |
************************************************************************* ** An tokenizer for SQL ** ** This file contains C code that splits an SQL input string up into ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** ** $Id: tokenize.c,v 1.27 2001/10/13 02:59:09 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> #include <stdlib.h> /* ................................................................................ *tokenType = TK_STAR; return 1; } case '/': { *tokenType = TK_SLASH; return 1; } case '%': { *tokenType = TK_REM; return 1; } case '=': { *tokenType = TK_EQ; return 1 + (z[1]=='='); } case '<': { if( z[1]=='=' ){ *tokenType = TK_LE; return 2; }else if( z[1]=='>' ){ *tokenType = TK_NE; return 2; }else if( z[1]=='<' ){ *tokenType = TK_LSHIFT; return 2; }else{ *tokenType = TK_LT; return 1; } } case '>': { if( z[1]=='=' ){ *tokenType = TK_GE; return 2; }else if( z[1]=='>' ){ *tokenType = TK_RSHIFT; return 2; }else{ *tokenType = TK_GT; return 1; } } case '!': { if( z[1]!='=' ){ ................................................................................ }else{ *tokenType = TK_NE; return 2; } } case '|': { if( z[1]!='|' ){ *tokenType = TK_BITOR; return 1; }else{ *tokenType = TK_CONCAT; return 2; } } case ',': { *tokenType = TK_COMMA; return 1; } case '&': { *tokenType = TK_BITAND; return 1; } case '~': { *tokenType = TK_BITNOT; return 1; } case '\'': case '"': { int delim = z[0]; for(i=1; z[i]; i++){ if( z[i]==delim ){ if( z[i+1]==delim ){ i++; |
Changes to src/vdbe.c.
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 ... 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 .... 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 .... 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 .... 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 .... 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 .... 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 .... 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 |
** 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.83 2001/10/13 01:06:48 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> /* ** SQL is translated into a sequence of instructions to be ** executed by a virtual machine. Each instruction is an instance ................................................................................ "AggFocus", "AggIncr", "AggNext", "AggSet", "AggGet", "SetInsert", "SetFound", "SetNotFound", "SetClear", "MakeRecord", "MakeKey", "MakeIdxKey", "Goto", "If", "Halt", "ColumnCount", "ColumnName", "Callback", "Integer", "String", "Null", "Pop", "Dup", "Pull", "Add", "AddImm", "Subtract", "Multiply", "Divide", "Min", "Max", "Like", "Glob", "Eq", "Ne", "Lt", "Le", "Gt", "Ge", "IsNull", "NotNull", "Negative", "And", "Or", "Not", "Concat", "Noop", "Strlen", "Substr", }; ................................................................................ ** Pop the top two elements from the stack, divide the ** first (what was on top of the stack) from the second (the ** next on stack) ** and push the result back onto the stack. If either element ** is a string then it is converted to a double using the atof() ** function before the division. Division by zero returns NULL. */ case OP_Add: case OP_Subtract: case OP_Multiply: case OP_Divide: { int tos = p->tos; int nos = tos - 1; VERIFY( if( nos<0 ) goto not_enough_stack; ) if( (aStack[tos].flags & aStack[nos].flags & STK_Int)==STK_Int ){ int a, b; a = aStack[tos].i; b = aStack[nos].i; switch( pOp->opcode ){ case OP_Add: b += a; break; case OP_Subtract: b -= a; break; case OP_Multiply: b *= a; break; default: { if( a==0 ) goto divide_by_zero; b /= a; break; } } POPSTACK; Release(p, nos); aStack[nos].i = b; aStack[nos].flags = STK_Int; }else{ ................................................................................ Realify(p, nos); a = aStack[tos].r; b = aStack[nos].r; switch( pOp->opcode ){ case OP_Add: b += a; break; case OP_Subtract: b -= a; break; case OP_Multiply: b *= a; break; default: { if( a==0.0 ) goto divide_by_zero; b /= a; break; } } POPSTACK; Release(p, nos); aStack[nos].r = b; aStack[nos].flags = STK_Real; } ................................................................................ divide_by_zero: PopStack(p, 2); p->tos = nos; aStack[nos].flags = STK_Null; break; } /* Opcode: Max * * * ** ** Pop the top two elements from the stack then push back the ** largest of the two. */ case OP_Max: { ................................................................................ aStack[tos].flags = 0; }else{ Release(p, tos); } p->tos = nos; break; } /* Opcode: AddImm P1 * * ** ** Add the value P1 to whatever is on top of the stack. */ case OP_AddImm: { int tos = p->tos; ................................................................................ } /* Opcode: Negative * * * ** ** Treat the top of the stack as a numeric quantity. Replace it ** with its additive inverse. */ case OP_Negative: { int tos = p->tos; VERIFY( if( tos<0 ) goto not_enough_stack; ) if( aStack[tos].flags & STK_Real ){ Release(p, tos); aStack[tos].r = -aStack[tos].r; aStack[tos].flags = STK_Real; }else if( aStack[tos].flags & STK_Int ){ Release(p, tos); aStack[tos].i = -aStack[tos].i; aStack[tos].flags = STK_Int; }else{ Realify(p, tos); Release(p, tos); aStack[tos].r = -aStack[tos].r; aStack[tos].flags = STK_Real; } break; } /* Opcode: Not * * * ** ................................................................................ VERIFY( if( p->tos<0 ) goto not_enough_stack; ) Integerify(p, tos); Release(p, tos); aStack[tos].i = !aStack[tos].i; aStack[tos].flags = STK_Int; break; } /* Opcode: Noop * * * ** ** Do nothing. This instruction is often useful as a jump ** destination. */ case OP_Noop: { |
| > > | > > > > > > > > > | > | > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > | > > | > > | > > > > > > > > > > > > > > > > |
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 ... 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 .... 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 .... 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 .... 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 .... 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 .... 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 .... 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 |
** 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.84 2001/10/13 02:59:09 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> /* ** SQL is translated into a sequence of instructions to be ** executed by a virtual machine. Each instruction is an instance ................................................................................ "AggFocus", "AggIncr", "AggNext", "AggSet", "AggGet", "SetInsert", "SetFound", "SetNotFound", "SetClear", "MakeRecord", "MakeKey", "MakeIdxKey", "Goto", "If", "Halt", "ColumnCount", "ColumnName", "Callback", "Integer", "String", "Null", "Pop", "Dup", "Pull", "Add", "AddImm", "Subtract", "Multiply", "Divide", "Remainder", "BitAnd", "BitOr", "BitNot", "ShiftLeft", "ShiftRight", "AbsValue", "Precision", "Min", "Max", "Like", "Glob", "Eq", "Ne", "Lt", "Le", "Gt", "Ge", "IsNull", "NotNull", "Negative", "And", "Or", "Not", "Concat", "Noop", "Strlen", "Substr", }; ................................................................................ ** Pop the top two elements from the stack, divide the ** first (what was on top of the stack) from the second (the ** next on stack) ** and push the result back onto the stack. If either element ** is a string then it is converted to a double using the atof() ** function before the division. Division by zero returns NULL. */ /* Opcode: Remainder * * * ** ** Pop the top two elements from the stack, divide the ** first (what was on top of the stack) from the second (the ** next on stack) ** and push the remainder after division onto the stack. If either element ** is a string then it is converted to a double using the atof() ** function before the division. Division by zero returns NULL. */ case OP_Add: case OP_Subtract: case OP_Multiply: case OP_Divide: case OP_Remainder: { int tos = p->tos; int nos = tos - 1; VERIFY( if( nos<0 ) goto not_enough_stack; ) if( (aStack[tos].flags & aStack[nos].flags & STK_Int)==STK_Int ){ int a, b; a = aStack[tos].i; b = aStack[nos].i; switch( pOp->opcode ){ case OP_Add: b += a; break; case OP_Subtract: b -= a; break; case OP_Multiply: b *= a; break; case OP_Divide: { if( a==0 ) goto divide_by_zero; b /= a; break; } default: { if( a==0 ) goto divide_by_zero; b %= a; break; } } POPSTACK; Release(p, nos); aStack[nos].i = b; aStack[nos].flags = STK_Int; }else{ ................................................................................ Realify(p, nos); a = aStack[tos].r; b = aStack[nos].r; switch( pOp->opcode ){ case OP_Add: b += a; break; case OP_Subtract: b -= a; break; case OP_Multiply: b *= a; break; case OP_Divide: { if( a==0.0 ) goto divide_by_zero; b /= a; break; } default: { int ia = a; int ib = b; if( ia==0.0 ) goto divide_by_zero; b = ib % ia; break; } } POPSTACK; Release(p, nos); aStack[nos].r = b; aStack[nos].flags = STK_Real; } ................................................................................ divide_by_zero: PopStack(p, 2); p->tos = nos; aStack[nos].flags = STK_Null; break; } /* ** Opcode: Precision * * * ** ** The top of stack is a floating-point number and the next on stack is ** an integer. Truncate the floating-point number to a number of digits ** specified by the integer and push the floating-point number back onto ** the stack. */ case OP_Precision: { int tos = p->tos; int nos = tos - 1; int nDigit; double v; char zBuf[100]; VERIFY( if( nos<0 ) goto not_enough_stack; ) Realify(p, tos); Integerify(p, nos); nDigit = aStack[nos].i; if( nDigit<0 ) nDigit = 0; if( nDigit>30 ) nDigit = 30; v = aStack[tos].r; sprintf(zBuf, "%.*f", nDigit, v); POPSTACK; Release(p, nos); zStack[nos] = sqliteStrDup(zBuf); aStack[nos].n = strlen(zStack[tos]) + 1; aStack[nos].flags = STK_Str | STK_Dyn; break; } /* Opcode: Max * * * ** ** Pop the top two elements from the stack then push back the ** largest of the two. */ case OP_Max: { ................................................................................ aStack[tos].flags = 0; }else{ Release(p, tos); } p->tos = nos; break; } /* Opcode: BitAnd * * * ** ** Pop the top two elements from the stack. Convert both elements ** to integers. Push back onto the stack the bit-wise AND of the ** two elements. */ /* Opcode: BitOr * * * ** ** Pop the top two elements from the stack. Convert both elements ** to integers. Push back onto the stack the bit-wise OR of the ** two elements. */ /* Opcode: ShiftLeft * * * ** ** Pop the top two elements from the stack. Convert both elements ** to integers. Push back onto the stack the top element shifted ** left by N bits where N is the second element on the stack. */ /* Opcode: ShiftRight * * * ** ** Pop the top two elements from the stack. Convert both elements ** to integers. Push back onto the stack the top element shifted ** right by N bits where N is the second element on the stack. */ case OP_BitAnd: case OP_BitOr: case OP_ShiftLeft: case OP_ShiftRight: { int tos = p->tos; int nos = tos - 1; int a, b; VERIFY( if( nos<0 ) goto not_enough_stack; ) Integerify(p, tos); Integerify(p, nos); a = aStack[tos].i; b = aStack[nos].i; switch( pOp->opcode ){ case OP_BitAnd: a &= b; break; case OP_BitOr: a |= b; break; case OP_ShiftLeft: a <<= b; break; case OP_ShiftRight: a >>= b; break; default: /* CANT HAPPEN */ break; } POPSTACK; Release(p, nos); aStack[nos].i = a; aStack[nos].flags = STK_Int; break; } /* Opcode: AddImm P1 * * ** ** Add the value P1 to whatever is on top of the stack. */ case OP_AddImm: { int tos = p->tos; ................................................................................ } /* Opcode: Negative * * * ** ** Treat the top of the stack as a numeric quantity. Replace it ** with its additive inverse. */ /* Opcode: AbsValue * * * ** ** Treat the top of the stack as a numeric quantity. Replace it ** with its absolute value. */ case OP_Negative: case OP_AbsValue: { int tos = p->tos; VERIFY( if( tos<0 ) goto not_enough_stack; ) if( aStack[tos].flags & STK_Real ){ Release(p, tos); if( pOp->opcode==OP_Negative || aStack[tos].r<0.0 ){ aStack[tos].r = -aStack[tos].r; } aStack[tos].flags = STK_Real; }else if( aStack[tos].flags & STK_Int ){ Release(p, tos); if( pOp->opcode==OP_Negative || aStack[tos].i<0 ){ aStack[tos].i = -aStack[tos].i; } aStack[tos].flags = STK_Int; }else{ Realify(p, tos); Release(p, tos); if( pOp->opcode==OP_Negative || aStack[tos].r<0.0 ){ aStack[tos].r = -aStack[tos].r; } aStack[tos].flags = STK_Real; } break; } /* Opcode: Not * * * ** ................................................................................ VERIFY( if( p->tos<0 ) goto not_enough_stack; ) Integerify(p, tos); Release(p, tos); aStack[tos].i = !aStack[tos].i; aStack[tos].flags = STK_Int; break; } /* Opcode: * * * ** ** Interpret the top of the stack as an value. Replace it ** with its ones-complement. */ case OP_BitNot: { int tos = p->tos; VERIFY( if( p->tos<0 ) goto not_enough_stack; ) Integerify(p, tos); Release(p, tos); aStack[tos].i = ~aStack[tos].i; aStack[tos].flags = STK_Int; break; } /* Opcode: Noop * * * ** ** Do nothing. This instruction is often useful as a jump ** destination. */ case OP_Noop: { |
Changes to src/vdbe.h.
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
...
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
|
************************************************************************* ** Header file for the Virtual DataBase Engine (VDBE) ** ** This header defines the interface to the virtual database engine ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** ** $Id: vdbe.h,v 1.28 2001/10/13 01:06:49 drh Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ #include <stdio.h> /* ** A single VDBE is an opaque structure named "Vdbe". Only routines ................................................................................ #define OP_Pull 80 #define OP_Add 81 #define OP_AddImm 82 #define OP_Subtract 83 #define OP_Multiply 84 #define OP_Divide 85 #define OP_Remainder #define OP_BitAnd #define OP_BitOr #define OP_BitNot #define OP_ShiftLeft #define OP_ShiftRight #define OP_Power #define OP_Exp #define OP_Log #define OP_Min 86 #define OP_Max 87 #define OP_Like 88 #define OP_Glob 89 #define OP_Eq 90 #define OP_Ne 91 #define OP_Lt 92 #define OP_Le 93 #define OP_Gt 94 #define OP_Ge 95 #define OP_IsNull 96 #define OP_NotNull 97 #define OP_Negative 98 #define OP_And 99 #define OP_Or 100 #define OP_Not 101 #define OP_Concat 102 #define OP_Noop 103 #define OP_Strlen 104 #define OP_Substr 105 #define OP_MAX 105 /* ** Prototypes for the VDBE interface. See comments on the implementation ** for a description of what each of these routines does. */ Vdbe *sqliteVdbeCreate(sqlite*); void sqliteVdbeCreateCallback(Vdbe*, int*); |
|
|
|
|
|
|
|
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
...
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
|
************************************************************************* ** Header file for the Virtual DataBase Engine (VDBE) ** ** This header defines the interface to the virtual database engine ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** ** $Id: vdbe.h,v 1.29 2001/10/13 02:59:09 drh Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ #include <stdio.h> /* ** A single VDBE is an opaque structure named "Vdbe". Only routines ................................................................................ #define OP_Pull 80 #define OP_Add 81 #define OP_AddImm 82 #define OP_Subtract 83 #define OP_Multiply 84 #define OP_Divide 85 #define OP_Remainder 86 #define OP_BitAnd 87 #define OP_BitOr 88 #define OP_BitNot 89 #define OP_ShiftLeft 90 #define OP_ShiftRight 91 #define OP_AbsValue 92 #define OP_Precision 93 #define OP_Min 94 #define OP_Max 95 #define OP_Like 96 #define OP_Glob 97 #define OP_Eq 98 #define OP_Ne 99 #define OP_Lt 100 #define OP_Le 101 #define OP_Gt 102 #define OP_Ge 103 #define OP_IsNull 104 #define OP_NotNull 105 #define OP_Negative 106 #define OP_And 107 #define OP_Or 108 #define OP_Not 109 #define OP_Concat 110 #define OP_Noop 111 #define OP_Strlen 112 #define OP_Substr 113 #define OP_MAX 113 /* ** Prototypes for the VDBE interface. See comments on the implementation ** for a description of what each of these routines does. */ Vdbe *sqliteVdbeCreate(sqlite*); void sqliteVdbeCreateCallback(Vdbe*, int*); |
Changes to test/expr.test.
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
..
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing expressions. # # $Id: expr.test,v 1.15 2001/09/16 00:13:28 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)} ................................................................................ test_expr expr-1.35 {i1=1, i2=2} {i1-i2=-1} {1} test_expr expr-1.36 {i1=1, i2=0} {not i1} {0} test_expr expr-1.37 {i1=1, i2=NULL} {not i2} {1} test_expr expr-1.38 {i1=1} {-i1} {-1} test_expr expr-1.39 {i1=1} {+i1} {1} test_expr expr-1.40 {i1=1, i2=2} {+(i2+i1)} {3} test_expr expr-1.41 {i1=1, i2=2} {-(i2+i1)} {-3} test_expr expr-2.1 {r1=1.23, r2=2.34} {r1+r2} 3.57 test_expr expr-2.2 {r1=1.23, r2=2.34} {r1-r2} -1.11 test_expr expr-2.3 {r1=1.23, r2=2.34} {r1*r2} 2.8782 test_expr expr-2.4 {r1=1.23, r2=2.34} {r1/r2} 0.525641025641026 test_expr expr-2.5 {r1=1.23, r2=2.34} {r2/r1} 1.90243902439024 test_expr expr-2.6 {r1=1.23, r2=2.34} {r2<r1} 0 |
|
>
>
>
>
>
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
..
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing expressions. # # $Id: expr.test,v 1.16 2001/10/13 02:59:09 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)} ................................................................................ test_expr expr-1.35 {i1=1, i2=2} {i1-i2=-1} {1} test_expr expr-1.36 {i1=1, i2=0} {not i1} {0} test_expr expr-1.37 {i1=1, i2=NULL} {not i2} {1} test_expr expr-1.38 {i1=1} {-i1} {-1} test_expr expr-1.39 {i1=1} {+i1} {1} test_expr expr-1.40 {i1=1, i2=2} {+(i2+i1)} {3} test_expr expr-1.41 {i1=1, i2=2} {-(i2+i1)} {-3} test_expr expr-1.42 {i1=1, i2=2} {i1|i2} {3} test_expr expr-1.43 {i1=1, i2=2} {i1&i2} {0} test_expr expr-1.44 {i1=1} {~i1} {-2} test_expr expr-1.45 {i1=1, i2=3} {i1<<i2} {8} test_expr expr-1.46 {i1=32, i2=3} {i1>>i2} {4} test_expr expr-2.1 {r1=1.23, r2=2.34} {r1+r2} 3.57 test_expr expr-2.2 {r1=1.23, r2=2.34} {r1-r2} -1.11 test_expr expr-2.3 {r1=1.23, r2=2.34} {r1*r2} 2.8782 test_expr expr-2.4 {r1=1.23, r2=2.34} {r1/r2} 0.525641025641026 test_expr expr-2.5 {r1=1.23, r2=2.34} {r2/r1} 1.90243902439024 test_expr expr-2.6 {r1=1.23, r2=2.34} {r2<r1} 0 |
Changes to test/func.test.
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
117
118
119
120
121
122
123
124
|
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing built-in functions. # # $Id: func.test,v 1.4 2001/09/16 00:13:28 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Create a table to work with. # do_test func-0.0 { ................................................................................ } "er in \u1234h F-" do_test func-3.10 { execsql {SELECT substr(t1,-4,3) FROM tbl1 ORDER BY t1} } "ter ain i\u1234h TF-" } ;# End [sqlite -encoding]==UTF-8 and \u1234!=u1234 finish_test |
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
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
151
152
153
154
155
156
157
158
159
160
161
162
163
164
|
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing built-in functions. # # $Id: func.test,v 1.5 2001/10/13 02:59:09 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Create a table to work with. # do_test func-0.0 { ................................................................................ } "er in \u1234h F-" do_test func-3.10 { execsql {SELECT substr(t1,-4,3) FROM tbl1 ORDER BY t1} } "ter ain i\u1234h TF-" } ;# End [sqlite -encoding]==UTF-8 and \u1234!=u1234 # Test the abs() and round() functions. # do_test func-4.1 { execsql { CREATE TABLE t1(a,b,c); INSERT INTO t1 VALUES(1,2,3); INSERT INTO t1 VALUES(2,1.2345678901234,-12345.67890); INSERT INTO t1 VALUES(3,-2,-5); } catchsql {SELECT abs(a,b) FROM t1} } {1 {too many arguments to function abs()}} do_test func-4.2 { catchsql {SELECT abs() FROM t1} } {1 {too few arguments to function abs()}} do_test func-4.3 { catchsql {SELECT abs(b) FROM t1 ORDER BY a} } {0 {2 1.2345678901234 2}} do_test func-4.4 { catchsql {SELECT abs(c) FROM t1 ORDER BY a} } {0 {3 12345.6789 5}} do_test func-4.5 { catchsql {SELECT round(a,b,c) FROM t1} } {1 {too many arguments to function round()}} do_test func-4.6 { catchsql {SELECT round(b,2) FROM t1} } {0 {2.00 1.23 -2.00}} do_test func-4.7 { catchsql {SELECT round(b,0) FROM t1 ORDER BY a} } {0 {2 1 -2}} do_test func-4.8 { catchsql {SELECT round(c) FROM t1 ORDER BY a} } {0 {3 -12346 -5}} do_test func-4.9 { catchsql {SELECT round(c,a) FROM t1 ORDER BY a} } {0 {3.0 -12345.68 -5.000}} do_test func-4.10 { catchsql {SELECT round() FROM t1 ORDER BY a} } {1 {too few arguments to function round()}} finish_test |
Changes to test/main.test.
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
..
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
|
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is exercising the code in main.c. # # $Id: main.test,v 1.8 2001/09/16 00:13:28 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Tests of the sqlite_complete() function. # do_test main-1.1 { ................................................................................ lappend v $msg } {1 {unrecognized token: "!!"}} do_test main-3.2 { catch {db close} foreach f [glob -nocomplain testdb/*] {file delete -force $f} file delete -force testdb sqlite db testdb set v [catch {execsql {SELECT * from T1 where ~x}} msg] lappend v $msg } {1 {unrecognized token: "~"}} do_test main-3.3 { catch {db close} foreach f [glob -nocomplain testdb/*] {file delete -force $f} file delete -force testdb sqlite db testdb set v [catch {execsql {SELECT a|b from T1 where x}} msg] lappend v $msg } {1 {unrecognized token: "|"}} do_test main-3.3 { catch {db close} foreach f [glob -nocomplain testdb/*] {file delete -force $f} file delete -force testdb sqlite db testdb execsql { |
|
|
|
<
<
<
<
<
<
<
<
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
..
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is exercising the code in main.c. # # $Id: main.test,v 1.9 2001/10/13 02:59:09 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Tests of the sqlite_complete() function. # do_test main-1.1 { ................................................................................ lappend v $msg } {1 {unrecognized token: "!!"}} do_test main-3.2 { catch {db close} foreach f [glob -nocomplain testdb/*] {file delete -force $f} file delete -force testdb sqlite db testdb set v [catch {execsql {SELECT * from T1 where @x}} msg] lappend v $msg } {1 {unrecognized token: "@"}} do_test main-3.3 { catch {db close} foreach f [glob -nocomplain testdb/*] {file delete -force $f} file delete -force testdb sqlite db testdb execsql { |
Changes to www/changes.tcl.
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 |
proc chng {date desc} {
puts "<DT><B>$date</B></DT>"
puts "<DD><P><UL>$desc</UL></P></DD>"
}
chng {2001 Oct ? (2.0.3)} {
<li>Bug fix: the <b>sqlite_busy_timeout()</b> function was delaying 1000
times too long before failing.</li>
<li>Bug fix: an assertion was failing if the disk holding the database
file became full or stopped accepting writes for some other reason.
New tests were added to detect similar problems in the future.</li>
}
chng {2001 Oct 9 (2.0.2)} {
<li>Fix two bugs in the locking protocol. (One was masking the other.)</li>
<li>Removed some unused "#include <unistd.h>" that were causing problems
for VC++.</li>
<li>Fixed <b>sqlite.h</b> so that it is usable from C++</li>
|
| > > > > |
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 |
proc chng {date desc} { puts "<DT><B>$date</B></DT>" puts "<DD><P><UL>$desc</UL></P></DD>" } chng {2001 Oct 13 (2.0.3)} { <li>Bug fix: the <b>sqlite_busy_timeout()</b> function was delaying 1000 times too long before failing.</li> <li>Bug fix: an assertion was failing if the disk holding the database file became full or stopped accepting writes for some other reason. New tests were added to detect similar problems in the future.</li> <li>Added new operators: <b>&</b> (bitwise-and) <b>|</b> (bitwise-or), <b>~</b> (ones-complement), <b><<</b> (shift left), <b>>></b> (shift right).</li> <li>Added new functions: <b>round()</b> and <b>abs()</b>.</li> } chng {2001 Oct 9 (2.0.2)} { <li>Fix two bugs in the locking protocol. (One was masking the other.)</li> <li>Removed some unused "#include <unistd.h>" that were causing problems for VC++.</li> <li>Fixed <b>sqlite.h</b> so that it is usable from C++</li> |
Changes to www/lang.tcl.
1 2 3 4 5 6 7 8 9 10 11 ... 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 ... 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 |
# # Run this Tcl script to generate the sqlite.html file. # set rcsid {$Id: lang.tcl,v 1.11 2001/10/08 13:22:33 drh Exp $} puts {<html> <head> <title>Query Language Understood By SQLite</title> </head> <body bgcolor=white> <h1 align=center> ................................................................................ not talk about a standalone command but about "expressions" which are subcomponent of most other commands.</p> <p>SQLite understands the following binary operators, in order from highest to lowest precedence:</p> <blockquote><pre> <font color="#2c2cf0"><big>* / + - < <= > >= = == != <> </big>IN AND OR</font> </pre></blockquote> <p>Any SQLite value can be used as part of an expression. For arithmetic operations, integers are treated as integers. Strings are first converted to real numbers using <b>atof()</b>. For comparison operators, numbers compare as numbers and strings compare as strings. For string comparisons, case is significant but is only used to break a tie. ................................................................................ the SELECT yeilds no rows, then the value of the SELECT is NULL.</p> <p>The expression syntax currently supports the following functions:</p> <blockquote><pre> <font color="#2c2cf0"><big>count min max sum avg length substr</big></font> </pre></blockquote> <p> The functions <b>count</b>, <b>sum</b>, and <b>avg</b> and the functions <b>min</b> and <b>max</b> used with only one argument are all aggregate functions. This means that they are computed across all rows of the result. The functions <b>min</b> and <b>max</b> with two or more arguments and the functions <b>length</b> and <b>substr</b> are non-aggregates. Non-aggregate functions are computed separately for each row of the result. </p> <p> The "<b>count(*)</b>" syntax is supported but "<b>count(distinct</b> <i>COLUMN-NAME</i><b>)</b>" is not. </p> } Section INSERT insert |
| | > > > > > > > | | < > > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 11 ... 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 ... 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 |
# # Run this Tcl script to generate the sqlite.html file. # set rcsid {$Id: lang.tcl,v 1.12 2001/10/13 02:59:10 drh Exp $} puts {<html> <head> <title>Query Language Understood By SQLite</title> </head> <body bgcolor=white> <h1 align=center> ................................................................................ not talk about a standalone command but about "expressions" which are subcomponent of most other commands.</p> <p>SQLite understands the following binary operators, in order from highest to lowest precedence:</p> <blockquote><pre> <font color="#2c2cf0"><big>* / % + - << >> & | < <= > >= = == != <> </big>IN AND OR</font> </pre></blockquote> <p>Supported unary operaters are these:</p> <blockquote><pre> <font color="#2c2cf0"><big>- + ! ~</big></font> </pre></blockquote> <p>Any SQLite value can be used as part of an expression. For arithmetic operations, integers are treated as integers. Strings are first converted to real numbers using <b>atof()</b>. For comparison operators, numbers compare as numbers and strings compare as strings. For string comparisons, case is significant but is only used to break a tie. ................................................................................ the SELECT yeilds no rows, then the value of the SELECT is NULL.</p> <p>The expression syntax currently supports the following functions:</p> <blockquote><pre> <font color="#2c2cf0"><big>count min max sum avg length substr abs round</big></font> </pre></blockquote> <p> The functions <b>count</b>, <b>sum</b>, and <b>avg</b> and the functions <b>min</b> and <b>max</b> used with only one argument are all aggregate functions. This means that they are computed across all rows of the result. The functions <b>min</b> and <b>max</b> with two or more arguments and all other functions are non-aggregates. Non-aggregate functions are computed separately for each row of the result. </p> <p> The <b>round</b> function can take either 1 or 2 arguments. The first argument is the floating point value that is rounded. The second argument is the number of digits to the right of the decimal point to preserve. If the second argument is omitted, zero is assumed. So round(1.23456,2) is 1.23 and round(12.34,0) and round(12.34) both evaluate to 12. </p> <p> The "<b>count(*)</b>" syntax is supported but "<b>count(distinct</b> <i>COLUMN-NAME</i><b>)</b>" is not. </p> } Section INSERT insert |