Fix the test case misc3-6.11 so that it works correctly on UTF16 databases

after the fix of for ticket #3838, check-in (6603) (CVS 6609)

FossilOrigin-Name: c1e739e39b1df205f3beb4088ce7760a0d56359f

diff --git a/manifest b/manifest
index cfb280f7a27b4108b77aeca6ecd1ce724e4451ca..ded48042f5c474cf7f7c2a12c0fe32515ca116dd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\schanges\sto\sthe\ssqlite3_exec()\simplementation\sin\slegacy.c\nto\sfacility\sfull\scoverage\stesting.\s(CVS\s6608)
-D 2009-05-05T20:02:48
+C Fix\sthe\stest\scase\smisc3-6.11\sso\sthat\sit\sworks\scorrectly\son\sUTF16\sdatabases\nafter\sthe\sfix\sof\sfor\sticket\s#3838,\scheck-in\s(6603)\s(CVS\s6609)
+D 2009-05-06T00:49:01
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -475,7 +475,7 @@ F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
 F test/minmax3.test 94742aa922153953ce3562702815e4f1f079bdb8
 F test/misc1.test 1b89c02c4a33b49dee4cd1d20d161aaaba719075
 F test/misc2.test 1ee89298de9c16b61454658b24999c403e86afe4
-F test/misc3.test 7212ed8dad01427e9acab9bd3e7e5e2c2e89be9e
+F test/misc3.test 72c5dc87a78e7865c5ec7a969fc572913dbe96b6
 F test/misc4.test 91e8ed25c092c2bb4e0bb01864631e2930f8d7de
 F test/misc5.test 6a5c1e3217a95b0db05ff9a0f1ecb5ce9043ffef
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
@@ -728,7 +728,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P f4549904b22ff2340a5830cd67ed001d1c4730a1
-R a3b2a24770fbc08c02f4ac7fe2c7f8a9
+P 9e3016c1846174a64833394a00a09335e8446de8
+R b88c7ddb86a82d9458d109084a26600e
 U drh
-Z cd9beca691f90a6e325ce8cd88b48d70
+Z e32515574a73e07f4425088418907a33

diff --git a/manifest.uuid b/manifest.uuid
index 73f582639bd7efaa72d7c1c8a48da19b72398d83..5fe676c29fe3e5244b2f49cff8ada29f0de085ad 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9e3016c1846174a64833394a00a09335e8446de8
\ No newline at end of file
+c1e739e39b1df205f3beb4088ce7760a0d56359f
\ No newline at end of file

diff --git a/test/misc3.test b/test/misc3.test
index 1534aaf37061b235682f8642b2464c2529237cb0..94a43c437e4d8cd8deec92417f2cbcc2111594a2 100644 (file)
--- a/test/misc3.test
+++ b/test/misc3.test
@@ -13,7 +13,7 @@
 # This file implements tests for miscellanous features that were
 # left out of other test files.
 #
-# $Id: misc3.test,v 1.19 2008/06/25 02:47:57 drh Exp $
+# $Id: misc3.test,v 1.20 2009/05/06 00:49:01 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -272,16 +272,26 @@ ifcapable {explain} {
     }]
     regexp { IsUnique \d+ \d+ \d+ \d+ } $x
   } {1}
-  do_test misc3-6.11 {
-    set x [execsql {
-      EXPLAIN SELECT a+123456789012, b*4.5678, c FROM ex1 ORDER BY +a, b DESC
-    }]
-    set y [regexp { 123456789012 } $x]
-    lappend y [regexp { 4.5678 } $x]
-    lappend y [regexp { hello } $x]
-    lappend y [regexp {,-BINARY} $x]
-  } {1 1 1 1}
-
+  if {[regexp {16} [db one {PRAGMA encoding}]]} {
+    do_test misc3-6.11-utf16 {
+      set x [execsql {
+        EXPLAIN SELECT a+123456789012, b*4.5678, c FROM ex1 ORDER BY +a, b DESC
+      }]
+      set y [regexp { 123456789012 } $x]
+      lappend y [regexp { 4.5678 } $x]
+      lappend y [regexp {,-BINARY} $x]
+    } {1 1 1}
+  } else {
+    do_test misc3-6.11-utf8 {
+      set x [execsql {
+        EXPLAIN SELECT a+123456789012, b*4.5678, c FROM ex1 ORDER BY +a, b DESC
+      }]
+      set y [regexp { 123456789012 } $x]
+      lappend y [regexp { 4.5678 } $x]
+      lappend y [regexp { hello } $x]
+      lappend y [regexp {,-BINARY} $x]
+    } {1 1 1 1}
+  }
 }
 
 ifcapable {trigger} {