Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master

1 files changed, 34 insertions, 7 deletions

diff --git a/lang/sql/sqlite/test/tkt-cbd054fa6b.test b/lang/sql/sqlite/test/tkt-cbd054fa6b.test
index 6e7455b3..2951233a 100644
--- a/lang/sql/sqlite/test/tkt-cbd054fa6b.test
+++ b/lang/sql/sqlite/test/tkt-cbd054fa6b.test
@@ -16,11 +16,26 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-ifcapable !stat2 {
+ifcapable !stat4&&!stat3 {
   finish_test
   return
 }
 
+proc s {blob} {
+  set ret ""
+  binary scan $blob c* bytes
+  foreach b $bytes {
+    set t [binary format c $b]
+    if {[string is print $t]} {
+      append ret $t
+    } else {
+      append ret .
+    }
+  }
+  return $ret
+}
+db function s s
+
 do_test tkt-cbd05-1.1 {
   db eval {
     CREATE TABLE t1(a INTEGER PRIMARY KEY, b TEXT UNIQUE NOT NULL);
@@ -39,14 +54,26 @@ do_test tkt-cbd05-1.1 {
   }
 } {10}
 do_test tkt-cbd05-1.2 {
-  db eval {
-    ANALYZE;
+  db eval { ANALYZE; }
+  ifcapable stat4 {
+    db eval {
+      PRAGMA writable_schema = 1;
+      CREATE VIEW vvv AS 
+      SELECT tbl,idx,neq,nlt,ndlt,test_extract(sample,0) AS sample
+      FROM sqlite_stat4;
+      PRAGMA writable_schema = 0;
+    }
+  } else {
+    db eval {
+      CREATE VIEW vvv AS 
+      SELECT tbl,idx,neq,nlt,ndlt,sample FROM sqlite_stat3;
+    }
   }
 } {}
 do_test tkt-cbd05-1.3 {
   execsql { 
-    SELECT tbl,idx,group_concat(sample,' ') 
-    FROM sqlite_stat2 
+    SELECT tbl,idx,group_concat(s(sample),' ') 
+    FROM vvv 
     WHERE idx = 't1_x' 
     GROUP BY tbl,idx
   }
@@ -77,8 +104,8 @@ do_test tkt-cbd05-2.2 {
 } {}
 do_test tkt-cbd05-2.3 {
   execsql { 
-    SELECT tbl,idx,group_concat(sample,' ') 
-    FROM sqlite_stat2 
+    SELECT tbl,idx,group_concat(s(sample),' ') 
+    FROM vvv 
     WHERE idx = 't1_x' 
     GROUP BY tbl,idx
   }