From: drh Date: Thu, 19 Dec 2019 13:17:07 +0000 (+0000) Subject: Fix incorrect SQL generated by the Lemon change of the previous check-in. X-Git-Tag: version-3.31.0~206 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59c56796917a28041e8f315abe1a376508413961;p=thirdparty%2Fsqlite.git Fix incorrect SQL generated by the Lemon change of the previous check-in. FossilOrigin-Name: fccfb8a9ed3c1df9f23762bb8df6fdf36a21118899e3fae41f451169a5f2c08e --- diff --git a/manifest b/manifest index d1d23aa0ca..91c07f8a4c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Modify\sthe\sparse.sql\soutput\sfile\sfrom\sLemon\sso\sthat\sthe\sRULE\stable\scontains\na\scolumn\swith\sthe\scomplete\stext\sof\sthe\srule. -D 2019-12-19T12:29:31.617 +C Fix\sincorrect\sSQL\sgenerated\sby\sthe\sLemon\schange\sof\sthe\sprevious\scheck-in. +D 2019-12-19T13:17:07.364 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1771,7 +1771,7 @@ F tool/genfkey.test b6afd7b825d797a1e1274f519ab5695373552ecad5cd373530c63533638a F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce F tool/index_usage.c 9ec344d29cbeb03fdc0fce668eedfb7495792170de933adf95cf8d6904a166ad F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f -F tool/lemon.c ac63a7a2915c2556a855ba2d069cdfc897304cdf9d07a20e2ce470120829acfe +F tool/lemon.c a361b85fa230560b783006ac002a6a8bad214c3b9d7fa48980aecc2b691ddcad F tool/lempar.c e8899b28488f060d0ff931539ea6311b16b22dce068c086c788a06d5e8d01ab7 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862 @@ -1852,7 +1852,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 062e00c4d7e30155299339eaefe6cbe01953894baebf0af6d7ab3295b7436eb7 -R 8d6cf8d0b9d8e79c2a551a0656e77e30 +P 329cbb372d4d77f774f01a87d104c40ef42d713afbe76195b65f5ca205c5ea7b +R d028a5f013795e21f082346da52e7329 U drh -Z bb2d2b67b4a54af65815a14c2eb7c3ad +Z 50186217141264fb7bf8cc1df4e95908 diff --git a/manifest.uuid b/manifest.uuid index a002c031fc..f064dd77ff 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -329cbb372d4d77f774f01a87d104c40ef42d713afbe76195b65f5ca205c5ea7b \ No newline at end of file +fccfb8a9ed3c1df9f23762bb8df6fdf36a21118899e3fae41f451169a5f2c08e \ No newline at end of file diff --git a/tool/lemon.c b/tool/lemon.c index bc53b06b9c..8dcf65179f 100644 --- a/tool/lemon.c +++ b/tool/lemon.c @@ -4234,7 +4234,7 @@ void ReportTable( for(i=0, rp=lemp->rule; rp; rp=rp->next, i++){ assert( i==rp->iRule ); fprintf(sql, - "INSERT INTO rule(ruleid,lhs)VALUES(%d,%d,'", + "INSERT INTO rule(ruleid,lhs,txt)VALUES(%d,%d,'", rp->iRule, rp->lhs->index ); writeRuleText(sql, rp);