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

1 files changed, 53 insertions, 1 deletions

diff --git a/lang/sql/sqlite/test/fts3d.test b/lang/sql/sqlite/test/fts3d.test
index 715980d8..818456bf 100644
--- a/lang/sql/sqlite/test/fts3d.test
+++ b/lang/sql/sqlite/test/fts3d.test
@@ -253,7 +253,6 @@ check_doclist fts3d-4.4.10 1 0 was {[2 0[1]]}
 
 # Optimize should leave the result in the level of the highest-level
 # prior segment.
-breakpoint
 do_test fts3d-4.5 {
   execsql {
     SELECT OPTIMIZE(t1) FROM t1 LIMIT 1;
@@ -304,4 +303,57 @@ do_test fts3d-5.1 {
   }
 } {{Index already optimal} 2 0}
 
+
+# ALTER TABLE RENAME should work regardless of the database encoding.
+#
+do_test fts3d-6.0 {
+  db close
+  forcedelete test.db
+  sqlite3 db test.db
+  db eval {
+    PRAGMA encoding=UTF8;
+    CREATE VIRTUAL TABLE fts USING fts3(a,b,c);
+    SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
+  }
+} {fts_content fts_segdir fts_segments}
+do_test fts3d-6.1 {
+  db eval {
+    ALTER TABLE fts RENAME TO xyz;
+    SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
+  }
+} {xyz_content xyz_segdir xyz_segments}
+do_test fts3d-6.2 {
+  db close
+  forcedelete test.db
+  sqlite3 db test.db
+  db eval {
+    PRAGMA encoding=UTF16le;
+    CREATE VIRTUAL TABLE fts USING fts3(a,b,c);
+    SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
+  }
+} {fts_content fts_segdir fts_segments}
+do_test fts3d-6.3 {
+  db eval {
+    ALTER TABLE fts RENAME TO xyz;
+    SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
+  }
+} {xyz_content xyz_segdir xyz_segments}
+do_test fts3d-6.4 {
+  db close
+  forcedelete test.db
+  sqlite3 db test.db
+  db eval {
+    PRAGMA encoding=UTF16be;
+    CREATE VIRTUAL TABLE fts USING fts3(a,b,c);
+    SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
+  }
+} {fts_content fts_segdir fts_segments}
+do_test fts3d-6.5 {
+  db eval {
+    ALTER TABLE fts RENAME TO xyz;
+    SELECT name FROM sqlite_master WHERE name GLOB '???_*' ORDER BY 1;
+  }
+} {xyz_content xyz_segdir xyz_segments}
+ 
+
 finish_test