Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix a bug causing spurious "sub-select returns N columns expected 1" errors in join queries with a term like "(a, b) IN (SELECT ...)" in the WHERE clause. Ticket [7310e2fb3d046a5f5]. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
14dfd96f9bca2df5033b2d894bf63cc8 |
| User & Date: | dan 2018-01-23 16:38:57 |
| Original Comment: | Fix a bug causing spurious "sub-select returns N columns expected 1" errors in join queries with a term like "(a, b) IN (SELECT ...)" in the WHERE clause. |
Context
|
2018-01-23
| ||
| 17:33 | Work around a problem with GCC on 32-bit machines that cause the CAST operator to generate a floating-point result for strings that could be represented as very large integers. (check-in: 1b027319 user: drh tags: trunk) | |
| 16:38 | Fix a bug causing spurious "sub-select returns N columns expected 1" errors in join queries with a term like "(a, b) IN (SELECT ...)" in the WHERE clause. Ticket [7310e2fb3d046a5f5]. (check-in: 14dfd96f user: dan tags: trunk) | |
| 15:26 | Fix the modification-time setting logic in the fileio.c extension on Windows so that it works with utf8 filenames. (check-in: f785b904 user: drh tags: trunk) | |
Changes
Changes to src/wherecode.c.
| ︙ | ︙ | |||
2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 |
pE = pTerm->pExpr;
assert( !ExprHasProperty(pE, EP_FromJoin) );
assert( (pTerm->prereqRight & pLevel->notReady)!=0 );
pAlt = sqlite3WhereFindTerm(pWC, iCur, pTerm->u.leftColumn, notReady,
WO_EQ|WO_IN|WO_IS, 0);
if( pAlt==0 ) continue;
if( pAlt->wtFlags & (TERM_CODED) ) continue;
testcase( pAlt->eOperator & WO_EQ );
testcase( pAlt->eOperator & WO_IS );
testcase( pAlt->eOperator & WO_IN );
VdbeModuleComment((v, "begin transitive constraint"));
sEAlt = *pAlt->pExpr;
sEAlt.pLeft = pE->pLeft;
sqlite3ExprIfFalse(pParse, &sEAlt, addrCont, SQLITE_JUMPIFNULL);
| > > > > > > | 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 |
pE = pTerm->pExpr;
assert( !ExprHasProperty(pE, EP_FromJoin) );
assert( (pTerm->prereqRight & pLevel->notReady)!=0 );
pAlt = sqlite3WhereFindTerm(pWC, iCur, pTerm->u.leftColumn, notReady,
WO_EQ|WO_IN|WO_IS, 0);
if( pAlt==0 ) continue;
if( pAlt->wtFlags & (TERM_CODED) ) continue;
if( (pAlt->eOperator & WO_IN)
&& (pAlt->pExpr->flags & EP_xIsSelect)
&& (pAlt->pExpr->x.pSelect->pEList->nExpr>1)
){
continue;
}
testcase( pAlt->eOperator & WO_EQ );
testcase( pAlt->eOperator & WO_IS );
testcase( pAlt->eOperator & WO_IN );
VdbeModuleComment((v, "begin transitive constraint"));
sEAlt = *pAlt->pExpr;
sEAlt.pLeft = pE->pLeft;
sqlite3ExprIfFalse(pParse, &sEAlt, addrCont, SQLITE_JUMPIFNULL);
|
| ︙ | ︙ |
Changes to test/rowvalue.test.
| ︙ | ︙ | |||
389 390 391 392 393 394 395 396 397 |
UPDATE t16c SET a=a WHERE a=3;
SELECT * FROM t16c;
} {
1 C B A D
2 z y x w
3 i ii iii iv
}
finish_test
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 389 390 391 392 393 394 395 396 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 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 |
UPDATE t16c SET a=a WHERE a=3;
SELECT * FROM t16c;
} {
1 C B A D
2 z y x w
3 i ii iii iv
}
do_execsql_test 17.0 {
CREATE TABLE b1(a, b);
CREATE TABLE b2(x);
}
do_execsql_test 17.1 {
SELECT * FROM b2 CROSS JOIN b1
WHERE b2.x=b1.a AND (b1.a, 2)
IN (VALUES(1, 2));
} {}
do_execsql_test 18.0 {
CREATE TABLE b3 ( a, b, PRIMARY KEY (a, b) );
CREATE TABLE b4 ( a );
CREATE TABLE b5 ( a, b );
INSERT INTO b3 VALUES (1, 1), (1, 2);
INSERT INTO b4 VALUES (1);
INSERT INTO b5 VALUES (1, 1), (1, 2);
}
do_execsql_test 18.1 {
SELECT * FROM b3 WHERE (SELECT b3.a, b3.b) IN ( SELECT a, b FROM b5 )
} {1 1 1 2}
do_execsql_test 18.2 {
SELECT * FROM b3 WHERE (VALUES(b3.a, b3.b)) IN ( SELECT a, b FROM b5 );
} {1 1 1 2}
do_execsql_test 18.3 {
SELECT * FROM b3 WHERE (b3.a, b3.b) IN ( SELECT a, b FROM b5 );
} {1 1 1 2}
do_execsql_test 18.4 {
SELECT * FROM b3 JOIN b4 ON b4.a = b3.a
WHERE (SELECT b3.a, b3.b) IN ( SELECT a, b FROM b5 );
} {1 1 1 1 2 1}
do_execsql_test 18.5 {
SELECT * FROM b3 JOIN b4 ON b4.a = b3.a
WHERE (VALUES(b3.a, b3.b)) IN ( SELECT a, b FROM b5 );
} {1 1 1 1 2 1}
do_execsql_test 18.6 {
SELECT * FROM b3 JOIN b4 ON b4.a = b3.a
WHERE (b3.a, b3.b) IN ( SELECT a, b FROM b5 );
} {1 1 1 1 2 1}
finish_test
finish_test
|