Do not mistake constant integers in a PARTITION BY expression for references to ORDER BY style references to values returned by the SELECT statement.
FossilOrigin-Name: 45c64d39d5afed7fdc6b1de19408559740d1fba1f5e0269ab68b132366a289e4
This commit is contained in:
dan
parent
09bee5743d
commit
d8d2fb9222
20
manifest
20
manifest
@ -1,5 +1,5 @@
|
||||
C Follow-up\sto\scheck-in\s[c8c6dd0e6582ec91]\s-\schange\sthe\sxAccess()\smethod\sto\nreturn\strue\sif\sthe\sfile\sexists\sand\sit\sis\sanything\sother\sthan\sa\sregular\sfile,\nor\sif\sit\sis\sa\sregular\sfile\swith\sa\snon-zero\sfile\ssize.
|
||||
D 2019-12-27T13:30:46.798
|
||||
C Do\snot\smistake\sconstant\sintegers\sin\sa\sPARTITION\sBY\sexpression\sfor\sreferences\sto\sORDER\sBY\sstyle\sreferences\sto\svalues\sreturned\sby\sthe\sSELECT\sstatement.
|
||||
D 2019-12-27T15:31:47.514
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
@ -618,7 +618,7 @@ F src/where.c 58653781a4b31fa16b95b953591fdc1f1ed5ff77574e59b90a27da3819b60a46
|
||||
F src/whereInt.h 4a296fd4fa79fdcbc2b5e8c1b898901617655811223e1082b899c23ecb092217
|
||||
F src/wherecode.c d42d3e0fe93786621b84dec8065e1dc6b324d7c5934df52f141555843b6aef4e
|
||||
F src/whereexpr.c 4b34be1434183e7bb8a05d4bf42bd53ea53021b0b060936fbd12062b4ff6b396
|
||||
F src/window.c a5b69ea3cd22555d390582771173a68c1b798a0847aef3bd9eb51792bc6fcacb
|
||||
F src/window.c c5c7da1a28123a3697f59ad0c90dd0ec3ed820ee34691be31d5cdadbaf2c5c38
|
||||
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
|
||||
F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
|
||||
F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
|
||||
@ -1714,9 +1714,9 @@ F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2
|
||||
F test/win32lock.test fbf107c91d8f5512be5a5b87c4c42ab9fdd54972
|
||||
F test/win32longpath.test 169c75a3b2e43481f4a62122510210c67b08f26d
|
||||
F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
|
||||
F test/window1.test 7619f715b551abce33397bfb4e50bcb7fc1f49824c0433aacd53e678a1f0153d
|
||||
F test/window2.tcl 114b217d4ffff891142023cc5f3131b0dae3ad149ac4b45a6ed9e2ad943f8ce2
|
||||
F test/window2.test dea2ffecb7182a385143ea0eb368b6241ee43c5f971f4ad1c4337029cb1fc10a
|
||||
F test/window1.test f091ea2dadaca112a0dab983a1055e21eda8d7829f43e73f75fb10651e80cc62
|
||||
F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1476
|
||||
F test/window2.test e466a88bd626d66edc3d352d7d7e1d5531e0079b549ba44efb029d1fbff9fd3c
|
||||
F test/window3.tcl acea6e86a4324a210fd608d06741010ca83ded9fde438341cb978c49928faf03
|
||||
F test/window3.test e9959a993c8a71e96433be8daaa1827d78b8921e4f12debd7bdbeb3c856ef3cb
|
||||
F test/window4.tcl d732df0e81beedc0ba8a563ade68611d322d27303ad0c0c8e4444107c39e84ec
|
||||
@ -1853,7 +1853,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P 1ffc045d2bbeeda9c13a3a3585538ff6434fc852b0ae6679d3c8b9f606bf92e6
|
||||
R b54a424c126e1e000b0a94ae223fb870
|
||||
U drh
|
||||
Z 3439b330e9610c269373f686cac6131c
|
||||
P 8a39803ef8db4d8cb0d231e66299525fad4e61266ca29b3704aebb88df1c745b
|
||||
R 2e599939602f27f3650e444e6b56fe0f
|
||||
U dan
|
||||
Z 8fb26a7185f0be454adde39ec4ab299d
|
||||
|
||||
@ -1 +1 @@
|
||||
8a39803ef8db4d8cb0d231e66299525fad4e61266ca29b3704aebb88df1c745b
|
||||
45c64d39d5afed7fdc6b1de19408559740d1fba1f5e0269ab68b132366a289e4
|
||||
@ -894,9 +894,10 @@ static ExprList *exprListAppendList(
|
||||
int i;
|
||||
int nInit = pList ? pList->nExpr : 0;
|
||||
for(i=0; i<pAppend->nExpr; i++){
|
||||
int iDummy;
|
||||
Expr *pDup = sqlite3ExprDup(pParse->db, pAppend->a[i].pExpr, 0);
|
||||
assert( pDup==0 || !ExprHasProperty(pDup, EP_MemToken) );
|
||||
if( bIntToNull && pDup && pDup->op==TK_INTEGER ){
|
||||
if( bIntToNull && pDup && sqlite3ExprIsInteger(pDup, &iDummy) ){
|
||||
pDup->op = TK_NULL;
|
||||
pDup->flags &= ~(EP_IntValue|EP_IsTrue|EP_IsFalse);
|
||||
pDup->u.zToken = 0;
|
||||
@ -947,7 +948,7 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){
|
||||
/* Create the ORDER BY clause for the sub-select. This is the concatenation
|
||||
** of the window PARTITION and ORDER BY clauses. Then, if this makes it
|
||||
** redundant, remove the ORDER BY from the parent SELECT. */
|
||||
pSort = sqlite3ExprListDup(db, pMWin->pPartition, 0);
|
||||
pSort = exprListAppendList(pParse, 0, pMWin->pPartition, 1);
|
||||
pSort = exprListAppendList(pParse, pSort, pMWin->pOrderBy, 1);
|
||||
if( pSort && p->pOrderBy && p->pOrderBy->nExpr<=pSort->nExpr ){
|
||||
int nSave = pSort->nExpr;
|
||||
|
||||
@ -1363,12 +1363,43 @@ do_execsql_test 39.4 {
|
||||
|
||||
# 2019-12-25 ticket d87336c81c7d0873
|
||||
#
|
||||
reset_db
|
||||
do_catchsql_test 40.1 {
|
||||
CREATE VIRTUAL TABLE t0 USING rtree(c0, c1, c2);
|
||||
SELECT * FROM t0
|
||||
WHERE ((0,0) IN (SELECT COUNT(*),LAG(5)OVER(PARTITION BY 0) FROM t0),0)<=(c1,0);
|
||||
} {1 {1st ORDER BY term out of range - should be between 1 and 3}}
|
||||
#reset_db
|
||||
#do_catchsql_test 40.1 {
|
||||
# CREATE VIRTUAL TABLE t0 USING rtree(c0, c1, c2);
|
||||
# SELECT * FROM t0
|
||||
# WHERE ((0,0) IN (SELECT COUNT(*),LAG(5)OVER(PARTITION BY 0) FROM t0),0)<=(c1,0);
|
||||
#} {1 {1st ORDER BY term out of range - should be between 1 and 3}}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
reset_db
|
||||
do_execsql_test 41.1 {
|
||||
CREATE TABLE t1(a, b, c);
|
||||
INSERT INTO t1 VALUES(NULL,'bb',355);
|
||||
INSERT INTO t1 VALUES('CC','aa',158);
|
||||
INSERT INTO t1 VALUES('GG','bb',929);
|
||||
INSERT INTO t1 VALUES('FF','Rb',574);
|
||||
}
|
||||
|
||||
do_execsql_test 41.2 {
|
||||
SELECT min(c) OVER (
|
||||
ORDER BY a RANGE BETWEEN 5.2 PRECEDING AND 0.1 PRECEDING
|
||||
) FROM t1
|
||||
} {355 158 574 929}
|
||||
|
||||
do_execsql_test 41.2 {
|
||||
SELECT min(c) OVER (
|
||||
ORDER BY a RANGE BETWEEN 5.2 PRECEDING AND 0.1 PRECEDING
|
||||
) << 100 FROM t1
|
||||
} {0 0 0 0}
|
||||
|
||||
do_execsql_test 41.3 {
|
||||
SELECT
|
||||
min(c) OVER win3 << first_value(c) OVER win3,
|
||||
min(c) OVER win3 << first_value(c) OVER win3
|
||||
FROM t1
|
||||
WINDOW win3 AS (
|
||||
PARTITION BY 6 ORDER BY a RANGE BETWEEN 5.2 PRECEDING AND 0.1 PRECEDING
|
||||
);
|
||||
} {0 0 0 0 0 0 0 0}
|
||||
|
||||
finish_test
|
||||
|
||||
@ -463,6 +463,32 @@ execsql_test 6.2 {
|
||||
(0, t0.c0) IN (SELECT DENSE_RANK() OVER(), LAG(0) OVER() FROM t0);
|
||||
}
|
||||
|
||||
==========
|
||||
|
||||
execsql_test 7.0 {
|
||||
DROP TABLE IF EXISTS t1;
|
||||
CREATE TABLE t1(a INTEGER, b INTEGER, c INTEGER);
|
||||
INSERT INTO t1 VALUES(1, 1, 1);
|
||||
INSERT INTO t1 VALUES(1, 2, 2);
|
||||
INSERT INTO t1 VALUES(3, 3, 3);
|
||||
INSERT INTO t1 VALUES(3, 4, 4);
|
||||
}
|
||||
|
||||
execsql_test 7.1 {
|
||||
SELECT c, sum(c) OVER win1 FROM t1
|
||||
WINDOW win1 AS (ORDER BY b)
|
||||
}
|
||||
|
||||
execsql_test 7.2 {
|
||||
SELECT c, sum(c) OVER win1 FROM t1
|
||||
WINDOW win1 AS (PARTITION BY 1 ORDER BY b)
|
||||
}
|
||||
|
||||
execsql_test 7.3 {
|
||||
SELECT c, sum(c) OVER win1 FROM t1
|
||||
WINDOW win1 AS (ORDER BY 1)
|
||||
}
|
||||
|
||||
finish_test
|
||||
|
||||
|
||||
|
||||
@ -947,4 +947,30 @@ do_execsql_test 6.2 {
|
||||
(0, t0.c0) IN (SELECT DENSE_RANK() OVER(), LAG(0) OVER() FROM t0);
|
||||
} {}
|
||||
|
||||
#==========================================================================
|
||||
|
||||
do_execsql_test 7.0 {
|
||||
DROP TABLE IF EXISTS t1;
|
||||
CREATE TABLE t1(a INTEGER, b INTEGER, c INTEGER);
|
||||
INSERT INTO t1 VALUES(1, 1, 1);
|
||||
INSERT INTO t1 VALUES(1, 2, 2);
|
||||
INSERT INTO t1 VALUES(3, 3, 3);
|
||||
INSERT INTO t1 VALUES(3, 4, 4);
|
||||
} {}
|
||||
|
||||
do_execsql_test 7.1 {
|
||||
SELECT c, sum(c) OVER win1 FROM t1
|
||||
WINDOW win1 AS (ORDER BY b)
|
||||
} {1 1 2 3 3 6 4 10}
|
||||
|
||||
do_execsql_test 7.2 {
|
||||
SELECT c, sum(c) OVER win1 FROM t1
|
||||
WINDOW win1 AS (PARTITION BY 1 ORDER BY b)
|
||||
} {1 1 2 3 3 6 4 10}
|
||||
|
||||
do_execsql_test 7.3 {
|
||||
SELECT c, sum(c) OVER win1 FROM t1
|
||||
WINDOW win1 AS (ORDER BY 1)
|
||||
} {1 10 2 10 3 10 4 10}
|
||||
|
||||
finish_test
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user