From: dan <Dan Kennedy>
Date: Tue, 10 Sep 2024 20:32:36 +0000 (+0000)
Subject: Alternative implementation of fts5 locale=1 feature that allows blobs to be stored... 
X-Git-Tag: version-3.47.0~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c8144ab4f3521e2b9f8972de500a7e472ce4aa0;p=thirdparty%2Fsqlite.git

Alternative implementation of fts5 locale=1 feature that allows blobs to be stored in indexed columns of fts5 locale=1 tables.

FossilOrigin-Name: 198305de92ebba7045d8ec7d2de98511f3b00924f808a3811f061dca47b01ec7
---

0c8144ab4f3521e2b9f8972de500a7e472ce4aa0
diff --cc ext/fts5/fts5_main.c
index 6ccca8a3ee,e57902b6b7..db413b572a
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@@ -3099,8 -2976,21 +2976,22 @@@ static int fts5ColumnMethod
        rc = fts5SeekCursor(pCsr, 1);
        if( rc==SQLITE_OK ){
          sqlite3_value *pVal = sqlite3_column_value(pCsr->pStmt, iCol+1);
-         fts5ExtractValueFromColumn(pCtx, pConfig, iCol, pVal);
+         if( pConfig->bLocale 
+          && pConfig->eContent==FTS5_CONTENT_EXTERNAL 
+          && sqlite3Fts5IsLocaleValue(pConfig, pVal)
+         ){
+           const char *z = 0;
+           int n = 0;
+           rc = fts5TextFromStmt(pConfig, pCsr->pStmt, iCol, &z, &n);
+           if( rc==SQLITE_OK ){
+             sqlite3_result_text(pCtx, z, n, SQLITE_TRANSIENT);
+           }
++          sqlite3Fts5ClearLocale(pConfig);
+         }else{
+           sqlite3_result_value(pCtx, pVal);
+         }
        }
+ 
        pConfig->pzErrmsg = 0;
      }
    }
diff --cc manifest
index cfcc58cbf1,a62b503f19..b71c9002b3
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\stest\sin\sfts3corrupt4.test\sthat\swould\sfail\sif\sSQLITE_ENABLE_FTS5\swas\snot\sdefined.
- D 2024-09-10T16:40:08.960
 -C Remove\sa\sstray\s"breakpoint"\sfrom\sa\stest\sscript.
 -D 2024-09-10T18:38:47.977
++C Alternative\simplementation\sof\sfts5\slocale=1\sfeature\sthat\sallows\sblobs\sto\sbe\sstored\sin\sindexed\scolumns\sof\sfts5\slocale=1\stables.
++D 2024-09-10T20:32:36.789
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -100,8 -100,8 +100,8 @@@ F ext/fts5/fts5_config.c da21548ddbc1a4
  F ext/fts5/fts5_expr.c 9a56f53700d1860f0ee2f373c2b9074eaf2a7aa0637d0e27a6476de26a3fee33
  F ext/fts5/fts5_hash.c adda4272be401566a6e0ba1acbe70ee5cb97fce944bc2e04dc707152a0ec91b1
  F ext/fts5/fts5_index.c 571483823193f09439356741669aa8c81da838ae6f5e1bfa7517f7ee2fb3addd
- F ext/fts5/fts5_main.c 9124eba418eb0c608c1454c4ad08a5f1ac21a4748c36a44828a0a7a1b32ef896
- F ext/fts5/fts5_storage.c 42cde97eb7d8506a8d2c7ea80b292fc3017b1f5469e1acb0035a69c345e6cf71
 -F ext/fts5/fts5_main.c 774a4e6eddfa98e9f050f781c095e2dd49c8b69e82527cb9ccb8cabe78016052
++F ext/fts5/fts5_main.c 4503498d3453e29a3cd89dacaba029011e89cb8c481a6241611d106e7a369bd4
+ F ext/fts5/fts5_storage.c 3332497823c3d171cf56379f2bd8c971ce15a19aadacff961106462022c92470
  F ext/fts5/fts5_tcl.c 4db9258a7882c5eac0da4433042132aaf15b87dd1e1636c7a6ca203abd2c8bfe
  F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
  F ext/fts5/fts5_test_tok.c 3cb0a9b508b30d17ef025ccddd26ae3dc8ddffbe76c057616e59a9aa85d36f3b
@@@ -2212,8 -2212,8 +2212,9 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d8103684f660ff9b3186d0f89afb113ca580bd16f0bf413ed8a9434236b54426
- R aef238013a1ce5e62ad259c3eba70261
 -P 55c5c119a0a77fac2c9f46d718ef78c0f33ed3520e10c240cf5bf1801e0586ee
 -R 330e5898e93a7e63c9e09af30983e29e
++P 437849c80851da842b5c4fd37d5c147f821abc541e9b4d6f9000c12983548844 7d87a27a01311153ddee122cedecedc3bcc331618dc2ab1da397a3b257dc21cf
++R cbbfe15fbc887a71ab881832205b2d5a
++T +closed 7d87a27a01311153ddee122cedecedc3bcc331618dc2ab1da397a3b257dc21cf
  U dan
- Z ba098087a8d44fd7d814378cea692b59
 -Z 71835541a0fd0d777ae33c979ec9a5ae
++Z f39f2a1cdc64ffa8dc528a76af023d0e
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index a7511290dc,ab537b0361..e0567f9ee8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 437849c80851da842b5c4fd37d5c147f821abc541e9b4d6f9000c12983548844
 -7d87a27a01311153ddee122cedecedc3bcc331618dc2ab1da397a3b257dc21cf
++198305de92ebba7045d8ec7d2de98511f3b00924f808a3811f061dca47b01ec7