Fix RBU handling of partial indexes with comments embedded in their CREATE INDEX...

FossilOrigin-Name: e1ccf211aa975a6688a27f7dc4cea80784ed8dcfe1950b2fa6eb0a3cb938838a

diff --git a/ext/rbu/rbupartial.test b/ext/rbu/rbupartial.test
index 9b0dce61093a6e64d89d3fe1428cd6e06a8f6278..d6cd7330fe0df415847f986d3cfe701be52cf6ff 100644 (file)
--- a/ext/rbu/rbupartial.test
+++ b/ext/rbu/rbupartial.test
@@ -40,6 +40,15 @@ foreach {tn without_rowid a b c d} {
     CREATE INDEX i1c3 ON t1(%C%) WHERE %C% IS NOT NULL;
 
     CREATE INDEX i1c4 ON t1(%C%) WHERE %D% < 'd';
+    CREATE INDEX i1c5 ON t1(
+        %C%                   -- for (c = ... expressions
+    ) WHERE %D% < 'd';
+    CREATE INDEX i1c6 ON t1(
+        %C% /* Again, for (c=... expr */, %D%
+    ) WHERE %D% < 'd';
+
+    CREATE INDEX i1c7 ON t1(
+        %C% /* As before, for (c=... "expr */) WHERE %D% < 'd';
   }
 
   do_execsql_test $tn.1.1 {

diff --git a/ext/rbu/sqlite3rbu.c b/ext/rbu/sqlite3rbu.c
index a4fbeb614e2e641251a10c5f19b1c0fdb358c686..b7f7dfdc2a34cecb0369dfd3f45266a710eef277 100644 (file)
--- a/ext/rbu/sqlite3rbu.c
+++ b/ext/rbu/sqlite3rbu.c
@@ -2216,6 +2216,13 @@ static char *rbuObjIterGetIndexWhere(sqlite3rbu *p, RbuObjIter *pIter){
             for(i++; 1; i++){
               if( zSql[i]==']' ) break;
             }
+          }else if( c=='-' && zSql[i+1]=='-' ){
+            for(i=i+2; zSql[i] && zSql[i]!='\n'; i++);
+            if( zSql[i]=='\0' ) break;
+          }else if( c=='/' && zSql[i+1]=='*' ){
+            for(i=i+2; zSql[i] && (zSql[i]!='*' || zSql[i+1]!='/'); i++);
+            if( zSql[i]=='\0' ) break;
+            i++;
           }
         }
         if( zSql[i] ){

diff --git a/manifest b/manifest
index e522ecdf9685feace0b50ef9de25d903e0a25a68..e370a31b6e0a094524ecbc797630edbe72172fa0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spotential\sbuffer\soverread\sin\sfts5\striggered\sby\sa\scorrupt\sdatabase\srecord.
-D 2019-07-25T19:29:24.884
+C Fix\sRBU\shandling\sof\spartial\sindexes\swith\scomments\sembedded\sin\stheir\sCREATE\sINDEX\sstatements.
+D 2019-07-26T16:16:31.199
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -352,7 +352,7 @@ F ext/rbu/rbufault4.test 03d2849c3df7d7bd14a622e789ff049e5080edd34a79cd432e01204
 F ext/rbu/rbufts.test 0ae8d1da191c75bd776b86e24456db0fb6e97b7c944259fae5407ea55d23c31d
 F ext/rbu/rbumisc.test 329986cf5dd51890c4eb906c2f960ebb773a79a64bed90f506b7c417825b37eb
 F ext/rbu/rbumulti.test 5fb139058f37ddc5a113c5b93238de915b769b7792de41b44c983bc7c18cf5b9
-F ext/rbu/rbupartial.test 1c8bd6d42615b94caf08f129f5817fa26975523f0f51bceda1dca90e8114c7c4
+F ext/rbu/rbupartial.test f25df014b8dbe3c5345851fba6e66f79ab237f57dc201b2d5f0dbae658ae5a4c
 F ext/rbu/rbuprogress.test 04614ff8820bab9c1ec1b7dbec1edc4b45474421d4fe7abbd2a879a9c02884f9
 F ext/rbu/rburesume.test dbdc4ca504e9c76375a69e5f0d91205db967dcc509a5166ca80231f8fda49eb1
 F ext/rbu/rbusave.test f4190a1a86fccf84f723af5c93813365ae33feda35845ba107b59683d1cdd926
@@ -362,7 +362,7 @@ F ext/rbu/rbuvacuum.test 55e101e90168c2b31df6c9638fe73dc7f7cc666b6142266d1563697
 F ext/rbu/rbuvacuum2.test b8e5b51dc8b2c0153373d024c0936be3f66f9234acbd6d0baab0869d56b14e6b
 F ext/rbu/rbuvacuum3.test 8addd82e4b83b4c93fa47428eae4fd0dbf410f8512c186f38e348feb49ba03dc
 F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2f1dbccfd10
-F ext/rbu/sqlite3rbu.c 8741c0ee1496b41ff888b983a1a32547bc8822602603c68b3e524e5e0e287395
+F ext/rbu/sqlite3rbu.c 38c57ecab6697996cca56f56d4712ee0465a0957af1ea994a5a2ca815d5a06f6
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -1837,7 +1837,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 01cdc590f7894ea23ee0d674747d7ebf8196efbef3c87d47e72dbc1ab6ae2883
-R 7ee478119f0db3f146213212a0277fe8
+P 16472112b6886ada18d45cfb409cca2e83dde5a8ba8a36d481e87b61100b0186
+R b8711fee1b5f80da15fd5f89a8e1d802
 U dan
-Z 35e2247278dd60a2332994dc0fccf047
+Z f0a7ed38f3e42e2ed2e83f589a12fac7

diff --git a/manifest.uuid b/manifest.uuid
index 1a95ad7103eb5a2e3f1c3a80761225acfb64309f..71225592f6e834f99762794c17975bf91a8160d8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-16472112b6886ada18d45cfb409cca2e83dde5a8ba8a36d481e87b61100b0186
\ No newline at end of file
+e1ccf211aa975a6688a27f7dc4cea80784ed8dcfe1950b2fa6eb0a3cb938838a
\ No newline at end of file