database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Change a conditional into an assert() due to the change in

Browse Source 
[387ab17b8a0a4b87].

FossilOrigin-Name: 13b584869f40ea6aa2190dbac64709695ee8d72b27bc5afb8b39ab3763b9c46a
This commit is contained in:
drh
2022-03-17 23:49:58 +00:00
parent b45e1d674a
commit 389e056bfe
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
manifest
View File

@@ -1,5 +1,5 @@
C Add\sa\s4th\soutput\scode\s(value\s3)\sfrom\sthe\ssqlite3_vtab_distinct()\sinterface\nthat\sindicates\sthat\sSQLite\swants\sdistinct\sresults\sthat\sare\ssorted. C Change\sa\sconditional\sinto\san\sassert()\sdue\sto\sthe\schange\sin\n[387ab17b8a0a4b87].
D 2022-03-17T22:09:17.044 D 2022-03-17T23:49:58.567
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
@@ -618,7 +618,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
F src/tokenize.c 6661a9fa660ecbd3ac0df1acd2ec788b3a8122b4316022bcdaf476ea6754a8de F src/tokenize.c 6661a9fa660ecbd3ac0df1acd2ec788b3a8122b4316022bcdaf476ea6754a8de
F src/treeview.c 3fac35b0835998f34bc940cb07282c5c485caa1645135435fca07ba828c48463 F src/treeview.c 3fac35b0835998f34bc940cb07282c5c485caa1645135435fca07ba828c48463
F src/trigger.c 5fc3cde35cc4de510be68bb2db4dcff0ce0e1625f43e28a0920be9a6f010cd3f F src/trigger.c 8caa0baf1b18522863cf0fd611ef483962cfa50155ca82ad43e63b20f863a683
F src/update.c f875b0d59da5c3055a0b2ac20560e1650229c6787e78de5e9836267b5cbb8359 F src/update.c f875b0d59da5c3055a0b2ac20560e1650229c6787e78de5e9836267b5cbb8359
F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
@@ -1945,9 +1945,8 @@ 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 84ddd19bcec99f04b43b1a823477457758a2d93ea9beda43598e1234ea07776c 0c5be14aac07222b9cd2404ae485b6587f8cb2899e776bc45f1f1117bdd7e9b7 P 135d8b97b01f9b5204f486f828c274c2d779c17723e79171ca61f738746adf8e
R 3a06f6b09e46e5d74ffd1d941c48374e R 804c8964f2fbb5642c5ee5c7164de09a
T +closed 0c5be14aac07222b9cd2404ae485b6587f8cb2899e776bc45f1f1117bdd7e9b7
U drh U drh
Z b60aa89107b858dfaa16ff6d69f84def Z e27c445db2b5c5196ccb2b18d76e60e4
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@@ -1 +1 @@
135d8b97b01f9b5204f486f828c274c2d779c17723e79171ca61f738746adf8e 13b584869f40ea6aa2190dbac64709695ee8d72b27bc5afb8b39ab3763b9c46a

5
src/trigger.c
View File

@@ -67,11 +67,10 @@ Trigger *sqlite3TriggerList(Parse *pParse, Table *pTab){
){ ){
pTrig->pNext = pList; pTrig->pNext = pList;
pList = pTrig; pList = pTrig;
}else if( pTrig->op==TK_RETURNING }else if( pTrig->op==TK_RETURNING ){
#ifndef SQLITE_OMIT_VIRTUALTABLE #ifndef SQLITE_OMIT_VIRTUALTABLE
&& pParse->db->pVtabCtx==0 assert( pParse->db->pVtabCtx==0 );
#endif #endif
){
assert( pParse->bReturning ); assert( pParse->bReturning );
assert( &(pParse->u1.pReturning->retTrig) == pTrig ); assert( &(pParse->u1.pReturning->retTrig) == pTrig );
pTrig->table = pTab->zName; pTrig->table = pTab->zName;