Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Make indexes on CAST(...) expressions work. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | index-on-cast |
| Files: | files | file ages | folders |
| SHA3-256: |
3ef711d98fb239cf24472f124e7b36b0 |
| User & Date: | dan 2019-01-28 18:08:59.152 |
Context
|
2019-01-28
| ||
| 18:58 | Fix a performance regression caused by the previous commit. (Closed-Leaf check-in: c4db0ad12d user: drh tags: index-on-cast) | |
| 18:08 | Make indexes on CAST(...) expressions work. (check-in: 3ef711d98f user: dan tags: index-on-cast) | |
| 16:50 | Fix a buffer overread in fts3 that could occur when accessing a corrupt database. (check-in: a9faf90339 user: dan tags: trunk) | |
Changes
Changes to src/where.c.
| ︙ | ︙ | |||
344 345 346 347 348 349 350 351 352 353 354 355 356 357 |
pScan->zCollName = 0;
if( pIdx ){
int j = iColumn;
iColumn = pIdx->aiColumn[j];
if( iColumn==XN_EXPR ){
pScan->pIdxExpr = pIdx->aColExpr->a[j].pExpr;
pScan->zCollName = pIdx->azColl[j];
}else if( iColumn==pIdx->pTable->iPKey ){
iColumn = XN_ROWID;
}else if( iColumn>=0 ){
pScan->idxaff = pIdx->pTable->aCol[iColumn].affinity;
pScan->zCollName = pIdx->azColl[j];
}
}else if( iColumn==XN_EXPR ){
| > | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 |
pScan->zCollName = 0;
if( pIdx ){
int j = iColumn;
iColumn = pIdx->aiColumn[j];
if( iColumn==XN_EXPR ){
pScan->pIdxExpr = pIdx->aColExpr->a[j].pExpr;
pScan->zCollName = pIdx->azColl[j];
pScan->idxaff = sqlite3ExprAffinity(pScan->pIdxExpr);
}else if( iColumn==pIdx->pTable->iPKey ){
iColumn = XN_ROWID;
}else if( iColumn>=0 ){
pScan->idxaff = pIdx->pTable->aCol[iColumn].affinity;
pScan->zCollName = pIdx->azColl[j];
}
}else if( iColumn==XN_EXPR ){
|
| ︙ | ︙ |
Changes to test/indexexpr2.test.
| ︙ | ︙ | |||
245 246 247 248 249 250 251 252 253 254 |
CREATE INDEX t5a ON t5( abs(a) );
CREATE INDEX t5b ON t5( abs(b) );
}
do_execsql_test 5.4 {
SELECT * FROM t5 WHERE abs(a)=2 or abs(b)=9;
} {2 4 3 9}
finish_test
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 |
CREATE INDEX t5a ON t5( abs(a) );
CREATE INDEX t5b ON t5( abs(b) );
}
do_execsql_test 5.4 {
SELECT * FROM t5 WHERE abs(a)=2 or abs(b)=9;
} {2 4 3 9}
#-------------------------------------------------------------------------
do_execsql_test 6.0 {
CREATE TABLE x1(a INTEGER PRIMARY KEY, b);
INSERT INTO x1 VALUES
(1, 123), (2, '123'), (3, '123abc'), (4, 123.0), (5, 1234);
}
do_execsql_test 6.1.1 {
SELECT a, b FROM x1 WHERE CAST(b AS INTEGER) = 123;
} {1 123 2 123 3 123abc 4 123.0}
do_execsql_test 6.1.2 {
CREATE INDEX x1i ON x1( CAST(b AS INTEGER) );
SELECT a, b FROM x1 WHERE CAST(b AS INTEGER) = 123;
} {1 123 2 123 3 123abc 4 123.0}
do_eqp_test 6.1.3 {
SELECT a, b FROM x1 WHERE CAST(b AS INTEGER) = 123;
} {SEARCH TABLE x1 USING INDEX x1i (<expr>=?)}
do_execsql_test 6.2.1 {
SELECT a, b FROM x1 WHERE CAST(b AS TEXT) = 123;
} {1 123 2 123}
do_execsql_test 6.2.2 {
CREATE INDEX x1i2 ON x1( CAST(b AS TEXT) );
SELECT a, b FROM x1 WHERE CAST(b AS TEXT) = 123;
} {1 123 2 123}
do_eqp_test 6.2.3 {
SELECT a, b FROM x1 WHERE CAST(b AS TEXT) = 123;
} {SEARCH TABLE x1 USING INDEX x1i2 (<expr>=?)}
finish_test
|