From 5155b75be2dd49bdc87cdc4e7b093b68a6298f7c Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Fri, 29 Mar 2019 11:39:41 +0000
Subject: [PATCH] The two-argument version of fts3_tokenizer() works regardless
 of the value of SQLITE_DBCONFIG_ENABLE_FT3_TOKENIZER as long as the second
 argument is a bind parameter.

FossilOrigin-Name: ab76e3a90e56bd36a17ded9c7a77e88632ca12d3bd73f197df747a634c81e0cf
---
 ext/fts3/fts3_tokenizer.c |  2 +-
 manifest                  | 17 +++++++----------
 manifest.uuid             |  2 +-
 test/fts3atoken.test      | 14 ++++++++++++++
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/ext/fts3/fts3_tokenizer.c b/ext/fts3/fts3_tokenizer.c
index 33c133a228..63b2fae430 100644
--- a/ext/fts3/fts3_tokenizer.c
+++ b/ext/fts3/fts3_tokenizer.c
@@ -79,7 +79,7 @@ static void fts3TokenizerFunc(
   nName = sqlite3_value_bytes(argv[0])+1;
 
   if( argc==2 ){
-    if( fts3TokenizerEnabled(context) ){
+    if( fts3TokenizerEnabled(context) || sqlite3_value_frombind(argv[1]) ){
       void *pOld;
       int n = sqlite3_value_bytes(argv[1]);
       if( zName==0 || n!=sizeof(pPtr) ){
diff --git a/manifest b/manifest
index ed7795770c..0124e63bc6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\simplementation\sof\sthe\ssqlite3_value_frombind()\sinterface.
-D 2019-03-29T11:13:37.087
+C The\stwo-argument\sversion\sof\sfts3_tokenizer()\sworks\sregardless\sof\sthe\nvalue\sof\sSQLITE_DBCONFIG_ENABLE_FT3_TOKENIZER\sas\slong\sas\sthe\ssecond\nargument\sis\sa\sbind\sparameter.
+D 2019-03-29T11:39:41.201
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -94,7 +94,7 @@ F ext/fts3/fts3_snippet.c 0d8362efa59637dc7c09dc88899eb072aa409fe1e0d0fdeda55ec1
 F ext/fts3/fts3_term.c f45a1e7c6ef464abb1231245d123dae12266b69e05cc56e14045b76591ae92d1
 F ext/fts3/fts3_test.c b6e9f3fd7155cb388c6bc203fb24817a721fb61d9ce28810c73fcfda8c16fda6
 F ext/fts3/fts3_tokenize_vtab.c 969c132816b6f46ee2c7efafd2547a9bfd50b0aac3f8cef3f2dca2cbd90639c7
-F ext/fts3/fts3_tokenizer.c ee670e9e0f0dc67fb78d235b2059397e4bf6a3ad8819885c2be6db08b3d35cde
+F ext/fts3/fts3_tokenizer.c edadbd11b4e2fab2b9a255618fdb5ffecd44cb4f0cfb8b29605c9831f3ee7cb5
 F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
 F ext/fts3/fts3_unicode.c 4b9af6151c29b35ed09574937083cece7c31e911f69615e168a39677569b684d
@@ -909,7 +909,7 @@ F test/fts3al.test 07d64326e79bbdbab20ee87fc3328fbf01641c9f
 F test/fts3am.test 218aa6ba0dfc50c7c16b2022aac5c6be593d08d8
 F test/fts3an.test a49ccadc07a2f7d646ec1b81bc09da2d85a85b18
 F test/fts3ao.test 266989148fec6d9f1bb6c5382f7aa3dcea0e9cd444576e28dd2b9287ac7dd220
-F test/fts3atoken.test b7a50a58177af017ecda446e66e84d48e21e850e39e8750f1aedad0fd891450e
+F test/fts3atoken.test 8e3fa6d3f13be3fab6b3fbca97a652de75c45dcaa6d07ef26a81be11af541071
 F test/fts3auto.test 19097050a3ca7ab7a43b2be967cb3dfd8ddf841dfdc4eac88deb172ad2f209f2
 F test/fts3aux1.test 7a170e172afdbceb67f5baa05941fd4fbf56af42f61daa3d140f4b4bf4cb68f6
 F test/fts3aux2.test 2459e7fa3e22734aed237d1e2ae192f5541c4d8b218956ad2d90754977bf907f
@@ -1813,10 +1813,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 965cbcea117835d2c6d2ec58c8025b227f491c35805e282cb31228436bc6bec1
-R a5f91d5ae4a62cededad3857c6b176e7
-T *branch * value_frombind
-T *sym-value_frombind *
-T -sym-trunk *
+P 98da62dfdacc6b3c490c387d1f8a74cc5daa978776967e264ad4800c380b0ddf
+R 488cee08ad29a4e34bb8a5a0b142d960
 U drh
-Z 4dc0402dbd3994ae8b5cae8ff0562029
+Z 60f403e8d960cff295e80d2d31c9a224
diff --git a/manifest.uuid b/manifest.uuid
index ab7c63b4d6..360af6bf33 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-98da62dfdacc6b3c490c387d1f8a74cc5daa978776967e264ad4800c380b0ddf
\ No newline at end of file
+ab76e3a90e56bd36a17ded9c7a77e88632ca12d3bd73f197df747a634c81e0cf
\ No newline at end of file
diff --git a/test/fts3atoken.test b/test/fts3atoken.test
index 4df0be2a02..bc9b4d965e 100644
--- a/test/fts3atoken.test
+++ b/test/fts3atoken.test
@@ -86,10 +86,24 @@ do_test fts3atoken-1.5 {
   }
 } {{There was movement at the station}}
 
+unset -nocomplain simple
+set simple [db one {SELECT fts3_tokenizer('simple')}]
 sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 0
 do_catchsql_test 1.6 {
   SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL;
 } {1 {fts3tokenize disabled}}
+do_test fts3atoken-1.7 {
+  execsql {
+    SELECT fts3_tokenizer('blah2', $simple) IS NULL;
+  }
+} {1}
+sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1
+do_test fts3atoken-1.8 {
+  execsql {
+    SELECT fts3_tokenizer('blah2') == fts3_tokenizer('simple');
+  }
+} {1}
+
 
 
 #--------------------------------------------------------------------------