Fix test cases so that they all still work even with -DSQLITE_DQS=0.

FossilOrigin-Name: 4883776669ee2f2310ea82b0d6df4d008eebaa7cb252102539cf21a635402ebb

28 files changed, 69 insertions, 49 deletions

diff --git a/test/altercol.test b/test/altercol.test
index d0c5c40ea..10ff9e773 100644
--- a/test/altercol.test
+++ b/test/altercol.test
@@ -838,6 +838,8 @@ do_execsql_test 22.0 {
 #-------------------------------------------------------------------------
 #
 reset_db
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DDL 1
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 do_execsql_test 22.0 {
   CREATE TABLE t1(a, b);
   CREATE INDEX x1 on t1("c"=b);
diff --git a/test/alterqf.test b/test/alterqf.test
index 6a8964186..400c4b6e7 100644
--- a/test/alterqf.test
+++ b/test/alterqf.test
@@ -25,6 +25,8 @@ ifcapable !altertable {
 
 
 sqlite3_test_control SQLITE_TESTCTRL_INTERNAL_FUNCTIONS db
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DDL 1
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 
 do_execsql_test 1.0 {
   CREATE TABLE t1(a, b, c);
@@ -89,6 +91,8 @@ foreach {tn before after} {
 
 #-------------------------------------------------------------------------
 reset_db
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DDL 1
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 do_execsql_test 2.0 {
   CREATE TABLE x1(
       one, two, three, PRIMARY KEY(one), 
diff --git a/test/check.test b/test/check.test
index 94fe1d14e..10d1cf4be 100644
--- a/test/check.test
+++ b/test/check.test
@@ -21,6 +21,8 @@ ifcapable !check {
   finish_test
   return
 }
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DDL 1
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 
 do_test check-1.1 {
   execsql {
@@ -138,6 +140,8 @@ do_test check-2.2 {
 } {1 2.2 three}
 db close
 sqlite3 db test.db
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DDL 1
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 do_test check-2.3 {
   execsql {
     INSERT INTO t2 VALUES(NULL, NULL, NULL);
diff --git a/test/collate1.test b/test/collate1.test
index 007dd7c37..b65b85047 100644
--- a/test/collate1.test
+++ b/test/collate1.test
@@ -338,6 +338,7 @@ do_test collate1-5.3 {
 #-------------------------------------------------------------------------
 # Fix problems with handling collation sequences named '"""'.
 #
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 do_execsql_test 6.1 {
   SELECT """""""";
 } {\"\"\"}
diff --git a/test/ctime.test b/test/ctime.test
index 1f07c1a94..26b2fa2ee 100644
--- a/test/ctime.test
+++ b/test/ctime.test
@@ -81,6 +81,7 @@ ifcapable threadsafe2 {
 
 # SQLITE_THREADSAFE should pretty much always be defined
 # one way or the other, and it must have a value of 0 or 1.
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 do_test ctime-1.4.1 {
   catchsql {
     SELECT sqlite_compileoption_used('SQLITE_THREADSAFE');
diff --git a/test/eval.test b/test/eval.test
index 360d158f3..159e8754d 100644
--- a/test/eval.test
+++ b/test/eval.test
@@ -81,7 +81,7 @@ do_test eval-3.1 {
 } {1 {} 102 2 {} 103 3 {} 104 4 {} 105}
 
 do_test eval-4.1 {
-  execsql { SELECT test_eval('SELECT "abcdefghij"') }
+  execsql { SELECT test_eval('SELECT ''abcdefghij''') }
 } {abcdefghij}
 
 finish_test
diff --git a/test/expr.test b/test/expr.test
index ec5c55c2e..c64b6cb70 100644
--- a/test/expr.test
+++ b/test/expr.test
@@ -970,6 +970,7 @@ do_realnum_test expr-13.7 {
   }
 } {9.22337203685478e+18}
 
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 do_execsql_test expr-13.8 {
   SELECT "" <= '';
 } {1}
diff --git a/test/fts3aj.test b/test/fts3aj.test
index f3d46f2ad..0c8969116 100644
--- a/test/fts3aj.test
+++ b/test/fts3aj.test
@@ -6,8 +6,6 @@
 # This file implements regression tests for SQLite library.  This
 # tests creating fts3 tables in an attached database.
 #
-# $Id: fts3aj.test,v 1.1 2007/08/20 17:38:42 shess Exp $
-#
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -25,14 +23,14 @@ sqlite3 db2 test2.db
 
 db eval {
   CREATE VIRTUAL TABLE t3 USING fts3(content);
-  INSERT INTO t3 (rowid, content) VALUES(1, "hello world");
+  INSERT INTO t3 (rowid, content) VALUES(1, 'hello world');
 }
 
 db2 eval {
   CREATE VIRTUAL TABLE t1 USING fts3(content);
-  INSERT INTO t1 (rowid, content) VALUES(1, "hello world");
-  INSERT INTO t1 (rowid, content) VALUES(2, "hello there");
-  INSERT INTO t1 (rowid, content) VALUES(3, "cruel world");
+  INSERT INTO t1 (rowid, content) VALUES(1, 'hello world');
+  INSERT INTO t1 (rowid, content) VALUES(2, 'hello there');
+  INSERT INTO t1 (rowid, content) VALUES(3, 'cruel world');
 }
 
 # This has always worked because the t1_* tables used by fts3 will be
@@ -56,9 +54,9 @@ do_test fts3aj-1.2 {
   execsql {
     ATTACH DATABASE 'test2.db' AS two;
     CREATE VIRTUAL TABLE two.t2 USING fts3(content);
-    INSERT INTO t2 (rowid, content) VALUES(1, "hello world");
-    INSERT INTO t2 (rowid, content) VALUES(2, "hello there");
-    INSERT INTO t2 (rowid, content) VALUES(3, "cruel world");
+    INSERT INTO t2 (rowid, content) VALUES(1, 'hello world');
+    INSERT INTO t2 (rowid, content) VALUES(2, 'hello there');
+    INSERT INTO t2 (rowid, content) VALUES(3, 'cruel world');
     SELECT rowid FROM t2 WHERE t2 MATCH 'hello';
     DETACH DATABASE two;
   }
@@ -74,8 +72,8 @@ do_test fts3aj-1.3 {
     ATTACH DATABASE 'test2.db' AS two;
 
     CREATE VIRTUAL TABLE two.t3 USING fts3(content);
-    INSERT INTO two.t3 (rowid, content) VALUES(2, "hello there");
-    INSERT INTO two.t3 (rowid, content) VALUES(3, "cruel world");
+    INSERT INTO two.t3 (rowid, content) VALUES(2, 'hello there');
+    INSERT INTO two.t3 (rowid, content) VALUES(3, 'cruel world');
     SELECT rowid FROM two.t3 WHERE t3 MATCH 'hello';
 
     DETACH DATABASE two;
diff --git a/test/fts3ak.test b/test/fts3ak.test
index a263f0b74..080efe52b 100644
--- a/test/fts3ak.test
+++ b/test/fts3ak.test
@@ -21,17 +21,17 @@ ifcapable !fts3 {
 
 db eval {
   CREATE VIRTUAL TABLE t1 USING fts3(content);
-  INSERT INTO t1 (rowid, content) VALUES(1, "hello world");
-  INSERT INTO t1 (rowid, content) VALUES(2, "hello there");
-  INSERT INTO t1 (rowid, content) VALUES(3, "cruel world");
+  INSERT INTO t1 (rowid, content) VALUES(1, 'hello world');
+  INSERT INTO t1 (rowid, content) VALUES(2, 'hello there');
+  INSERT INTO t1 (rowid, content) VALUES(3, 'cruel world');
 }
 
 # Test that possibly-buffered inserts went through after commit.
 do_test fts3ak-1.1 {
   execsql {
     BEGIN TRANSACTION;
-    INSERT INTO t1 (rowid, content) VALUES(4, "false world");
-    INSERT INTO t1 (rowid, content) VALUES(5, "false door");
+    INSERT INTO t1 (rowid, content) VALUES(4, 'false world');
+    INSERT INTO t1 (rowid, content) VALUES(5, 'false door');
     COMMIT TRANSACTION;
     SELECT rowid FROM t1 WHERE t1 MATCH 'world';
   }
@@ -42,8 +42,8 @@ do_test fts3ak-1.1 {
 do_test fts3ak-1.2 {
   execsql {
     BEGIN TRANSACTION;
-    INSERT INTO t1 (rowid, content) VALUES(6, "another world");
-    INSERT INTO t1 (rowid, content) VALUES(7, "another test");
+    INSERT INTO t1 (rowid, content) VALUES(6, 'another world');
+    INSERT INTO t1 (rowid, content) VALUES(7, 'another test');
     SELECT rowid FROM t1 WHERE t1 MATCH 'world';
     COMMIT TRANSACTION;
   }
@@ -54,8 +54,8 @@ do_test fts3ak-1.2 {
 do_test fts3ak-1.3 {
   execsql {
     BEGIN TRANSACTION;
-    INSERT INTO t1 (rowid, content) VALUES(8, "second world");
-    INSERT INTO t1 (rowid, content) VALUES(9, "second sight");
+    INSERT INTO t1 (rowid, content) VALUES(8, 'second world');
+    INSERT INTO t1 (rowid, content) VALUES(9, 'second sight');
     SELECT rowid FROM t1 WHERE t1 MATCH 'world';
     ROLLBACK TRANSACTION;
   }
@@ -73,8 +73,8 @@ do_test fts3ak-1.4 {
 do_test fts3ak-1.5 {
   execsql {
     BEGIN TRANSACTION;
-    INSERT INTO t1 (rowid, content) VALUES(10, "second world");
-    INSERT INTO t1 (rowid, content) VALUES(11, "second sight");
+    INSERT INTO t1 (rowid, content) VALUES(10, 'second world');
+    INSERT INTO t1 (rowid, content) VALUES(11, 'second sight');
     ROLLBACK TRANSACTION;
     SELECT rowid FROM t1 WHERE t1 MATCH 'world';
   }
@@ -84,7 +84,7 @@ do_test fts3ak-1.5 {
 do_test fts3ak-1.6 {
   execsql {
     BEGIN;
-    INSERT INTO t1 (rowid, content) VALUES(12, "third world");
+    INSERT INTO t1 (rowid, content) VALUES(12, 'third world');
     COMMIT;
     SELECT rowid FROM t1 WHERE t1 MATCH 'third';
   }
@@ -95,7 +95,7 @@ do_test fts3ak-1.6 {
 do_test fts3ak-1.7 {
   execsql {
     BEGIN;
-    INSERT INTO t1 (rowid, content) VALUES(13, "third dimension");
+    INSERT INTO t1 (rowid, content) VALUES(13, 'third dimension');
     CREATE TABLE x (c);
     COMMIT;
     SELECT rowid FROM t1 WHERE t1 MATCH 'dimension';
diff --git a/test/fts3corrupt.test b/test/fts3corrupt.test
index 828964b1b..8b958db5f 100644
--- a/test/fts3corrupt.test
+++ b/test/fts3corrupt.test
@@ -178,7 +178,7 @@ do_catchsql_test 6.10 {
   INSERT INTO f_segments (blockid) values (16);
   INSERT INTO f_segments values (0, x'');
   INSERT INTO f_stat VALUES (1,x'cf0f01');
-  INSERT INTO f(f) VALUES ("merge=1");
+  INSERT INTO f(f) VALUES ('merge=1');
 } {1 {database disk image is malformed}}
 
 # 2020-03-02 https://bugs.chromium.org/p/chromium/issues/detail?id=1057441
diff --git a/test/fts4noti.test b/test/fts4noti.test
index 670720397..87a05714b 100644
--- a/test/fts4noti.test
+++ b/test/fts4noti.test
@@ -173,7 +173,7 @@ do_execsql_test 6.1.1 {
   CREATE VIRTUAL TABLE t1 USING fts4(
     poiCategory, poiCategoryId, notindexed=poiCategoryId
   );
-  INSERT INTO t1(poiCategory, poiCategoryId) values ("Restaurant", 6021);
+  INSERT INTO t1(poiCategory, poiCategoryId) values ('Restaurant', 6021);
 }
 
 do_execsql_test 6.1.2 {
@@ -194,7 +194,7 @@ do_execsql_test 6.2.1 {
   CREATE VIRTUAL TABLE t1 USING fts4(
     poiCategory, poiCategoryId, notindexed=poiCategory
   );
-  INSERT INTO t1(poiCategory, poiCategoryId) values ("Restaurant", 6021);
+  INSERT INTO t1(poiCategory, poiCategoryId) values ('Restaurant', 6021);
 }
 
 do_execsql_test 6.2.2 {
diff --git a/test/func.test b/test/func.test
index 008819baa..df9d4dacf 100644
--- a/test/func.test
+++ b/test/func.test
@@ -1007,32 +1007,32 @@ do_test func-21.2 {
 } {1 {wrong number of arguments to function replace()}}
 do_test func-21.3 {
   execsql {
-    SELECT typeof(replace("This is the main test string", NULL, "ALT"));
+    SELECT typeof(replace('This is the main test string', NULL, 'ALT'));
   }
 } {null}
 do_test func-21.4 {
   execsql {
-    SELECT typeof(replace(NULL, "main", "ALT"));
+    SELECT typeof(replace(NULL, 'main', 'ALT'));
   }
 } {null}
 do_test func-21.5 {
   execsql {
-    SELECT typeof(replace("This is the main test string", "main", NULL));
+    SELECT typeof(replace('This is the main test string', 'main', NULL));
   }
 } {null}
 do_test func-21.6 {
   execsql {
-    SELECT replace("This is the main test string", "main", "ALT");
+    SELECT replace('This is the main test string', 'main', 'ALT');
   }
 } {{This is the ALT test string}}
 do_test func-21.7 {
   execsql {
-    SELECT replace("This is the main test string", "main", "larger-main");
+    SELECT replace('This is the main test string', 'main', 'larger-main');
   }
 } {{This is the larger-main test string}}
 do_test func-21.8 {
   execsql {
-    SELECT replace("aaaaaaa", "a", "0123456789");
+    SELECT replace('aaaaaaa', 'a', '0123456789');
   }
 } {0123456789012345678901234567890123456789012345678901234567890123456789}
 
@@ -1315,7 +1315,7 @@ do_test func-29.1 {
     CREATE TABLE t29(id INTEGER PRIMARY KEY, x, y);
     INSERT INTO t29 VALUES(1, 2, 3), (2, NULL, 4), (3, 4.5, 5);
     INSERT INTO t29 VALUES(4, randomblob(1000000), 6);
-    INSERT INTO t29 VALUES(5, "hello", 7);
+    INSERT INTO t29 VALUES(5, 'hello', 7);
   }
   db close
   sqlite3 db test.db
diff --git a/test/fuzz-oss1.test b/test/fuzz-oss1.test
index e77b7ed0f..46feeb62e 100644
--- a/test/fuzz-oss1.test
+++ b/test/fuzz-oss1.test
@@ -329,6 +329,8 @@ ifcapable !fts3 {
 db close
 forcedelete test.db
 sqlite3 db test.db
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DDL 1
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 do_test fuzz-oss1-gnomeshell {
   db eval {
 CREATE TABLE Resource (ID INTEGER NOT NULL PRIMARY KEY, Uri TEXT NOT
diff --git a/test/in.test b/test/in.test
index efbfbd037..b0eb371cb 100644
--- a/test/in.test
+++ b/test/in.test
@@ -281,12 +281,13 @@ do_test in-7.8.2 {
   db status step
 } {0}
 
-do_test in-8.1 {
+do_test in-8.3 {
   execsql {
     SELECT b FROM t1 WHERE a IN ('hello','there')
   }
 } {world}
-do_test in-8.2 {
+do_test in-8.4 {
+  sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
   execsql {
     SELECT b FROM t1 WHERE a IN ("hello",'there')
   }
diff --git a/test/index.test b/test/index.test
index 15120a40c..11d3d7191 100644
--- a/test/index.test
+++ b/test/index.test
@@ -428,7 +428,7 @@ do_test index-13.1 {
 } {1 2.0 3}
 do_test index-13.2 {
   set ::idxlist [execsql {
-    SELECT name FROM sqlite_master WHERE type="index" AND tbl_name="t5";
+    SELECT name FROM sqlite_master WHERE type='index' AND tbl_name='t5';
   }]
   llength $::idxlist
 } {3}
diff --git a/test/join.test b/test/join.test
index cb3ccc65d..221dbdd09 100644
--- a/test/join.test
+++ b/test/join.test
@@ -439,6 +439,7 @@ do_test join-5.1 {
 # A test for ticket #247.
 #
 do_test join-7.1 {
+  sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
   execsql {
     CREATE TABLE t7 (x, y);
     INSERT INTO t7 VALUES ("pa1", 1);
diff --git a/test/misc1.test b/test/misc1.test
index 758d4082e..b1b1b083c 100644
--- a/test/misc1.test
+++ b/test/misc1.test
@@ -652,7 +652,7 @@ do_catchsql_test misc1-21.2 {
 
 # 2015-04-15
 do_execsql_test misc1-22.1 {
-  SELECT ""+3 FROM (SELECT ""+5);
+  SELECT ''+3 FROM (SELECT ''+5);
 } {3}
 
 # 2015-04-19: NULL pointer dereference on a corrupt schema
diff --git a/test/quote.test b/test/quote.test
index 9810a3ca0..6d7b317ea 100644
--- a/test/quote.test
+++ b/test/quote.test
@@ -173,6 +173,7 @@ ifcapable altertable {
     INSERT INTO t1 VALUES(1,2,3),(1,4,5);
     ALTER TABLE t1 DROP COLUMN b;
   } {1 {error in index x1 after drop column: no such column: b}}
+  sqlite3_db_config db SQLITE_DBCONFIG_DQS_DDL 1
   do_catchsql_test 3.5 {
     DROP TABLE t1;
     CREATE TABLE t1(a, b, c);
diff --git a/test/select6.test b/test/select6.test
index ef5c5b2f0..612afefa6 100644
--- a/test/select6.test
+++ b/test/select6.test
@@ -169,7 +169,6 @@ do_test select6-3.2 {
        FROM (SELECT count(*) as p , b as q FROM t2 GROUP BY q) AS a,
             (SELECT max(a) as r, b as s FROM t2 GROUP BY s) as b
        WHERE a.q=b.s ORDER BY a.q)
-    ORDER BY "a.q"
   }
 } {1 1 1 2 2 3 3 4 7 4 8 15 5 5 20}
 do_test select6-3.3 {
diff --git a/test/subquery.test b/test/subquery.test
index e3b4281ed..a048f9ed4 100644
--- a/test/subquery.test
+++ b/test/subquery.test
@@ -477,7 +477,7 @@ do_test subquery-5.1 {
     INSERT INTO t5 VALUES(3,33);
     INSERT INTO t5 VALUES(4,44);
     SELECT b FROM t5 WHERE a IN 
-       (SELECT callcnt(y)+0 FROM t4 WHERE x="two")
+       (SELECT callcnt(y)+0 FROM t4 WHERE x='two')
   }
 } {22}
 do_test subquery-5.2 {
diff --git a/test/swarmvtab.test b/test/swarmvtab.test
index 9d2919bee..b4b94487a 100644
--- a/test/swarmvtab.test
+++ b/test/swarmvtab.test
@@ -209,8 +209,8 @@ db func fetch_db fetch_db
 do_catchsql_test 3.1 {
   CREATE VIRTUAL TABLE temp.xyz USING swarmvtab(
     'VALUES
-        ("test.db1", "t1", 1, 10),
-        ("test.db2", "t1", 11, 20)
+        (''test.db1'', ''t1'', 1, 10),
+        (''test.db2'', ''t1'', 11, 20)
     ', 'fetch_db_no_such_function'
   );
 } {1 {sql error: no such function: fetch_db_no_such_function}}
@@ -218,8 +218,8 @@ do_catchsql_test 3.1 {
 do_catchsql_test 3.2 {
   CREATE VIRTUAL TABLE temp.xyz USING swarmvtab(
     'VALUES
-        ("test.db1", "t1", 1, 10),
-        ("test.db2", "t1", 11, 20)
+        (''test.db1'', ''t1'', 1, 10),
+        (''test.db2'', ''t1'', 11, 20)
     ', 'fetch_db'
   );
 } {1 {fetch_db error!}}
@@ -233,8 +233,8 @@ do_execsql_test 3.3.1 {
   DETACH aux;
   CREATE VIRTUAL TABLE temp.xyz USING swarmvtab(
     'VALUES
-        ("test.db1", "t1", 1, 10),
-        ("test.db2", "t1", 11, 20)
+        (''test.db1'', ''t1'', 1, 10),
+        (''test.db2'', ''t1'', 11, 20)
     ', 'fetch_db'
   );
 } {}
diff --git a/test/tkt-7bbfb7d442.test b/test/tkt-7bbfb7d442.test
index 56d4caeb3..c020b515e 100644
--- a/test/tkt-7bbfb7d442.test
+++ b/test/tkt-7bbfb7d442.test
@@ -146,7 +146,7 @@ do_execsql_test 2.2 {
 } {31 10}
 
 do_execsql_test 2.3 {
-  SELECT CASE WHEN DeliveredQty=10 THEN "TEST PASSED!" ELSE "TEST FAILED!" END 
+  SELECT CASE WHEN DeliveredQty=10 THEN 'TEST PASSED!' ELSE 'TEST FAILED!' END 
   FROM InventoryControl WHERE SKU=31; 
 } {{TEST PASSED!}}
 
diff --git a/test/tkt3442.test b/test/tkt3442.test
index 13d29a1b0..aaf266239 100644
--- a/test/tkt3442.test
+++ b/test/tkt3442.test
@@ -38,6 +38,7 @@ do_test tkt3442-1.1 {
 # SELECT referenced in ticket #3442 (both '5000' and "5000") 
 # and verify that the query plan is the same.
 #
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 do_eqp_test tkt3442-1.2 {
   SELECT node FROM listhash WHERE id='5000' LIMIT 1;
 } {SEARCH listhash USING INDEX ididx (id=?)}
diff --git a/test/tkt3841.test b/test/tkt3841.test
index df6de5c2f..542c1bb5e 100644
--- a/test/tkt3841.test
+++ b/test/tkt3841.test
@@ -22,6 +22,7 @@ ifcapable !subquery {
   return
 }
 
+sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
 do_test tkt3841.1 {
   execsql {
     CREATE TABLE table2 (key TEXT, x TEXT);
diff --git a/test/update.test b/test/update.test
index 7be360726..66efd10ec 100644
--- a/test/update.test
+++ b/test/update.test
@@ -627,7 +627,7 @@ ifcapable altertable {
     CREATE INDEX t15c ON t15(c);
     INSERT INTO t15(a,b)
       VALUES(5,'zyx'),(15,'wvu'),(25,'tsr'),(35,'qpo');
-    UPDATE t15 SET c=printf("y%d",a) WHERE c IS NULL;
+    UPDATE t15 SET c=printf('y%d',a) WHERE c IS NULL;
     SELECT a,b,c,'|' FROM t15 ORDER BY a;
   } {5 zyx y5 | 10 abc y10 | 15 wvu y15 | 20 def y20 | 25 tsr y25 | 30 ghi y30 | 35 qpo y35 |}
 }
diff --git a/test/utf16align.test b/test/utf16align.test
index f026d9575..ef10bc659 100644
--- a/test/utf16align.test
+++ b/test/utf16align.test
@@ -32,6 +32,7 @@ ifcapable !utf16 {
 do_test utf16align-1.0 {
   set unaligned_string_counter 0
   add_alignment_test_collations [sqlite3_connection_pointer db]
+  sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
   execsql {
     PRAGMA encoding=UTF16;
     CREATE TABLE t1(
diff --git a/test/vtab6.test b/test/vtab6.test
index f4504b017..ffbe430c6 100644
--- a/test/vtab6.test
+++ b/test/vtab6.test
@@ -351,6 +351,7 @@ do_test vtab6-4.10 {
 # A test for ticket #247.
 #
 do_test vtab6-7.1 {
+  sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
   execsql {
     INSERT INTO t7 VALUES ("pa1", 1);
     INSERT INTO t7 VALUES ("pa2", NULL);
diff --git a/test/window6.test b/test/window6.test
index c6889c72a..b5e677208 100644
--- a/test/window6.test
+++ b/test/window6.test
@@ -148,6 +148,7 @@ do_execsql_test 5.5 {
 #
 
 ifcapable !icu {
+  sqlite3_db_config db SQLITE_DBCONFIG_DQS_DML 1
   do_execsql_test 6.0 {
     SELECT LIKE('!', '', '!') x WHERE x;
   } {}