Modify the fts3query.test script so that it works even when testfixture is

built using a version of TCL that is unable to sort the
integer -9223372036854775808

FossilOrigin-Name: f61fd24b4d3b686911ea578f77612309099f0cc6

diff --git a/manifest b/manifest
index c965f4df6b99701f2c0de70ea316723a3e9ed4b2..cfdd9a1b92fff1c268b8cccc06b957c6cd59a364 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sdeleting\sthe\smaster\sjournal\sto\scommit\sa\smulti-database\stransaction,\sdo\nnot\ssync\sthe\sdirectory\sif\sPRAGMA\ssynchronous=OFF\sfor\sall\sparticipating\ndatabase\sfiles.
-D 2015-03-16T16:44:55.689
+C Modify\sthe\sfts3query.test\sscript\sso\sthat\sit\sworks\seven\swhen\stestfixture\sis\nbuilt\susing\sa\sversion\sof\sTCL\sthat\sis\sunable\sto\ssort\sthe\ninteger\s-9223372036854775808
+D 2015-03-16T17:07:09.229
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -594,7 +594,7 @@ F test/fts3matchinfo.test 58544fa4d254000fa4e7f494b0a832f7ba61d45e
 F test/fts3near.test 7e3354d46f155a822b59c0e957fd2a70c1d7e905
 F test/fts3prefix.test b36d4f00b128a51e7b386cc013a874246d9d7dc1
 F test/fts3prefix2.test e1f0a822ca661dced7f12ce392e14eaf65609dce
-F test/fts3query.test d81ffb0ab1d4e1a2a330b8eb1e160b60603f4745
+F test/fts3query.test c838b18f2b859e15fd31c64be3d79ef1556803ca
 F test/fts3rnd.test 1320d8826a845e38a96e769562bf83d7a92a15d0
 F test/fts3shared.test 57e26a801f21027b7530da77db54286a6fe4997e
 F test/fts3snippet.test 03c2f3be7d3b7c8bb105ed237f204833392bd57f
@@ -1244,7 +1244,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 3e0590dee0e68cc1599858757c650a7378026170
-R b45bc6830f64f8858a6416472978aee0
+P 018d7671402a0f8103d1306641655b69f9fa235d
+R 781e204d7688b0ad2593ede4825cc937
 U drh
-Z 7cd47bb94490a64601179f11e40a837c
+Z 1bc9733af443d0b92b43469552bb99df

diff --git a/manifest.uuid b/manifest.uuid
index 1d6abc47d55bc7f8096a499bd61b09c5fbf990f5..40012770837c90764c1db6d5073f71941be4c3df 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-018d7671402a0f8103d1306641655b69f9fa235d
\ No newline at end of file
+f61fd24b4d3b686911ea578f77612309099f0cc6
\ No newline at end of file

diff --git a/test/fts3query.test b/test/fts3query.test
index 0b3c2ce1bd99188e788b687cfe27e7b182aeb5d0..06019d14e614732972352612d339415e559bc57a 100644 (file)
--- a/test/fts3query.test
+++ b/test/fts3query.test
@@ -252,15 +252,21 @@ foreach {tn iFirst iLast} [subst {
   do_execsql_test 7.2.$tn.1.[llength $res] {
     SELECT rowid FROM ft4 WHERE rowid BETWEEN $iFirst AND $iLast
   } $res
+  set res [db eval { 
+    SELECT rowid FROM t4 WHERE rowid BETWEEN $iFirst AND $iLast 
+     ORDER BY +rowid DESC
+  } ]
   do_execsql_test 7.2.$tn.2.[llength $res] {
     SELECT rowid FROM ft4 WHERE rowid BETWEEN $iFirst AND $iLast
     ORDER BY rowid DESC
-  } [lsort -decr -integer $res]
+  } $res
 }
 
 foreach ii [db eval {SELECT rowid FROM t4}] {
   set res1 [db eval {SELECT rowid FROM t4 WHERE rowid > $ii}]
   set res2 [db eval {SELECT rowid FROM t4 WHERE rowid < $ii}]
+  set res1s [db eval {SELECT rowid FROM t4 WHERE rowid > $ii ORDER BY +rowid DESC}]
+  set res2s [db eval {SELECT rowid FROM t4 WHERE rowid < $ii ORDER BY +rowid DESC}]
 
   do_execsql_test 7.3.$ii.1 {
     SELECT rowid FROM ft4 WHERE rowid > $ii
@@ -272,13 +278,11 @@ foreach ii [db eval {SELECT rowid FROM t4}] {
 
   do_execsql_test 7.3.$ii.3 {
     SELECT rowid FROM ft4 WHERE rowid > $ii ORDER BY rowid DESC
-  } [lsort -integer -decr $res1]
+  } $res1s
 
   do_execsql_test 7.3.$ii.4 {
     SELECT rowid FROM ft4 WHERE rowid < $ii ORDER BY rowid DESC
-  } [lsort -integer -decr $res2]
+  } $res2s
 }
 
 finish_test
-
-