Add simple tests for the xColumnText() extension api.

FossilOrigin-Name: 1e9053abdaf5e128d44504ee00dfd909dc25f378

diff --git a/ext/fts5/fts5.c b/ext/fts5/fts5.c
index 0db73196f27ebeeac358ae1aa7c7a345b173a198..eb688a7bc6dfb9d7662944732fcc2e4320b332d1 100644 (file)
--- a/ext/fts5/fts5.c
+++ b/ext/fts5/fts5.c
@@ -657,8 +657,8 @@ static int fts5ApiColumnText(
   Fts5Cursor *pCsr = (Fts5Cursor*)pCtx;
   int rc = fts5SeekCursor(pCsr);
   if( rc==SQLITE_OK ){
-    *pz = (const char*)sqlite3_column_text(pCsr->pStmt, iCol);
-    *pn = sqlite3_column_bytes(pCsr->pStmt, iCol);
+    *pz = (const char*)sqlite3_column_text(pCsr->pStmt, iCol+1);
+    *pn = sqlite3_column_bytes(pCsr->pStmt, iCol+1);
   }
   return rc;
 }

diff --git a/ext/fts5/fts5.h b/ext/fts5/fts5.h
index 4c8f6c0a67083d9073a871f2a3de8049d1ee003a..6e5176adbba8120fbe5ae05e25e4e4900ba1bd58 100644 (file)
--- a/ext/fts5/fts5.h
+++ b/ext/fts5/fts5.h
@@ -53,6 +53,9 @@ typedef void (*fts5_extension_function)(
 ** xColumnSize:
 **   Reports the size in tokens of a column value from the current row.
 **
+** xColumnText:
+**   Reports the size in tokens of a column value from the current row.
+**
 ** xPhraseCount:
 **   Returns the number of phrases in the current query expression.
 **

diff --git a/ext/fts5/fts5Int.h b/ext/fts5/fts5Int.h
index c56214c8d1f5caa6ec09aa763684487c4e8861fa..f274baa3f9ff31b0e629663b9270df53bad73d71 100644 (file)
--- a/ext/fts5/fts5Int.h
+++ b/ext/fts5/fts5Int.h
@@ -89,6 +89,7 @@ void sqlite3Fts5BufferFree(Fts5Buffer*);
 void sqlite3Fts5BufferZero(Fts5Buffer*);
 void sqlite3Fts5BufferSet(int*, Fts5Buffer*, int, const u8*);
 void sqlite3Fts5BufferAppendPrintf(int *, Fts5Buffer*, char *zFmt, ...);
+void sqlite3Fts5BufferAppendListElem(int*, Fts5Buffer*, const char*, int);
 
 #define fts5BufferZero(x)             sqlite3Fts5BufferZero(x)
 #define fts5BufferGrow(a,b,c)         sqlite3Fts5BufferGrow(a,b,c)

diff --git a/ext/fts5/fts5_aux.c b/ext/fts5/fts5_aux.c
index ed7beb932e309b61bc91cbbadcae5fcd4f9eee51..7345a68f29299fc2c83fbe148a48e5e60b35d826 100644 (file)
--- a/ext/fts5/fts5_aux.c
+++ b/ext/fts5/fts5_aux.c
@@ -65,6 +65,19 @@ static void fts5TestFunction(
     if( zReq==0 && nCol>1 ) sqlite3Fts5BufferAppendPrintf(&rc, &s, "}");
   }
 
+  if( zReq==0 ){
+    sqlite3Fts5BufferAppendPrintf(&rc, &s, "columntext ");
+  }
+  if( 0==zReq || 0==sqlite3_stricmp(zReq, "columntext") ){
+    for(i=0; rc==SQLITE_OK && i<nCol; i++){
+      const char *z;
+      int n;
+      rc = pApi->xColumnText(pFts, i, &z, &n);
+      if( i!=0 ) sqlite3Fts5BufferAppendPrintf(&rc, &s, " ");
+      sqlite3Fts5BufferAppendListElem(&rc, &s, z, n);
+    }
+  }
+
   if( zReq==0 ){
     sqlite3Fts5BufferAppendPrintf(&rc, &s, " phrasecount ");
   }

diff --git a/ext/fts5/fts5_buffer.c b/ext/fts5/fts5_buffer.c
index b69af615b98e35bd9249037e81f03ef9411e8853..b798ad21198e68ef97cb015d74d5b270b92d0a6d 100644 (file)
--- a/ext/fts5/fts5_buffer.c
+++ b/ext/fts5/fts5_buffer.c
@@ -232,4 +232,35 @@ int sqlite3Fts5PoslistNext(
   return 0;
 }
 
+void sqlite3Fts5BufferAppendListElem(
+  int *pRc,                       /* IN/OUT: Error code */
+  Fts5Buffer *pBuf,               /* Buffer to append to */
+  const char *z, int n            /* Value to append to buffer */
+){
+  int bParen = (n==0);
+  int nMax = n*2 + 2 + 1;
+  u8 *pOut;
+  int i;
+
+  /* Ensure the buffer has space for the new list element */
+  if( sqlite3Fts5BufferGrow(pRc, pBuf, nMax) ) return;
+  pOut = &pBuf->p[pBuf->n];
+
+  /* Figure out if we need the enclosing {} */
+  for(i=0; i<n && bParen==0; i++){
+    if( z[i]=='"' || z[i]==' ' ){
+      bParen = 1;
+    }
+  }
+
+  if( bParen ) *pOut++ = '{';
+  for(i=0; i<n; i++){
+    *pOut++ = z[i];
+  }
+  if( bParen ) *pOut++ = '}';
+
+  pBuf->n = pOut - pBuf->p;
+  *pOut = '\0';
+}
+
 

diff --git a/manifest b/manifest
index edef13b28fb2a16db6b532096a10b14494767b84..6019a0fb5d02a6c014e0178a2d1221c4e88d0574 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sfor\sthe\sxColumnSize()\sfts5\sextension\sAPI.
-D 2014-07-19T15:35:09.453
+C Add\ssimple\stests\sfor\sthe\sxColumnText()\sextension\sapi.
+D 2014-07-19T20:27:54.153
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -103,11 +103,11 @@ F ext/fts3/tool/fts3view.c 6cfc5b67a5f0e09c0d698f9fd012c784bfaa9197
 F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
 F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
 F ext/fts3/unicode/mkunicode.tcl dc6f268eb526710e2c6e496c372471d773d0c368
-F ext/fts5/fts5.c 86655d1e2ba35c719d3cc480cb9fdd7f3887b74e
-F ext/fts5/fts5.h 844898034fa3e0458d93a6c34dd6ba6bd3c7e03a
-F ext/fts5/fts5Int.h cca221a5cf7234f92faf3b4b5f2e4cf43bce83ee
-F ext/fts5/fts5_aux.c 978a90fe90a6d34d9bd260948b5678caf5489894
-F ext/fts5/fts5_buffer.c 71cf2016b2881e7aea39f952995eafa510d96cbd
+F ext/fts5/fts5.c fbd94670336eb95a26c705c1e4c188818720c888
+F ext/fts5/fts5.h 84060c2fe91aa03a783cc993f313d8a5b22cbe11
+F ext/fts5/fts5Int.h 5105506a180942811aa7104867518bc84d36c17a
+F ext/fts5/fts5_aux.c 75f9abf7a7ccc7712357f04eeb6297c64095528d
+F ext/fts5/fts5_buffer.c 00361d4a70040ebd2c32bc349ab708ff613a1749
 F ext/fts5/fts5_config.c 94f1b4cb4de6a7cd5780c14adb0198e289df8cef
 F ext/fts5/fts5_expr.c 288b3e016253eab69ea8cefbff346a4697b44291
 F ext/fts5/fts5_index.c 9ff3008e903aa9077b0a7a7aa76ab6080eb07a36
@@ -599,7 +599,7 @@ F test/fts5aa.test c8d3b9694f6b2864161c7437408464a535d19343
 F test/fts5ab.test dc04ed48cf93ca957d174406e6c192f2ff4f3397
 F test/fts5ac.test 9be418d037763f4cc5d86f4239db41fc86bb4f85
 F test/fts5ad.test 2ed38bbc865678cb2905247120d02ebba7f20e07
-F test/fts5ae.test 7da37ac01debf2e238552d0ef2f61669fd232936
+F test/fts5ae.test c95b106236ea2f9f151715311ad0a2e45c49ccc1
 F test/fts5ea.test ff43b40f8879ba50b82def70f2ab67c195d1a1d4
 F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
 F test/func.test ae97561957aba6ca9e3a7b8a13aac41830d701ef
@@ -1195,7 +1195,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 16352d3654d5672cd0251db51dbe19f779373feb
-R a0466df485f1c616be1f64f0989b7925
+P 43fcb844726cfeeb1c8a0dbfaa0d2ca22e6ac16c
+R fe613ccf4d230813074cd2e3b5b79d5f
 U dan
-Z affe87335b53c4c8634348527de72153
+Z 057df6fbedf27e3f40e741066d4f0911

diff --git a/manifest.uuid b/manifest.uuid
index 0a4fb0b2a6b73d5d70015adb2ebcd893d8e2db9b..7556250b6e3b71ba607dc03e6f9f8b87ddc03223 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-43fcb844726cfeeb1c8a0dbfaa0d2ca22e6ac16c
\ No newline at end of file
+1e9053abdaf5e128d44504ee00dfd909dc25f378
\ No newline at end of file

diff --git a/test/fts5ae.test b/test/fts5ae.test
index 3b6720c79b8658c0789b3c5ecc8fa8fb63cd36a4..f5a53625f795043df521714f42b43e68a85ba3b0 100644 (file)
--- a/test/fts5ae.test
+++ b/test/fts5ae.test
@@ -147,6 +147,15 @@ do_execsql_test 5.2 {
   1 {4 6}
 }
 
+do_execsql_test 5.2 {
+  SELECT rowid, fts5_test(t5, 'columntext') FROM t5 WHERE t5 MATCH 'a'
+  ORDER BY rowid DESC;
+} {
+  3 {a {}}
+  2 {{} a}
+  1 {{a b c d} {e f g h i j}}
+}
+
 
 finish_test