From: drh <> Date: Sun, 16 Jan 2022 15:15:39 +0000 (+0000) Subject: Fix ALTER TABLE so that it works even when compiled using -DSQLITE_DQS=0. X-Git-Tag: version-3.38.0~110 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72e30421c89695319fa43de906a70ff862fcfe89;p=thirdparty%2Fsqlite.git Fix ALTER TABLE so that it works even when compiled using -DSQLITE_DQS=0. [forum:/forumpost/3c1a00b66fca81fe|Forum post 3c1a00b66fca81fe]. FossilOrigin-Name: 092ad64faa4ae93b1e09ccd52159621d619e6817bcb4573331e9053d97f731fd --- diff --git a/manifest b/manifest index 8a89d2047f..ee75ef3514 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\scode\sfrom\slemon.c\sthat\swas\smade\ssuperfluous\sby\n[1b22b42e59793af1|check-in\s1b22b42e59793af1]\sin\slate\s2017. -D 2022-01-14T23:28:11.398 +C Fix\sALTER\sTABLE\sso\sthat\sit\sworks\seven\swhen\scompiled\susing\s-DSQLITE_DQS=0.\n[forum:/forumpost/3c1a00b66fca81fe|Forum\spost\s3c1a00b66fca81fe]. +D 2022-01-16T15:15:39.462 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -484,7 +484,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a -F src/alter.c 16f8d91b1e4b3e6d897a5fa510c8dc1b07608271035a5dd8406bc98f651a40dc +F src/alter.c 67ef8e685f547038b7ad93a7c6571f790d0a5bb1c00632d5466ffb4ccf3ee6e8 F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516 F src/attach.c e3f9d9a2a4a844750f3f348f37afb244535f21382cbfcd840152cb21cb41cfaf F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf @@ -1938,8 +1938,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 7ac91b5339f820f49b0eb52055d42b6a55905444883426caf792fada63079516 -R ff666181f2a85a04957bd203bbe88b01 +P 6d2f95a474a0c196f36317d88557bfb449ce125c1d012fc1844378c450697a05 +R edf422449e950a9b96ca2ad2b3d1f178 U drh -Z 853e6d43a6efc62c14e9df65e39f1443 +Z 5c0bbd29d71814fcf121ab4dcce9c42d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7fa604a86b..81200ecd82 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6d2f95a474a0c196f36317d88557bfb449ce125c1d012fc1844378c450697a05 \ No newline at end of file +092ad64faa4ae93b1e09ccd52159621d619e6817bcb4573331e9053d97f731fd \ No newline at end of file diff --git a/src/alter.c b/src/alter.c index f76a59dea6..f3f4f570e6 100644 --- a/src/alter.c +++ b/src/alter.c @@ -450,7 +450,7 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ " THEN raise(ABORT,'CHECK constraint failed')" " ELSE raise(ABORT,'NOT NULL constraint failed')" " END" - " FROM pragma_quick_check(\"%w\",\"%w\")" + " FROM pragma_quick_check(%Q,%Q)" " WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'", zTab, zDb );