From: drh <> Date: Fri, 9 Aug 2024 18:42:01 +0000 (+0000) Subject: Fix another instance where ALTER TABLE was returning SQLITE_INTERNAL instead X-Git-Tag: version-3.47.0~242 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c60c928717aa56cce9b70c95c7c505756aded9c5;p=thirdparty%2Fsqlite.git Fix another instance where ALTER TABLE was returning SQLITE_INTERNAL instead of SQLITE_ERROR one malformed input. FossilOrigin-Name: b416756320dfb46ad72b843a7fbf18807d3fd1966251c320de626280b5238a5c --- diff --git a/manifest b/manifest index 1939d75760..ea58ba7fcd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\sinternal\sroutine\ssqlite3ResolveExprListNames()\sso\sthat\sit\sreturns\nSQLITE_OK\sor\sSQLITE_ERROR\sinstead\sof\sWRC_Continue\sor\sWRC_Abort.\s\sWithout\sthis\nfix,\ssome\stimes\sof\sobscure\ssyntax\serrors\send\sup\sreturning\sSQLITE_INTERNAL\nrather\sthan\sSQLITE_ERROR. -D 2024-08-09T18:18:11.368 +C Fix\sanother\sinstance\swhere\sALTER\sTABLE\swas\sreturning\sSQLITE_INTERNAL\sinstead\nof\sSQLITE_ERROR\sone\smalformed\sinput. +D 2024-08-09T18:42:01.488 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -692,7 +692,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2 -F src/alter.c e1b6782b85dd758f89e5c588e4e3eb82638c2dafc0c857b79a43bb8ec1746fca +F src/alter.c bb663fddf1fe0e2e6d8758b2b7fb6374e7c057a6ca3955f37a48986806029765 F src/analyze.c 5c4e2bfd0aa8e5157f7fb91a17d86905510a74397326dc5767ec4e0588a4eea5 F src/attach.c cc9d00d30da916ff656038211410ccf04ed784b7564639b9b61d1839ed69fd39 F src/auth.c 19b7ccacae3dfba23fc6f1d0af68134fa216e9040e53b0681b4715445ea030b4 @@ -2204,8 +2204,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 7e1dc263051cf50db04643d1a2aa9f91559b2b121859b750ce4446012d5f3c3e -R c2e409b8bb5a5130f0d0a1d7f8083bf5 +P 9052187efd1f78abd9b285ac94269a3ba4d65b6aa74c9fa34002ee0628c83919 +R cfcbe2c3b80f7c18c681a7771600d22b U drh -Z 115f5c56758e5bdc8ade5fed3254bde0 +Z 27325e8a3b0694b1cf9e0c044251f29f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e2642285da..eda87af4fe 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9052187efd1f78abd9b285ac94269a3ba4d65b6aa74c9fa34002ee0628c83919 +b416756320dfb46ad72b843a7fbf18807d3fd1966251c320de626280b5238a5c diff --git a/src/alter.c b/src/alter.c index c1e0a295a4..a8556d115e 100644 --- a/src/alter.c +++ b/src/alter.c @@ -1320,7 +1320,7 @@ static int renameResolveTrigger(Parse *pParse){ /* ALWAYS() because if the table of the trigger does not exist, the ** error would have been hit before this point */ if( ALWAYS(pParse->pTriggerTab) ){ - rc = sqlite3ViewGetColumnNames(pParse, pParse->pTriggerTab); + rc = sqlite3ViewGetColumnNames(pParse, pParse->pTriggerTab)!=0; } /* Resolve symbols in WHEN clause */