Add the experimental API sqlite3_strnicmp(). Modify fts3 so that in terms like 'colum...

FossilOrigin-Name: 4571aa9e9142db465ae8250b0adf27e0a094331a

diff --git a/ext/fts3/fts3_expr.c b/ext/fts3/fts3_expr.c
index 4fb3be0d6fa3612937829cc8d1a26f8e96753e8f..49bea2f9670fb16a1dd34e938524337c102f38c4 100644 (file)
--- a/ext/fts3/fts3_expr.c
+++ b/ext/fts3/fts3_expr.c
@@ -421,7 +421,9 @@ static int getNextNode(
   for(ii=0; ii<pParse->nCol; ii++){
     const char *zStr = pParse->azCol[ii];
     int nStr = strlen(zStr);
-    if( nInput>nStr && zInput[nStr]==':' && memcmp(zStr, zInput, nStr)==0 ){
+    if( nInput>nStr && zInput[nStr]==':' 
+     && sqlite3_strnicmp(zStr, zInput, nStr)==0 
+    ){
       iCol = ii;
       iColLen = ((zInput - z) + nStr + 1);
       break;

diff --git a/manifest b/manifest
index d5ebcedf465e515aafefd99868449d0f87b3343c..b7b332627761aa67abb90cd9f440ec86840d1db0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sflattening\sa\sSELECT\squery,\sdo\snot\sdiscard\scollation\ssequences\sexplicitly\sattached\sto\sexpressions\sin\sthe\sparent\squery.\sFix\sfor\s#3997.\s(CVS\s6949)
-D 2009-07-28T13:30:31
+C Add\sthe\sexperimental\sAPI\ssqlite3_strnicmp().\sModify\sfts3\sso\sthat\sin\sterms\slike\s'column_name:token'\sthe\scolumn_name\sis\sinterpreted\sin\sa\scase-insenstive\sfashion.\sTicket\s#3996.\s(CVS\s6950)
+D 2009-07-28T16:44:26
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -58,7 +58,7 @@ F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
 F ext/fts3/fts3.c 35bfa67d9cd659b799b8498895fe60b1e8bd3500
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
-F ext/fts3/fts3_expr.c 25f8f5b73c6c62d8adc521a8324ae19ab6b899ca
+F ext/fts3/fts3_expr.c 0bfdae44d0d8ea2cb3ccad32bb6d6843d78d1a2d
 F ext/fts3/fts3_expr.h b5412dcf565c6d90d6a8c22090ceb9ed8c745634
 F ext/fts3/fts3_hash.c e15e84d18f8df149ab290029872d4559c4c7c15a
 F ext/fts3/fts3_hash.h 004b759e1602ff16dfa02fea3ca1c77336ad6798
@@ -161,9 +161,9 @@ F src/resolve.c 4a61d03e49b15440878096e6030863fc628828f0
 F src/rowset.c c64dafba1f9fd876836c8db8682966b9d197eb1f
 F src/select.c 90bc99bfcf8faae5ebb8d8948366c7c2a1b4cc00
 F src/shell.c db2643650b9268df89a4bedca3f1c6d9e786f1bb
-F src/sqlite.h.in 5672d9a6e19f80c1c7f1276dbe10e7d51c8fd97b
+F src/sqlite.h.in 541159dfec7b9b67a31111d74b12441f3b55708d
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h 1199395d32e77658835bf6e976208d59f792f7ed
+F src/sqliteInt.h 3de9749ac963f77327a014afebe2903240dff4f6
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d
@@ -202,7 +202,7 @@ F src/tokenize.c af8a56e6a50c5042fc305bfa796275e9bf26ff2b
 F src/trigger.c c07c5157c58fcdb704f65d5f5e4775276e45bb8b
 F src/update.c 245a652c0c1b1affd7ccf2a1970a465977e7bfa2
 F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff
-F src/util.c 861d5b5c58be4921f0a254489ea94cb15f550ef8
+F src/util.c c2416f60ae704a8c4990e4909aa810f90cbffa07
 F src/vacuum.c 3fe0eebea6d2311c1c2ab2962887d11f7a4dcfb0
 F src/vdbe.c 0ce57f8211899b59d1d6f1642f79e75fc212d6d0
 F src/vdbe.h 457b6c70f02885cec1f5225b5e6441d067b55d3f
@@ -383,7 +383,7 @@ F test/fts3b.test b3a25180a633873d37d86e1ccd00ed690d37237a
 F test/fts3c.test 4c7ef29b37aca3e8ebb6a39b57910caa6506034e
 F test/fts3d.test d92a47fe8ed59c9e53d2d8e6d2685bb380aadadc
 F test/fts3e.test 1f6c6ac9cc8b772ca256e6b22aaeed50c9350851
-F test/fts3expr.test 8e5b1a0632959e302ad8e31ba625279cfc8e9d67
+F test/fts3expr.test 05dab77387801e4900009917bb18f556037d82da
 F test/fts3expr2.test 18da930352e5693eaa163a3eacf96233b7290d1a
 F test/fts3near.test dc196dd17b4606f440c580d45b3d23aa975fd077
 F test/func.test 004caa157b91986bed8c85d7c7d0a86d6e10528d
@@ -740,7 +740,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 614a8d83158eb59e3fbe78d62461635bfcc13525
-R 975e8b479e878820dd333965b8b9186b
+P b2784cf5d8b520fb714efdb2d2746b2c88b56edf
+R d53b81bfd45a9187519dc658946c858f
 U danielk1977
-Z 57f9d4273370bcb522584f6e1fe3cab8
+Z 56b1b1242603c21eed838511d98f15fa

diff --git a/manifest.uuid b/manifest.uuid
index c331630d45922102c03cb86cc44dbbd4195fc153..26073bc96fccc9d203d53a54d48ba1ba3285bb28 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b2784cf5d8b520fb714efdb2d2746b2c88b56edf
\ No newline at end of file
+4571aa9e9142db465ae8250b0adf27e0a094331a
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index e62b4d5fb6ba674983b5cbbd27142f36376c2eb2..6718274902d76db3adc4e21939b89e68b6457756 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite.h.in,v 1.460 2009/07/24 17:58:53 danielk1977 Exp $
+** @(#) $Id: sqlite.h.in,v 1.461 2009/07/28 16:44:26 danielk1977 Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -5613,6 +5613,18 @@ int sqlite3_unlock_notify(
   void *pNotifyArg                            /* Argument to pass to xNotify */
 );
 
+
+/*
+** CAPI3REF: String Comparison
+** EXPERIMENTAL
+**
+** The [sqlite3_strnicmp()] API allows applications and extensions to
+** compare the contents of two buffers containing UTF-8 strings in a
+** case-indendent fashion, using the same definition of case independence 
+** that SQLite uses internally when comparing identifiers.
+*/
+int sqlite3_strnicmp(const char *, const char *, int);
+
 /*
 ** Undo the hack that converts floating point types to integer for
 ** builds on processors without floating point support.

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 2ac639b96fd381e465db0fd6a8c738c267b60879..44b37ba04b0500a77a594f6795c9b3bc69e15f24 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.895 2009/07/27 10:05:05 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.896 2009/07/28 16:44:26 danielk1977 Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -2401,9 +2401,9 @@ int sqlite3WalkSelectFrom(Walker*, Select*);
 ** Internal function prototypes
 */
 int sqlite3StrICmp(const char *, const char *);
-int sqlite3StrNICmp(const char *, const char *, int);
 int sqlite3IsNumber(const char*, int*, u8);
 int sqlite3Strlen30(const char*);
+#define sqlite3StrNICmp sqlite3_strnicmp
 
 int sqlite3MallocInit(void);
 void sqlite3MallocEnd(void);

diff --git a/src/util.c b/src/util.c
index f97ac3b2632238e4fe462da8bc8e15d3b20b411b..ab757eba69cffd08382700cc31087117ccfb1a08 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.261 2009/06/24 10:26:33 drh Exp $
+** $Id: util.c,v 1.262 2009/07/28 16:44:26 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -225,7 +225,7 @@ int sqlite3StrICmp(const char *zLeft, const char *zRight){
   while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
   return UpperToLower[*a] - UpperToLower[*b];
 }
-int sqlite3StrNICmp(const char *zLeft, const char *zRight, int N){
+int sqlite3_strnicmp(const char *zLeft, const char *zRight, int N){
   register unsigned char *a, *b;
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;

diff --git a/test/fts3expr.test b/test/fts3expr.test
index 5708507addf9f914d970d2f71757549cb4d9c943..4cedecb2d9d0e4e895b8fcc719796c193dc8adc9 100644 (file)
--- a/test/fts3expr.test
+++ b/test/fts3expr.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is testing the FTS3 module.
 #
-# $Id: fts3expr.test,v 1.8 2009/07/10 09:24:43 danielk1977 Exp $
+# $Id: fts3expr.test,v 1.9 2009/07/28 16:44:26 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -122,9 +122,12 @@ do_test fts3expr-1.11 {
 do_test fts3expr-1.14 {
   test_fts3expr {a:one two}
 } {AND {PHRASE 0 0 one} {PHRASE 3 0 two}}
-do_test fts3expr-1.15 {
+do_test fts3expr-1.15.1 {
   test_fts3expr {one b:two}
 } {AND {PHRASE 3 0 one} {PHRASE 1 0 two}}
+do_test fts3expr-1.15.2 {
+  test_fts3expr {one B:two}
+} {AND {PHRASE 3 0 one} {PHRASE 1 0 two}}
 
 do_test fts3expr-1.16 {
   test_fts3expr {one AND two AND three AND four AND five}