Fix a problem with fts5 "ORDER BY rank" queries when the fts5 table name requires...

FossilOrigin-Name: 00e9a8f2730eb7239bf7fd107c97c409e4f9fbd968510766373440a9079898eb

diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c
index d44e95942cf851d8679238d67878e23fb29975f5..4bb3a9965fd7135414639524a4e247a8d98118e1 100644 (file)
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@ -932,7 +932,7 @@ static int fts5CursorFirstSorted(
   **
   ** If SQLite a built-in statement cache, this wouldn't be a problem. */
   rc = fts5PrepareStatement(&pSorter->pStmt, pConfig,
-      "SELECT rowid, rank FROM %Q.%Q ORDER BY %s(%s%s%s) %s",
+      "SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s",
       pConfig->zDb, pConfig->zName, zRank, pConfig->zName,
       (zRankArgs ? ", " : ""),
       (zRankArgs ? zRankArgs : ""),

diff --git a/ext/fts5/test/fts5corrupt3.test b/ext/fts5/test/fts5corrupt3.test
index 0497c95bcfb0643ab45051de7e90af8e5443a607..2391d97eeaf0e1820fe4e65adfda0f15086613cf 100644 (file)
--- a/ext/fts5/test/fts5corrupt3.test
+++ b/ext/fts5/test/fts5corrupt3.test
@@ -767,7 +767,7 @@ SELECT * FROM t1 WHERE t1 MATCH 'abandon';
 
 do_catchsql_test 13.1 {
   SELECT * FROM t1 WHERE t1 MATCH 'abandon'; 
-} {1 {vtable constructor failed: t1}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -958,7 +958,7 @@ do_test 15.0 {
 
 do_catchsql_test 15.1 {
   INSERT INTO t1(t1) VALUES('integrity-check');
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 #---------------------------------------------------------------------------
 #
@@ -3903,19 +3903,19 @@ do_test 33.0 {
 | end crash-fed6e90021ba5d.db
 }]} {}
 
-do_execsql_test 33.1 {
+do_catchsql_test 33.1 {
   CREATE VIRTUAL TABLE t2 USING fts5vocab('t1','row');
   CREATE VIRTUAL TABLE t3 USING fts5vocab('t1','col');
   CREATE VIRTUAL TABLE t4 USING fts5vocab('t1','instance');
-}
+} {/*malformed database schema*/}
 
 do_catchsql_test 33.2 {
   SELECT * FROM t2;
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 do_catchsql_test 33.3 {
   SELECT * FROM t2, t3, t4 WHERE t2.term=t3.term AND t3.term=t4.term;
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -4637,17 +4637,17 @@ do_test 37.0 {
 
 do_catchsql_test 37.1 {
   SELECT * FROM t3;
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db 
-do_execsql_test 37.0 {
+do_execsql_test 37a.0 {
   CREATE VIRTUAL TABLE t1 USING fts5(b, c);
   INSERT INTO t1 VALUES('a', 'b');
   SELECT quote(block) FROM t1_data WHERE rowid=10;
 } {X'000000000101010001010101'}
 
-do_execsql_test 37.1 {
+do_execsql_test 37a.1 {
   UPDATE t1_data SET block = X'FFFFFFFF0101010001010101' WHERE rowid = 10;
   SELECT rowid FROM t1('a');
 } {1}
@@ -4894,7 +4894,7 @@ do_test 38.0 {
 
 do_catchsql_test 38.1 {
   UPDATE t1 SET b=quote(zeroblob(200)) WHERE t1 MATCH 'thread*';
-} {0 {}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -5326,16 +5326,16 @@ do_test 40.0 {
 | end crash2.txt.db
 }]} {}
 
-do_execsql_test 40.1 {
+do_catchsql_test 40.1 {
   BEGIN;
   INSERT INTO t1(b) VALUES(X'819192e578de3fa24af3733ca8769291a0fee3669f9fddefc5cba913e4225d4b6ce2b04f26b87fad3ee6f9b7d90a1ea62a169bf41e5d32707a6ca5c3d05e4bde05c9d89eaaa8c50e74333d2e9fcd7dfe95528a3a016aac1102d825c5cd70cf99d8a88e0ea7f798d4334386518b7ad359beb168b93aba059a2a3bd93112d65b44c12b9904ea786b204d80531cdf0504bf9b203dbe927061974caf7b9f30cbc3397b61f802e732012a6663d41c3607d6f1c0dbcfd489adac05ca500c0b04439d894cd93a840159225ef73b627e178b9f84b3ffe66cf22a963a8368813ff7961fc47f573211ccec95e0220dcbb3bf429f4a50ba54d7a53784ac51bf');
   INSERT INTO t1(b) VALUES(X'c8ae0d0e7c3175946e62ba2b449511d4eb504079984a20f77969f62206c9f3d7ea25358ab705e6978627290b6d48db9032f815a06a79a4f4b809841a0942eed12954ed166f666111812a508abc3bec87958846edaec0a6fe14564bc0a4b78f1c35ebcacca6bae29cc37ae9b59d8a2d7593af1e47dda0ece2268a98d20febafad037964f139851f9a57f48b3706b01721769071991412044cd6006f1d72eb6eb4aa5ad77e378176db8c15575fbeee47165e38a7c6c5a557ac2dfe11813976eaf6741cf593a9e457053a3c34cddfbe605a6e25419f993de8374fafcd3636509d8416a51dc7bcc14cfca322ae343078f47e23522431c17d0da0c033');
   INSERT INTO t1(b) VALUES(X'dc29a94e873a45a4243fce9b912aaefbadf1d0423e0345793874b356eeb500b92fb05284c1601fe9bad3143f72162f10242cec27c44ebf764c8fc9fb0824e32c4161472a4f914f579e0e8274f08ca1a02e59b9d8eec1f31061f9ccb9ed97a6f06534e991f7992c761489e6a7724f6e9c2b581e77487ded3a986d53c4419bbd3e9747cee300e670dd7294874c77e2ed48da68eaa6c3ec954a09ac410493d98e34d6686e54fbbe80696705f10e040c66093efb40746b33600685c94c664c7942835a9e954866121d5dcfb2cb12e92521ea3df175ee17072502dad9b9c1565f801b2179799011eb7418bfa00323e3157589e648ff7378be233c79b7');
-}
+} {/*malformed database schema*/}
 
 do_catchsql_test 40.2 {
   INSERT INTO t1(a,b) VALUES(1,11),(2,22),(3, true ),(4,44);
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -5789,7 +5789,7 @@ do_test 43.0 {
 
 do_catchsql_test 43.1 {
   INSERT INTO t1(t1) VALUES('optimize');
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -6047,7 +6047,7 @@ do_catchsql_test 45.2 {
   INSERT INTO t1(t1, rank) VALUES('merge', 5);
   INSERT INTO t1(t1, rank) VALUES('merge', 5);
   INSERT INTO t1(t1, rank) VALUES('merge', 5);
-} {0 {}}
+} {/*malformed database schema*/}
 
 #--------------------------------------------------------------------------
 reset_db
@@ -6265,7 +6265,7 @@ do_test 46.0 {
 
 do_catchsql_test 46.1 {
   SELECT snippet(t1,'[','', '--',-1,10) FROM t1('*');
-} {0 {{}}}
+} {/*malformed database schema*/}
 
 #--------------------------------------------------------------------------
 reset_db
@@ -6418,7 +6418,7 @@ do_test 47.0 {
 
 do_catchsql_test 47.1 {
   INSERT INTO t1(t1) VALUES('integrity-check');
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 do_catchsql_test 47.2 {
   SELECT count(*) FROM (
@@ -6426,7 +6426,7 @@ do_catchsql_test 47.2 {
       highlight(t1, 2, '[', ']') FROM t1('g h') 
       WHERE rank MATCH 'bm25(1.0, 1.0)' ORDER BY rank
   )
-} {0 3}
+} {/*malformed database schema*/}
 
 #--------------------------------------------------------------------------
 reset_db
@@ -7130,7 +7130,7 @@ do_test 52.0 {
 
 do_catchsql_test 52.1 {
   SELECT fts5_decode(id, block) FROM t1_data;
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -7346,7 +7346,7 @@ do_test 53.0 {
 do_catchsql_test 53.1 {
   WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x<>1 FROM c WHERE x<10)
     INSERT INTO t1(a) SELECT randomblob(3000) FROM c;
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -7562,7 +7562,7 @@ do_test 54.0 {
 
 do_catchsql_test 54.1 {
   SELECT rowid==-1 FROM t1('t*');
-} {0 {0 0 0}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -7777,10 +7777,10 @@ do_test 55.0 {
 | end crash-b366b5ac0d3887.db
 }]} {}
 
-do_execsql_test 55.1 {
+do_catchsql_test 55.1 {
   SAVEPOINT one;
   DELETE FROM t1 WHERE a MATCH 'ts';
-}
+} {/*malformed database schema*/}
 
 do_execsql_test 55.2 {
   ROLLBACK TO one;
@@ -8013,7 +8013,7 @@ do_test 56.1 {
     set res "1 {database disk image is malformed}"
   }
   set res
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -8131,7 +8131,7 @@ do_test 57.0 {
 
 do_catchsql_test 57.1 {
   INSERT INTO t1(t1) VALUES('optimize')
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -8339,9 +8339,9 @@ do_test 58.0 {
 | end crash-5a5acd0ab42d31.db
 }]} {}
 
-do_execsql_test 58.1 {
+do_catchsql_test 58.1 {
   SELECT * FROM t1('t*');
-} {{} {} {} {} {} {}}
+} {/*malformed database schema*/}
 
 #-------------------------------------------------------------------------
 do_test 59.0 {
@@ -8948,13 +8948,13 @@ do_test 61.0 {
 | end crash-e5fa281edabddf.db
 }]} {}
 
-do_execsql_test 61.1 {
+do_catchsql_test 61.1 {
   CREATE VIRTUAL TABLE t3 USING fts5vocab('t1'(),'col' );
-} 
+} {/*malformed database schema*/}
 
 do_catchsql_test 61.2 {
   SELECT * FROM t3 ORDER BY rowid;
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 breakpoint
 #-------------------------------------------------------------------------
@@ -9159,7 +9159,7 @@ do_test 62.0 {
 do_catchsql_test 62.1 {
   WITH c(x) AS (VALUES(false) UNION ALL SELECT x+1 FROM c WHERE x<72)
     INSERT INTO t1(a) SELECT randomblob(2829) FROM c;
-} {0 {}}
+} {/*malformed database schema*/}
 
 #---------------------------------------------------------------------------
 do_test 63.0 {
@@ -9357,16 +9357,15 @@ do_test 63.0 {
 
 do_catchsql_test 63.1 {
   SELECT * FROM t1 WHERE b MATCH 'thead*thead*theSt*';
-} {1 {database disk image is malformed}}
+} {/*malformed database schema*/}
 
 do_catchsql_test 63.2 {
   INSERT INTO t1(t1) VALUES('optimize');
-} {0 {}}
+} {/*malformed database schema*/}
 
-breakpoint
 do_catchsql_test 63.3 {
   SELECT * FROM t1 WHERE b MATCH 'thead*thead*theSt*';
-} {0 {}}
+} {/*malformed database schema*/}
 
 sqlite3_fts5_may_be_corrupt 0
 finish_test

diff --git a/ext/fts5/test/fts5rank.test b/ext/fts5/test/fts5rank.test
index e8f5473c4b9040b1821817145d4b105bf67b4304..22534e8e03a7f5d1c4c515e1d26a8bbb4585ae0c 100644 (file)
--- a/ext/fts5/test/fts5rank.test
+++ b/ext/fts5/test/fts5rank.test
@@ -162,4 +162,22 @@ do_execsql_test 5.1 {
   SELECT rowid FROM ttt('word') WHERE rowid BETWEEN 30 AND 40 ORDER BY rank;
 } {30 31 32 33 34 35 36 37 38 39 40}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 6.0 {
+  CREATE VIRTUAL TABLE "My.Table" USING fts5(Text);
+
+  INSERT INTO "My.Table" VALUES ('hello this is a test');
+  INSERT INTO "My.Table" VALUES ('of trying to order by');
+  INSERT INTO "My.Table" VALUES ('rank on an fts5 table');
+  INSERT INTO "My.Table" VALUES ('that have periods in');
+  INSERT INTO "My.Table" VALUES ('the table names.');
+  INSERT INTO "My.Table" VALUES ('table table table');
+}
+do_execsql_test 6.1 {
+  SELECT * FROM "My.Table" WHERE Text MATCH 'table' ORDER BY rank;
+} {
+  {table table table} {the table names.} {rank on an fts5 table}
+}
+
 finish_test

diff --git a/manifest b/manifest
index f7957a23fb13622a5f177237e7ca795698c35034..cfd08c86b4f0063a944e4665c5a588e9aa8d714c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\ssegfault\sthat\scould\soccur\sfollowing\san\sOOM\swhile\sprocessing\sa\sSELECT\sstatement\sfor\swhich\sone\sor\smore\sof\sthe\sexpressions\sin\sthe\swindow\sframe\sdeclaration\sare\sthemselves\ssub-selects\sthat\suse\swindow\sfunctions.
-D 2019-08-20T14:43:01.572
+C Fix\sa\sproblem\swith\sfts5\s"ORDER\sBY\srank"\squeries\swhen\sthe\sfts5\stable\sname\srequires\squoting.
+D 2019-08-20T19:11:29.544
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -117,7 +117,7 @@ F ext/fts5/fts5_config.c d7523cba5e66da077233c023aecbc3e6a37978ff75a18131c5ab5b1
 F ext/fts5/fts5_expr.c 840c88d55e78083a5e61a35968df877712ae28791b347eced1e98e3b337d2d3c
 F ext/fts5/fts5_hash.c 1cc0095646f5f3b46721aa112fb4f9bf29ae175cb5338f89dcec66ed97acfe75
 F ext/fts5/fts5_index.c cd363c2fa3e626c04a9b7c705ff50222b4cab052704938f6a24881602ed3ed0d
-F ext/fts5/fts5_main.c 346a1ec08caa66f1187f1e0bf12e39e4d24682323b839e8a76ef653b8db8a91d
+F ext/fts5/fts5_main.c b2c42f1cef9673ecdd498b22c38483a4380bcf1701d1e61b021a2945f18e42e1
 F ext/fts5/fts5_storage.c 801b4e3cd33786a60a07b6b01f86d0fbdf7e68325054e08d17176293a8081e99
 F ext/fts5/fts5_tcl.c 39bcbae507f594aad778172fa914cad0f585bf92fd3b078c686e249282db0d95
 F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
@@ -157,7 +157,7 @@ F ext/fts5/test/fts5connect.test 08030168fc96fc278fa81f28654fb7e90566f33aff269c0
 F ext/fts5/test/fts5content.test 9517cc527a8e8a33949652d5c7b5e251f8c3d5ae3f23f01d4320e30f29a0336b
 F ext/fts5/test/fts5corrupt.test 77ae6f41a7eba10620efb921cf7dbe218b0ef232b04519deb43581cb17a57ebe
 F ext/fts5/test/fts5corrupt2.test 7453752ba12ce91690c469a6449d412561cc604b1dec994e16ab132952e7805f
-F ext/fts5/test/fts5corrupt3.test 1f36c04fdd717f7d44a0addcdad0f5e54a5a403eab8a25426b069757830682ee
+F ext/fts5/test/fts5corrupt3.test 99318789d84c678ed6388e61109b9f7b92c64419e87e4881093c01e219c5d397
 F ext/fts5/test/fts5corrupt4.test ea805c4d7c68b5f185b9db5d2060a7ae5875339738dd48203c92162f41e7ca91
 F ext/fts5/test/fts5delete.test cbf87e3b8867c4d5cfcaed975c7475fd3f99d072bce2075fcedf43d1f82af775
 F ext/fts5/test/fts5detail.test 31b240dbf6d44ac3507e2f8b65f29fdc12465ffd531212378c7ce1066766f54e
@@ -199,7 +199,7 @@ F ext/fts5/test/fts5porter.test 8d08010c28527db66bc3feebd2b8767504aaeb9b101a9863
 F ext/fts5/test/fts5porter2.test 0d251a673f02fa13ca7f011654873b3add20745f7402f108600a23e52d8c7457
 F ext/fts5/test/fts5prefix.test a0fa67b06650f2deaa7bf27745899d94e0fb547ad9ecbd08bfad98c04912c056
 F ext/fts5/test/fts5query.test ac363b17a442620bb0780e93c24f16a5f963dfe2f23dc85647b869efcfada728
-F ext/fts5/test/fts5rank.test ca5000241924ecc2882db33c60f4f3a62b1ee6b16b5a9c8c6ddd9b6b2138489c
+F ext/fts5/test/fts5rank.test c9fd4a1e36b4fa92d572ec13d846469b97da249d1c2f7fd3ee7e017ce46f2416
 F ext/fts5/test/fts5rebuild.test 55d6f17715cddbf825680dd6551efbc72ed916d8cf1cde40a46fc5d785b451e7
 F ext/fts5/test/fts5restart.test 835ecc8f449e3919f72509ab58056d0cedca40d1fe04108ccf8ac4c2ba41f415
 F ext/fts5/test/fts5rowid.test b8790ec170a8dc1942a15aef3db926a5f3061b1ff171013003d8297203a20ad6
@@ -1836,7 +1836,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 658bd51623787be4ca87b066a051d119f39056286e223afef3691629cf1ab0e1
-R de5c373fa0aa9adc1be1e5804cb9b91d
+P 75aec4fc886c04fe098828cc03bc72c197cbf40f0a1890fe5bbb98d4fd5c3c7e
+R 1c1c766fc2c729d2e5f3a524114c00f7
 U dan
-Z d06c51f62e0fa708481e21348393bcb2
+Z 8a025a4c149038423df368f1009cf0d8

diff --git a/manifest.uuid b/manifest.uuid
index e37939af6d820c7a65aae0449749647826c35e6a..508e9fd6467e33230536d592eb1ce0ee54a53ea0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-75aec4fc886c04fe098828cc03bc72c197cbf40f0a1890fe5bbb98d4fd5c3c7e
\ No newline at end of file
+00e9a8f2730eb7239bf7fd107c97c409e4f9fbd968510766373440a9079898eb
\ No newline at end of file