From: drh <>
Date: Tue, 20 Aug 2024 14:16:26 +0000 (+0000)
Subject: When the database encoding is UTF-16LE and the GLOB optimization is used,
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22fa015c1b9f7771876f136ed82594520d6eb29e;p=thirdparty%2Fsqlite.git

When the database encoding is UTF-16LE and the GLOB optimization is used,
it is ok to use the range search over an index, but it is not ok to
disable the actual GLOB function call.

FossilOrigin-Name: db917d50fda6eb7ba50dfebbf56ffdc7a97411e35f19733166ecd97a62573054
---

diff --git a/manifest b/manifest
index 619a940621..41ce3e41e7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sLIKE/GLOB\soptimization\srestricts\sits\sattention\sto\nthe\spattern\sprefix\sthat\sis\sall\sASCII.
-D 2024-08-20T12:15:08.795
+C When\sthe\sdatabase\sencoding\sis\sUTF-16LE\sand\sthe\sGLOB\soptimization\sis\sused,\nit\sis\sok\sto\suse\sthe\srange\ssearch\sover\san\sindex,\sbut\sit\sis\snot\sok\sto\ndisable\sthe\sactual\sGLOB\sfunction\scall.
+D 2024-08-20T14:16:26.003
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -842,7 +842,7 @@ F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
 F src/where.c 839956666ce9f6b5d4951fc1f27e976951aac66920c82f9cdc5036b61b54ef7b
 F src/whereInt.h 82a13766f13d1a53b05387c2e60726289ef26404bc7b9b1f7770204d97357fb8
 F src/wherecode.c f5255f49d1f42b6e7e6b0362ff3522fa88cbcaa7213e52f9374744027ecdebca
-F src/whereexpr.c c9a7a316b90db8904721a3c7bef7ed7784c290b50e66b38d7ceb6b3d55b4369d
+F src/whereexpr.c 1d350f8ddb7d8740423341d0289d899bf3b287faad8d19c815b6715d396bc919
 F src/window.c 5d95122dd330bfaebd732358c8ef067c5a9394a53ac249470d611d0ce2c52be2
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -2192,9 +2192,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6767bf1c6713795a360da218a4e0f8106a264b54333849dd18b951ef6a82cba4
-Q +a5797ebdea423afc3d2d3bd8adaf1575d33a01f594c0c315afcb1499f1718e9b
-R 6ae4235d229175ca41696bab784b34cf
+P 5815f13263b58c5cd9833f18c7fd8e5463255814d4cba72a5ed427cbd8105f8c
+Q +3399698376761ab8c422f8ea02bfa2759afb606f08bedbd1cf7eee834229a9aa
+R d2203ff194def87e514816fce29e69fb
 U drh
-Z 43e922e062feb2d968832b46f3a6397c
+Z 198dbb9ad980cd5bd269a3450525f65e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 41a6e77263..ba3a20aad0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5815f13263b58c5cd9833f18c7fd8e5463255814d4cba72a5ed427cbd8105f8c
+db917d50fda6eb7ba50dfebbf56ffdc7a97411e35f19733166ecd97a62573054
diff --git a/src/whereexpr.c b/src/whereexpr.c
index 992ac07264..1a2267bb0e 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -242,7 +242,7 @@ static int isLikeOrGlob(
       Expr *pPrefix;
 
       /* A "complete" match if the pattern ends with "*" or "%" */
-      *pisComplete = c==wc[0] && z[cnt+1]==0;
+      *pisComplete = c==wc[0] && z[cnt+1]==0 && ENC(db)!=SQLITE_UTF16LE;
 
       /* Get the pattern prefix.  Remove all escapes from the prefix. */
       pPrefix = sqlite3Expr(db, TK_STRING, (char*)z);