Better determination of when an index is UNIQUE.

FossilOrigin-Name: 63fd025ad98c33826342824c51436ac92e2bb579

diff --git a/manifest b/manifest
index 1046753ec04ff5b776172de2e12e33b5b82cdfac..7cdae30fd3cf5aae498541e17ed3a4f236d9fe67 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sestimated\sfull-scan\scost\sfor\san\sFTS3\stable.
-D 2013-06-04T13:07:44.387
+C Better\sdetermination\sof\swhen\san\sindex\sis\sUNIQUE.
+D 2013-06-04T13:37:26.983
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c 89e9e0180fb061529c2335483e698461020008b3
+F src/where.c 07d741484ae3f3758ec7e9a607bebc9ca3d04830
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P ff2fa407558360f2499b6df0392ab3cdb4788dec
-R 5715088460a26a1980fd1c02022e33fe
+P 8d9f29f847f38612447c79a5fb366a9143ef6205
+R 816acabe38521333f8c2b91e9413c2fb
 U drh
-Z e8fb494e500ca7853631ddff96a44d93
+Z 7aae80e9f7f08a338e021a4d83d77e82

diff --git a/manifest.uuid b/manifest.uuid
index c6152c2bac4b757fbfc4f2e437e04aec3e182617..603eff6cc44a79dfc6188e05d391c89d43c0a48f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8d9f29f847f38612447c79a5fb366a9143ef6205
\ No newline at end of file
+63fd025ad98c33826342824c51436ac92e2bb579
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index fa06259d67b0156f55bcce646006f17f2b4faa30..4c062435c6a4ff783a664bcc11cb6da645513c9a 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4024,7 +4024,7 @@ static int whereLoopAddBtreeIndex(
                   || nInMul==1 );
       pNew->wsFlags |= WHERE_COLUMN_EQ;
       if( iCol<0  
-       || (pProbe->onError==OE_Abort && nInMul==1
+       || (pProbe->onError!=OE_None && nInMul==1
            && pNew->u.btree.nEq==pProbe->nColumn-1)
       ){
         testcase( pNew->wsFlags & WHERE_COLUMN_IN );
@@ -4721,7 +4721,7 @@ static int wherePathSatisfiesOrderBy(
           }
         }else{
           /* No match found */
-          if( j<nColumn || pIndex==0 || pIndex->onError!=OE_Abort ){
+          if( j<nColumn || pIndex==0 || pIndex->onError==OE_None ){
             isWellOrdered = 0;
           }
           break;