mirror of
https://github.com/sqlite/sqlite.git
synced 2025-07-30 19:03:16 +03:00
Fix a problem with renaming tables when the schema contains WINDOW definitions with (illegal) non-numeric expressions as part of a PRECEDING or FOLLOWING clause.
FossilOrigin-Name: 348e7f193a963390a0595183d603541f85c5d1a911c98ed2e06599691ffe98f5
This commit is contained in:
14
manifest
14
manifest
@ -1,5 +1,5 @@
|
|||||||
C Fix\sa\sfaulty\sassert()\sin\swalker.c\sthat\scould\sfail\swhen\sprocessing\san\sALTER\sTABLE\sstatement\son\sa\sschema\scontaining\sinvalid\stable\sreferences\sthat\sare\spart\sof\sa\sWINDOW\sdefinition.
|
C Fix\sa\sproblem\swith\srenaming\stables\swhen\sthe\sschema\scontains\sWINDOW\sdefinitions\swith\s(illegal)\snon-numeric\sexpressions\sas\spart\sof\sa\sPRECEDING\sor\sFOLLOWING\sclause.
|
||||||
D 2019-07-19T10:31:29.400
|
D 2019-07-19T11:20:42.298
|
||||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||||
@ -607,7 +607,7 @@ F src/vtab.c 1fa256c6ddad7a81e2a4dc080d015d4b0a7135767717d311298e47f6fca64bb3
|
|||||||
F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
|
F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
|
||||||
F src/wal.c bbd6838bd79c0a32144d482fb0b6a9d2d1a252fb3b16d5005ec30f2f80413b0d
|
F src/wal.c bbd6838bd79c0a32144d482fb0b6a9d2d1a252fb3b16d5005ec30f2f80413b0d
|
||||||
F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
|
F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
|
||||||
F src/walker.c 8fb08ed58d7dc8fc144ca6eab82bcb2e0f20b9824dc4279dd7a1fe75951dc2bc
|
F src/walker.c 20a8455cfd5ccd9ebbf9efe434b828b890ae71574a5659a95848d6f55cecd602
|
||||||
F src/where.c 2f508c9a6dd2a42ad2b692105e77eb92cdec201d32916962ccdeff71836acb52
|
F src/where.c 2f508c9a6dd2a42ad2b692105e77eb92cdec201d32916962ccdeff71836acb52
|
||||||
F src/whereInt.h 1b728f71654ebf8421a1715497a587f02d6f538e819af58dc826908f8577e810
|
F src/whereInt.h 1b728f71654ebf8421a1715497a587f02d6f538e819af58dc826908f8577e810
|
||||||
F src/wherecode.c 37a1004237d630d785c47bba2290eac652a7a8b0047518eba3cb7c808b604c4a
|
F src/wherecode.c 37a1004237d630d785c47bba2290eac652a7a8b0047518eba3cb7c808b604c4a
|
||||||
@ -632,7 +632,7 @@ F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74
|
|||||||
F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
|
F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
|
||||||
F test/altertab.test b6901287474841cffbd8f90b098d3bd7d8445868b42caeb01b27034698f7245f
|
F test/altertab.test b6901287474841cffbd8f90b098d3bd7d8445868b42caeb01b27034698f7245f
|
||||||
F test/altertab2.test 8883693952f6d7fb5f754dbf1d694ed780aa883027bef04cb1fb99a3b88c9272
|
F test/altertab2.test 8883693952f6d7fb5f754dbf1d694ed780aa883027bef04cb1fb99a3b88c9272
|
||||||
F test/altertab3.test 4f9dbe767c0f8892d0026b89f7b645b2b2fcd64d4940d9323fbd187955280637
|
F test/altertab3.test 45b866733bb526d642484744ba41e974ce65e8563f57168bac82affdf7b991c8
|
||||||
F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
|
F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
|
||||||
F test/analyze.test 7168c8bffa5d5cbc53c05b7e9c7fcdd24b365a1bc5046ce80c45efa3c02e6b7c
|
F test/analyze.test 7168c8bffa5d5cbc53c05b7e9c7fcdd24b365a1bc5046ce80c45efa3c02e6b7c
|
||||||
F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
|
F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
|
||||||
@ -1837,7 +1837,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
|||||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||||
P 47e23064ba0205148f89e12803a62d5a4d6d2054f593f60c031e815112170b9b
|
P ee076c28d8ee0f5b099cdef83ae6cea6ef5aa209ab528d7c49949dd653ce019c
|
||||||
R e89233ca9746832ca908e8f9e9b030aa
|
R 0b60d24c884cd826c60ea99ee8676ab8
|
||||||
U dan
|
U dan
|
||||||
Z 89e5bf4fbbc31e53338b8409286bf1a6
|
Z de3c59a233ee09a2ce4ce825f6d983b0
|
||||||
|
@ -1 +1 @@
|
|||||||
ee076c28d8ee0f5b099cdef83ae6cea6ef5aa209ab528d7c49949dd653ce019c
|
348e7f193a963390a0595183d603541f85c5d1a911c98ed2e06599691ffe98f5
|
@ -28,6 +28,8 @@ static int walkWindowList(Walker *pWalker, Window *pList){
|
|||||||
if( sqlite3WalkExprList(pWalker, pWin->pOrderBy) ) return WRC_Abort;
|
if( sqlite3WalkExprList(pWalker, pWin->pOrderBy) ) return WRC_Abort;
|
||||||
if( sqlite3WalkExprList(pWalker, pWin->pPartition) ) return WRC_Abort;
|
if( sqlite3WalkExprList(pWalker, pWin->pPartition) ) return WRC_Abort;
|
||||||
if( sqlite3WalkExpr(pWalker, pWin->pFilter) ) return WRC_Abort;
|
if( sqlite3WalkExpr(pWalker, pWin->pFilter) ) return WRC_Abort;
|
||||||
|
if( sqlite3WalkExpr(pWalker, pWin->pStart) ) return WRC_Abort;
|
||||||
|
if( sqlite3WalkExpr(pWalker, pWin->pEnd) ) return WRC_Abort;
|
||||||
}
|
}
|
||||||
return WRC_Continue;
|
return WRC_Continue;
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,7 @@ ifcapable !altertable {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ifcapable windowfunc {
|
ifcapable windowfunc {
|
||||||
do_execsql_test 1.0 {
|
do_execsql_test 1.0 {
|
||||||
CREATE TABLE t1(a, b);
|
CREATE TABLE t1(a, b);
|
||||||
@ -273,4 +274,48 @@ do_execsql_test 11.4 {
|
|||||||
END}
|
END}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
reset_db
|
||||||
|
do_execsql_test 12.1 {
|
||||||
|
CREATE TABLE t1(a,b,c,d,e,f,g,h,j,jj,Zjj,k,aQ,bb,cc,dd,ee DEFAULT 3.14,
|
||||||
|
ff DEFAULT('hiccup'),gg NOD NULL DEFAULT(false));
|
||||||
|
CREATE TRIGGER AFTER INSERT ON t1 WHEN new.a NOT NULL BEGIN
|
||||||
|
|
||||||
|
SELECT b () OVER , dense_rank() OVER d, d () OVER w1
|
||||||
|
FROM t1
|
||||||
|
WINDOW
|
||||||
|
w1 AS
|
||||||
|
( w1 ORDER BY d
|
||||||
|
ROWS BETWEEN 2 NOT IN(SELECT a, sum(d) w2,max(d)OVER FROM t1
|
||||||
|
WINDOW
|
||||||
|
w1 AS
|
||||||
|
(PARTITION BY d
|
||||||
|
ROWS BETWEEN '' PRECEDING AND false FOLLOWING),
|
||||||
|
d AS
|
||||||
|
(PARTITION BY b ORDER BY d
|
||||||
|
ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)
|
||||||
|
) PRECEDING AND 1 FOLLOWING),
|
||||||
|
w2 AS
|
||||||
|
(PARTITION BY b ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW),
|
||||||
|
w3 AS
|
||||||
|
(PARTITION BY b ORDER BY d
|
||||||
|
ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
|
||||||
|
;
|
||||||
|
SELECT a, sum(d) w2,max(d)OVER FROM t1
|
||||||
|
WINDOW
|
||||||
|
w1 AS
|
||||||
|
(PARTITION BY d
|
||||||
|
ROWS BETWEEN '' PRECEDING AND false FOLLOWING),
|
||||||
|
d AS
|
||||||
|
(PARTITION BY b ORDER BY d
|
||||||
|
ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)
|
||||||
|
;
|
||||||
|
|
||||||
|
END;
|
||||||
|
}
|
||||||
|
|
||||||
|
do_execsql_test 12.2 {
|
||||||
|
ALTER TABLE t1 RENAME TO t1x;
|
||||||
|
}
|
||||||
|
|
||||||
finish_test
|
finish_test
|
||||||
|
Reference in New Issue
Block a user