aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/altertab2.test2
-rw-r--r--test/altertab3.test12
-rw-r--r--test/bestindexC.test74
-rw-r--r--test/dblwidth-a.sql20
-rw-r--r--test/fts3join.test5
-rw-r--r--test/func9.test3
-rw-r--r--test/hook.test10
-rw-r--r--test/join.test80
-rw-r--r--test/joinH.test70
-rw-r--r--test/json101.test2
-rw-r--r--test/parser1.test22
-rw-r--r--test/snapshot3.test3
-rwxr-xr-xtest/speedtest.tcl15
-rw-r--r--test/strict1.test97
-rw-r--r--test/tclsqlite.test153
-rw-r--r--test/testrunner_data.tcl17
-rw-r--r--test/vacuum.test21
-rw-r--r--test/walcksum.test148
-rw-r--r--test/walsetlk2.test2
-rw-r--r--test/walsetlk_recover.test104
-rw-r--r--test/walsetlk_snapshot.test109
21 files changed, 897 insertions, 72 deletions
diff --git a/test/altertab2.test b/test/altertab2.test
index 56e42f1a6..f2a1d74c4 100644
--- a/test/altertab2.test
+++ b/test/altertab2.test
@@ -358,7 +358,7 @@ do_catchsql_test 8.6 {
CREATE INDEX i0 ON t0(likelihood(1,2) AND 0);
ALTER TABLE t0 RENAME TO t1;
SELECT sql FROM sqlite_master WHERE name='i0';
-} {1 {error in index i0: second argument to likelihood() must be a constant between 0.0 and 1.0}}
+} {1 {second argument to likelihood() must be a constant between 0.0 and 1.0}}
reset_db
diff --git a/test/altertab3.test b/test/altertab3.test
index 5f5c11b0b..92060fb41 100644
--- a/test/altertab3.test
+++ b/test/altertab3.test
@@ -190,14 +190,14 @@ do_execsql_test 8.1 {
}
do_execsql_test 8.2.1 {
CREATE TABLE t2 (c0);
- CREATE INDEX i2 ON t2((LIKELIHOOD(c0, 100) IN ()));
+ CREATE INDEX i2 ON t2((LIKELIHOOD(c0, 1.0) IN ()));
ALTER TABLE t2 RENAME COLUMN c0 TO c1;
}
do_execsql_test 8.2.2 {
SELECT sql FROM sqlite_master WHERE tbl_name = 't2';
} {
{CREATE TABLE t2 (c1)}
- {CREATE INDEX i2 ON t2((LIKELIHOOD(c0, 100) IN ()))}
+ {CREATE INDEX i2 ON t2((LIKELIHOOD(c1, 1.0) IN ()))}
}
do_test 8.2.3 {
sqlite3 db2 test.db
@@ -662,14 +662,6 @@ do_execsql_test 27.2 {
{CREATE TABLE t1(a, b AS ((WITH w1 (xyz) AS ( SELECT t1.b FROM t1 ) SELECT 123) IN ()))}
}
-do_execsql_test 27.3 {
- CREATE TABLE t0(c0 , c1 AS (CASE TRUE NOT IN () WHEN NULL THEN CASE + 0xa ISNULL WHEN NOT + 0x9 THEN t0.c1 ELSE CURRENT_TIME LIKE CAST (t0.c1 REGEXP '-([1-9]\d*.\d*|0\.\d*[1-9]\d*)'ESCAPE (c1) COLLATE BINARY BETWEEN c1 AND c1 NOT IN (WITH t4 (c0) AS (WITH t3 (c0) AS NOT MATERIALIZED (WITH RECURSIVE t2 (c0) AS (WITH RECURSIVE t1 AS (VALUES (x'717171ff71717171' ) ) SELECT DISTINCT t0.c0 FROM t0 NOT INDEXED WHERE t0.c0 =t0.c0 GROUP BY 0x9 ) SELECT DISTINCT t0.c0 FROM t0 NOT INDEXED WHERE t0.c0 =t0.c1 ) SELECT DISTINCT t0.c0 FROM t0 NOT INDEXED WHERE t0.c0 =t0.c0 GROUP BY typeof(0x9 ) ) SELECT DISTINCT t0.c0 FROM t0 NOT INDEXED WHERE t0.c0 =t0.c0 GROUP BY typeof(typeof(0x9 ) ) ) IN t0 BETWEEN typeof(typeof(typeof(hex(*) FILTER (WHERE + x'5ccd1e68' ) ) ) ) AND 1 >0xa AS BLOB (+4.4E4 , -0xe ) ) END <> c1 IN () END ) VIRTUAL , c35 PRIMARY KEY , c60 , c64 NUMERIC (-6.8 , -0xE ) ) WITHOUT ROWID ;
-} {}
-
-do_execsql_test 27.4 {
- ALTER TABLE t0 DROP COLUMN c60;
-} {}
-
#-------------------------------------------------------------------------
reset_db
do_execsql_test 28.1 {
diff --git a/test/bestindexC.test b/test/bestindexC.test
index 48f3a2765..8b96a19e6 100644
--- a/test/bestindexC.test
+++ b/test/bestindexC.test
@@ -349,4 +349,78 @@ do_execsql_test 5.9 {
three six seven
}
+#--------------------------------------------------------------------------
+
+reset_db
+register_tcl_module db
+
+proc quote {str} {
+ return "'[string map {' ''} $str]'"
+}
+
+proc vtab_command {lVal method args} {
+ switch -- $method {
+ xConnect {
+ return "CREATE TABLE t1(a, b, c, d)"
+ }
+
+ xBestIndex {
+ set hdl [lindex $args 0]
+ set clist [$hdl constraints]
+
+ set idx 0
+ set idxnum 0
+
+ foreach c $clist {
+ array set a $c
+ if {$a(usable)==0} continue
+
+ if {$a(op)=="limit"} {
+ set idxnum [$hdl rhs_value $idx 555]
+ }
+
+ incr idx
+ }
+
+ return "cost 1000 rows 1000 idxnum $idxnum"
+
+ }
+
+ xFilter {
+ foreach {idxnum idxstr lArg} $args {}
+ return [list sql "SELECT 0, $idxnum, $idxnum, $idxnum, $idxnum"]
+ }
+ }
+
+ return {}
+}
+
+do_execsql_test 6.0 {
+ CREATE TABLE t1(x, y);
+ INSERT INTO t1 VALUES(2, 2);
+ CREATE VIRTUAL TABLE x1 USING tcl(vtab_command t1);
+}
+
+do_execsql_test 6.1 { SELECT * FROM x1 LIMIT 50 } {50 50 50 50}
+
+do_execsql_test 6.2 { SELECT * FROM x1 WHERE b=c LIMIT 5 } {0 0 0 0}
+
+do_execsql_test 6.3 {
+ SELECT (SELECT a FROM x1 WHERE t1.x=t1.y LIMIT 10) FROM t1
+} {0}
+
+do_execsql_test 6.4 {
+ SELECT (SELECT a FROM x1 WHERE x1.a=1) FROM t1
+} {1}
+
+do_execsql_test 6.5 {
+ SELECT (SELECT a FROM x1 WHERE x1.a=1 LIMIT 1) FROM t1
+} {1}
+
+do_execsql_test 6.6 {
+ SELECT (SELECT a FROM x1 WHERE x1.a=555 LIMIT 2) FROM t1
+} {555}
+
finish_test
+
+
diff --git a/test/dblwidth-a.sql b/test/dblwidth-a.sql
new file mode 100644
index 000000000..38c219698
--- /dev/null
+++ b/test/dblwidth-a.sql
@@ -0,0 +1,20 @@
+/*
+** Run this script using "sqlite3" to confirm that the command-line
+** shell properly handles the output of double-width characters.
+**
+** https://sqlite.org/forum/forumpost/008ac80276
+*/
+.mode box
+CREATE TABLE data(word TEXT, description TEXT);
+INSERT INTO data VALUES('〈οὐκέτι〉','Greek without dblwidth <...>');
+.print .mode box
+SELECT * FROM data;
+.mode table
+.print .mode table
+SELECT * FROM data;
+.mode qbox
+.print .mode qbox
+SELECT * FROM data;
+.mode column
+.print .mode column
+SELECT * FROM data;
diff --git a/test/fts3join.test b/test/fts3join.test
index cbd08b63f..9171c817b 100644
--- a/test/fts3join.test
+++ b/test/fts3join.test
@@ -97,11 +97,8 @@ do_eqp_test 4.2 {
WHERE t4.y = ?;
} {
QUERY PLAN
- |--MATERIALIZE rr
- | `--SCAN ft4 VIRTUAL TABLE INDEX 3:
|--SCAN t4
- |--BLOOM FILTER ON rr (docid=?)
- `--SEARCH rr USING AUTOMATIC COVERING INDEX (docid=?) LEFT-JOIN
+ `--SCAN ft4 VIRTUAL TABLE INDEX 3: LEFT-JOIN
}
finish_test
diff --git a/test/func9.test b/test/func9.test
index 42138ab2e..2383b76f6 100644
--- a/test/func9.test
+++ b/test/func9.test
@@ -26,6 +26,9 @@ do_catchsql_test func9-120 {
do_execsql_test func9-130 {
SELECT concat_ws(',',1,2,3,4,5,6,7,8,NULL,9,10,11,12);
} {1,2,3,4,5,6,7,8,9,10,11,12}
+do_execsql_test func9-131 {
+ SELECT concat_ws(',',1,2,3,4,'',6,7,8,NULL,9,10,11,12);
+} {1,2,3,4,,6,7,8,9,10,11,12}
do_execsql_test func9-140 {
SELECT concat_ws(NULL,1,2,3,4,5,6,7,8,NULL,9,10,11,12);
} {{}}
diff --git a/test/hook.test b/test/hook.test
index 8638d3a6b..a4256732e 100644
--- a/test/hook.test
+++ b/test/hook.test
@@ -488,11 +488,21 @@ proc preupdate_hook {args} {
set type [lindex $args 0]
eval lappend ::preupdate $args
if {$type != "INSERT"} {
+ set x [catch {db preupdate old [db preupdate count]}]
+ if {!$x} {
+ lappend "ERROR: sqlite3_preupdate_old() accepted an out-of-bounds\
+ column index"
+ }
for {set i 0} {$i < [db preupdate count]} {incr i} {
lappend ::preupdate [db preupdate old $i]
}
}
if {$type != "DELETE"} {
+ set x [catch {db preupdate new [db preupdate count]}]
+ if {!$x} {
+ lappend "ERROR: sqlite3_preupdate_old() accepted an out-of-bounds\
+ column index"
+ }
for {set i 0} {$i < [db preupdate count]} {incr i} {
set rc [catch { db preupdate new $i } v]
lappend ::preupdate $v
diff --git a/test/join.test b/test/join.test
index b34136f5d..b33a7560a 100644
--- a/test/join.test
+++ b/test/join.test
@@ -1002,6 +1002,21 @@ do_execsql_test join-20.2 {
SELECT * FROM t0 LEFT JOIN t1 WHERE NULL IN (c1);
} {}
+# 2025-05-29 forum post 7dee41d32506c4ae
+# The complaint in the forum post appears to be the same as for the
+# ticket on 2019-11-02, only for RIGHT JOIN instead of LEFT JOIN. Note
+# that RIGHT JOIN did not yet exist in SQLite when the ticket was
+# written and fixed.
+#
+do_execsql_test join-20.3 {
+ DROP TABLE t1;
+ CREATE TABLE t1(x INT); INSERT INTO t1(x) VALUES(1);
+ CREATE TABLE t2(y BOOLEAN); INSERT INTO t2(y) VALUES(false);
+ CREATE TABLE t3(z INT); INSERT INTO t3(z) VALUES(3);
+ CREATE INDEX t2y ON t2(y) WHERE y;
+ SELECT quote(z) FROM t1 RIGHT JOIN t2 ON y LEFT JOIN t3 ON y;
+} {NULL}
+
# 2019-11-30 ticket 7f39060a24b47353
# Do not allow a WHERE clause term to qualify a partial index on the
# right table of a LEFT JOIN.
@@ -1289,4 +1304,69 @@ do_execsql_test join-30.3 {
WHERE x <= y;
} {}
+# 2025-05-30 https://sqlite.org/forum/forumpost/4fc70203b61c7e12
+#
+# When converting a USING(x) or NATURAL into the constraint expression
+# t1.x==t2.x, mark the t1.x term as EP_CanBeNull if it is the left table
+# of a RIGHT JOIN.
+#
+reset_db
+db null NULL
+do_execsql_test join-31.1 {
+ CREATE TABLE t1(c0 INT , c1 INT); INSERT INTO t1(c0, c1) VALUES(NULL,11);
+ CREATE TABLE t2(c0 INT NOT NULL);
+ CREATE TABLE t2n(c0 INT);
+ CREATE TABLE t3(x INT); INSERT INTO t3(x) VALUES(3);
+ CREATE TABLE t4(y INT); INSERT INTO t4(y) VALUES(4);
+ CREATE TABLE t5(c0 INT, x INT); INSERT INTO t5 VALUES(NULL, 5);
+}
+do_execsql_test join-31.2 {
+ SELECT * FROM t2 RIGHT JOIN t3 ON true LEFT JOIN t1 USING(c0);
+} {NULL 3 NULL}
+do_execsql_test join-31.3 {
+ SELECT * FROM t2 RIGHT JOIN t3 ON true NATURAL LEFT JOIN t1;
+} {NULL 3 NULL}
+do_execsql_test join-31.4 {
+ SELECT * FROM t2n RIGHT JOIN t3 ON true LEFT JOIN t1 USING(c0);
+} {NULL 3 NULL}
+do_execsql_test join-31.5 {
+ SELECT * FROM t5 LEFT JOIN t1 USING(c0);
+} {NULL 5 NULL}
+do_execsql_test join-31.6 {
+ SELECT * FROM t3 LEFT JOIN t2 ON true LEFT JOIN t1 USING(c0);
+} {3 NULL NULL}
+do_execsql_test join-31.7 {
+ SELECT * FROM t3 LEFT JOIN t2 ON true NATURAL LEFT JOIN t1;
+} {3 NULL NULL}
+do_execsql_test join-31.8 {
+ SELECT * FROM t3 LEFT JOIN t2 ON true JOIN t4 ON true NATURAL LEFT JOIN t1;
+} {3 NULL 4 NULL}
+
+# 2025-06-16 https://sqlite.org/forum/forumpost/68f29a2005
+#
+# The transitive-constraint optimization was not working for RIGHT JOIN.
+#
+reset_db
+db null NULL
+do_execsql_test join-32.1 {
+ CREATE TABLE t0(w INT);
+ CREATE TABLE t1(x INT);
+ CREATE TABLE t2(y INT UNIQUE);
+ CREATE VIEW v0(z) AS SELECT CAST(x AS INT) FROM t1 LEFT JOIN t2 ON true;
+ INSERT INTO t1(x) VALUES(123);
+ INSERT INTO t2(y) VALUES(NULL);
+}
+do_execsql_test join-32.2 {
+ SELECT *
+ FROM t0 JOIN v0 ON w=z
+ RIGHT JOIN t1 ON true
+ INNER JOIN t2 ON y IS z;
+} {NULL NULL 123 NULL}
+do_execsql_test join-32.3 {
+ SELECT *
+ FROM t0 JOIN v0 ON w=z
+ RIGHT JOIN t1 ON true
+ INNER JOIN t2 ON +y IS z;
+} {NULL NULL 123 NULL}
+
finish_test
diff --git a/test/joinH.test b/test/joinH.test
index 908b93dee..339200968 100644
--- a/test/joinH.test
+++ b/test/joinH.test
@@ -341,4 +341,74 @@ do_execsql_test 13.4 {
GROUP BY a1.a ORDER BY 1;
} {-1480 240 480}
+#-------------------------------------------------------------------------
+# 2025-05-30
+# https://sqlite.org/forum/forumpost/5028c785b6
+#
+reset_db
+
+do_execsql_test 14.0 {
+ CREATE TABLE t1(c0 INT);
+ CREATE TABLE t2(c0 BLOB);
+ CREATE TABLE t3(c0 BLOB);
+ CREATE TABLE t4(c4 BLOB);
+ INSERT INTO t1(c0) VALUES(0);
+ INSERT INTO t3(c0) VALUES('0');
+}
+
+do_execsql_test 14.1.1 {
+ SELECT * FROM t1 NATURAL LEFT JOIN t2 NATURAL JOIN t3;
+} {0}
+
+do_execsql_test 14.1.2 {
+ SELECT * FROM t1 NATURAL LEFT JOIN t2 NATURAL JOIN t3 FULL JOIN t4 ON true;
+} {0 {}}
+
+do_execsql_test 14.1.3 {
+ SELECT * FROM (t1 NATURAL LEFT JOIN t2 NATURAL JOIN t3) FULL JOIN t4 ON true;
+} {0 {}}
+
+do_execsql_test 14.1.4 {
+ SELECT *
+ FROM (t1 NATURAL LEFT JOIN t2 NATURAL JOIN t3) AS qq FULL JOIN t4 ON true;
+} {0 {}}
+
+do_execsql_test 14.2.1 {
+ SELECT * FROM t3 NATURAL LEFT JOIN t2 NATURAL JOIN t1;
+} {0}
+
+do_execsql_test 14.2.2 {
+ SELECT * FROM t3 NATURAL LEFT JOIN t2 NATURAL JOIN t1 FULL JOIN t4 ON true;
+} {0 {}}
+
+do_execsql_test 14.2.3 {
+ SELECT * FROM (t3 NATURAL LEFT JOIN t2 NATURAL JOIN t1) FULL JOIN t4 ON true;
+} {0 {}}
+
+do_execsql_test 14.2.4 {
+ SELECT *
+ FROM (t3 NATURAL LEFT JOIN t2 NATURAL JOIN t1) AS qq FULL JOIN t4 ON true;
+} {0 {}}
+
+# 2025-06-01
+#
+reset_db
+do_execsql_test 15.1 {
+ CREATE TABLE t0(c0);
+ CREATE TABLE t1(c0);
+ CREATE TABLE t2(c0);
+ INSERT INTO t0 VALUES ('1.0');
+ INSERT INTO t2(c0) VALUES (9);
+ SELECT t0.c0,t2.c0 FROM (SELECT CAST(t0.c0 as REAL) AS c0 FROM t0) as subquery NATURAL LEFT JOIN t1 NATURAL JOIN t0 RIGHT JOIN t2 ON 1;
+} {1.0 9}
+do_execsql_test 15.2 {
+ CREATE TABLE x1(x COLLATE nocase);
+ CREATE TABLE x2(x);
+ CREATE TABLE x3(x);
+ CREATE TABLE t4(y);
+ INSERT INTO x1 VALUES('ABC');
+ INSERT INTO x3 VALUES('abc');
+ SELECT lower(x), quote(y) FROM x1 LEFT JOIN x2 USING (x) JOIN x3 USING (x) FULL JOIN t4;
+} {abc NULL}
+
finish_test
diff --git a/test/json101.test b/test/json101.test
index aec959acb..e22902f86 100644
--- a/test/json101.test
+++ b/test/json101.test
@@ -1113,7 +1113,7 @@ do_execsql_test json101-21.26 {
do_execsql_test json101-21.27 {
WITH c(x,y) AS (VALUES('a',1),('b',2.0),('c',NULL),(NULL,'three'),('e','four'))
SELECT json_group_object(x,y) FROM c;
-} {{{"a":1,"b":2.0,"c":null,:"three","e":"four"}}}
+} {{{"a":1,"b":2.0,"c":null,"e":"four"}}}
# 2023-10-09 https://sqlite.org/forum/forumpost/b25edc1d46
# UAF due to JSON cache overflow
diff --git a/test/parser1.test b/test/parser1.test
index ad95b4909..b8d3d8b42 100644
--- a/test/parser1.test
+++ b/test/parser1.test
@@ -100,4 +100,26 @@ do_execsql_test parser1-3.1 {
PRAGMA foreign_key_list(t301);
} {0 0 t300 c2 id RESTRICT CASCADE NONE 1 0 t300 c1 id RESTRICT CASCADE NONE}
+# 2025-07-01 https://sqlite.org/forum/forumpost/f4878de3e7dd4764
+# Do not allow parse-time optimizations to omit aggregate functions,
+# because doing so can change the meaning of the query.
+#
+unset -nocomplain zero
+set zero [expr {0+0}]
+do_execsql_test parser1-4.1 {
+ DROP TABLE IF EXISTS t1;
+ CREATE TABLE t1(x);
+ SELECT max(x) AND $zero FROM t1;
+} 0
+do_execsql_test parser1-4.2 {
+ SELECT max(x) AND 0 FROM t1;
+} 0
+do_execsql_test parser1-4.3 {
+ SELECT max(x) IN () FROM t1;
+} 0
+do_execsql_test parser1-4.4 {
+ SELECT max(x) NOT IN () FROM t1;
+} 1
+
+
finish_test
diff --git a/test/snapshot3.test b/test/snapshot3.test
index 470d463a6..6d57b1d0c 100644
--- a/test/snapshot3.test
+++ b/test/snapshot3.test
@@ -96,6 +96,9 @@ do_test 1.8 {
list [catch { sqlite3_snapshot_open_blob db3 main $snap } msg] $msg
} {1 SQLITE_ERROR_SNAPSHOT}
+db3 close
+db2 close
+
#-------------------------------------------------------------------------
reset_db
do_execsql_test 2.0 {
diff --git a/test/speedtest.tcl b/test/speedtest.tcl
index 1ad92d9ab..7cd3b5fa1 100755
--- a/test/speedtest.tcl
+++ b/test/speedtest.tcl
@@ -25,6 +25,7 @@ Other options include:
--help Show this help screen.
--lean "Lean" mode.
--lookaside N SZ Lookahead uses N slots of SZ bytes each.
+ --osmalloc Use the OS native malloc() instead of MEMSYS5
--pagesize N Use N as the page size.
--quiet | -q "Quite". Put results in file but don't pop up editor
--size N Change the test size. 100 means 100%. Default: 5.
@@ -40,7 +41,8 @@ set cc gcc
set testset mix1
set dryrun 0
set quiet 0
-set speedtestflags {--shrink-memory --reprepare --stats --heap 40000000 64}
+set osmalloc 0
+set speedtestflags {--shrink-memory --reprepare --stats}
lappend speedtestflags --journal wal --size 5
for {set i 0} {$i<[llength $argv]} {incr i} {
@@ -92,6 +94,10 @@ for {set i 0} {$i<[llength $argv]} {incr i} {
--dryrun {
set dryrun 1
}
+ -osmalloc -
+ --osmalloc {
+ set osmalloc 1
+ }
-? -
-help -
--help {
@@ -139,10 +145,13 @@ for {set i 0} {$i<[llength $argv]} {incr i} {
if {[lsearch -glob $cflags -O*]<0} {
lappend cflags -Os
}
-if {[lsearch -glob $cflags -DSQLITE_ENABLE_MEMSYS*]<0} {
+if {!$osmalloc} {
+ append speedtestflags { --heap 40000000 64}
+}
+if {!$osmalloc && [lsearch -glob $cflags {-DSQLITE_ENABLE_MEMSYS*}]<0} {
lappend cflags -DSQLITE_ENABLE_MEMSYS5
}
-if {[lsearch -glob $cflags -DSQLITE_ENABLE_RTREE*]<0} {
+if {[lsearch -glob $cflags {-DSQLITE_ENABLE_RTREE*}]<0} {
lappend cflags -DSQLITE_ENABLE_RTREE
}
if {$srcfile==""} {
diff --git a/test/strict1.test b/test/strict1.test
index fc6438843..c4c086bdb 100644
--- a/test/strict1.test
+++ b/test/strict1.test
@@ -162,4 +162,101 @@ do_execsql_test strict1-8.2 {
SELECT *, '|' FROM t1;
} {/5.0 5.0 4.6116\d*e\+18 4.6116\d+e\+18 |/}
+# 2025-06-18 https://sqlite.org/forum/forumpost/6caf195248a849e4
+#
+# Enforce STRICT table type constraints on STORED generated columns
+#
+do_execsql_test strict1-9.1 {
+ CREATE TABLE strict (
+ k INTEGER PRIMARY KEY,
+ c1 REAL AS(if(k=11,1.5, k=12,2, k=13,'x', k=14,x'34', 0.0)) STORED,
+ c2 INT AS(if(k=21,1.5, k=22,2, k=23,'x', k=24,x'34', 0)) STORED,
+ c3 TEXT AS(if(k=31,1.5, k=32,2, k=33,'x', k=34,x'34', 'x')) STORED,
+ c4 BLOB AS(if(k=41,1.5, k=42,2, k=43,'x', k=44,x'34', x'00')) STORED,
+ c5 ANY AS(if(k=51,1.5, k=52,2, k=53,'x', k=54,x'34', 0)) STORED
+ ) STRICT;
+ INSERT INTO strict(k) VALUES(11);
+ INSERT INTO strict(k) VALUES(12);
+ INSERT INTO strict(k) VALUES(22);
+ INSERT INTO strict(k) VALUES(31);
+ INSERT INTO strict(k) VALUES(32);
+ INSERT INTO strict(k) VALUES(33);
+ INSERT INTO strict(k) VALUES(44);
+ PRAGMA integrity_check;
+} {ok}
+do_catchsql_test strict1-9.2.13 {
+ INSERT INTO strict(k) VALUES(13);
+} {1 {cannot store TEXT value in REAL column strict.c1}}
+do_catchsql_test strict1-9.2.14 {
+ INSERT INTO strict(k) VALUES(14);
+} {1 {cannot store BLOB value in REAL column strict.c1}}
+do_catchsql_test strict1-9.2.21 {
+ INSERT INTO strict(k) VALUES(21);
+} {1 {cannot store REAL value in INT column strict.c2}}
+do_catchsql_test strict1-9.2.23 {
+ INSERT INTO strict(k) VALUES(23);
+} {1 {cannot store TEXT value in INT column strict.c2}}
+do_catchsql_test strict1-9.2.24 {
+ INSERT INTO strict(k) VALUES(24);
+} {1 {cannot store BLOB value in INT column strict.c2}}
+do_catchsql_test strict1-9.2.34 {
+ INSERT INTO strict(k) VALUES(34);
+} {1 {cannot store BLOB value in TEXT column strict.c3}}
+do_catchsql_test strict1-9.2.41 {
+ INSERT INTO strict(k) VALUES(41);
+} {1 {cannot store REAL value in BLOB column strict.c4}}
+do_catchsql_test strict1-9.2.42 {
+ INSERT INTO strict(k) VALUES(42);
+} {1 {cannot store INT value in BLOB column strict.c4}}
+do_catchsql_test strict1-9.2.43 {
+ INSERT INTO strict(k) VALUES(43);
+} {1 {cannot store TEXT value in BLOB column strict.c4}}
+
+do_execsql_test strict1-9.3 {
+ DROP TABLE strict;
+ CREATE TABLE strict (
+ k INTEGER PRIMARY KEY,
+ c1 REAL AS(if(k=11,1.5, k=12,2, k=13,'x', k=14,x'34', 0.0)) VIRTUAL,
+ c2 INT AS(if(k=21,1.5, k=22,2, k=23,'x', k=24,x'34', 0)) VIRTUAL,
+ c3 TEXT AS(if(k=31,1.5, k=32,2, k=33,'x', k=34,x'34', 'x')) VIRTUAL,
+ c4 BLOB AS(if(k=41,1.5, k=42,2, k=43,'x', k=44,x'34', x'00')) VIRTUAL,
+ c5 ANY AS(if(k=51,1.5, k=52,2, k=53,'x', k=54,x'34', 0)) VIRTUAL
+ ) STRICT;
+ INSERT INTO strict(k) VALUES(11);
+ INSERT INTO strict(k) VALUES(12);
+ INSERT INTO strict(k) VALUES(22);
+ INSERT INTO strict(k) VALUES(31);
+ INSERT INTO strict(k) VALUES(32);
+ INSERT INTO strict(k) VALUES(33);
+ INSERT INTO strict(k) VALUES(44);
+ PRAGMA integrity_check;
+} {ok}
+do_catchsql_test strict1-9.4.13 {
+ INSERT INTO strict(k) VALUES(13);
+} {1 {cannot store TEXT value in REAL column strict.c1}}
+do_catchsql_test strict1-9.4.14 {
+ INSERT INTO strict(k) VALUES(14);
+} {1 {cannot store BLOB value in REAL column strict.c1}}
+do_catchsql_test strict1-9.4.21 {
+ INSERT INTO strict(k) VALUES(21);
+} {1 {cannot store REAL value in INT column strict.c2}}
+do_catchsql_test strict1-9.4.23 {
+ INSERT INTO strict(k) VALUES(23);
+} {1 {cannot store TEXT value in INT column strict.c2}}
+do_catchsql_test strict1-9.4.24 {
+ INSERT INTO strict(k) VALUES(24);
+} {1 {cannot store BLOB value in INT column strict.c2}}
+do_catchsql_test strict1-9.4.34 {
+ INSERT INTO strict(k) VALUES(34);
+} {1 {cannot store BLOB value in TEXT column strict.c3}}
+do_catchsql_test strict1-9.4.41 {
+ INSERT INTO strict(k) VALUES(41);
+} {1 {cannot store REAL value in BLOB column strict.c4}}
+do_catchsql_test strict1-9.4.42 {
+ INSERT INTO strict(k) VALUES(42);
+} {1 {cannot store INT value in BLOB column strict.c4}}
+do_catchsql_test strict1-9.4.43 {
+ INSERT INTO strict(k) VALUES(43);
+} {1 {cannot store TEXT value in BLOB column strict.c4}}
+
finish_test
diff --git a/test/tclsqlite.test b/test/tclsqlite.test
index 0758abd82..5f373ea18 100644
--- a/test/tclsqlite.test
+++ b/test/tclsqlite.test
@@ -9,7 +9,7 @@
#
#***********************************************************************
# This file implements regression tests for TCL interface to the
-# SQLite library.
+# SQLite library.
#
# Actually, all tests are based on the TCL interface, so the main
# interface is pretty well tested. This file contains some addition
@@ -121,7 +121,7 @@ ifcapable {complete} {
do_test tcl-1.14 {
set v [catch {db eval} msg]
lappend v $msg
-} {1 {wrong # args: should be "db eval ?OPTIONS? SQL ?ARRAY-NAME? ?SCRIPT?"}}
+} {1 {wrong # args: should be "db eval ?OPTIONS? SQL ?VAR-NAME? ?SCRIPT?"}}
do_test tcl-1.15 {
set v [catch {db function} msg]
lappend v $msg
@@ -359,6 +359,19 @@ do_test tcl-9.3 {
execsql {SELECT typeof(ret_int())}
} {integer}
+proc breakAsNullUdf args {
+ if {"1" eq [lindex $args 0]} {return -code break}
+}
+do_test tcl-9.4 {
+ db function banu breakAsNullUdf
+ execsql {SELECT typeof(banu()), typeof(banu(1))}
+} {text null}
+do_test tcl-9.5 {
+ db nullvalue banunull
+ db eval {SELECT banu(), banu(1)}
+} {{} banunull}
+
+
# Recursive calls to the same user-defined function
#
ifcapable tclvar {
@@ -465,7 +478,7 @@ do_test tcl-10.13 {
db eval {SELECT * FROM t4}
} {1 2 5 6 7}
-# Now test that [db transaction] commands may be nested with
+# Now test that [db transaction] commands may be nested with
# the expected results.
#
do_test tcl-10.14 {
@@ -475,7 +488,7 @@ do_test tcl-10.14 {
INSERT INTO t4 VALUES('one');
}
- catch {
+ catch {
db transaction {
db eval { INSERT INTO t4 VALUES('two') }
db transaction {
@@ -674,11 +687,11 @@ do_test tcl-15.5 {
} {0}
-# 2017-06-26: The --withoutnulls flag to "db eval".
+# 2017-06-26: The -withoutnulls flag to "db eval".
#
-# In the "db eval --withoutnulls SQL ARRAY" form, NULL results cause the
-# corresponding array entry to be unset. The default behavior (without
-# the -withoutnulls flags) is for the corresponding array value to get
+# In the "db eval -withoutnulls SQL TARGET" form, NULL results cause the
+# corresponding target entry to be unset. The default behavior (without
+# the -withoutnulls flags) is for the corresponding target value to get
# the [db nullvalue] string.
#
catch {db close}
@@ -720,64 +733,64 @@ reset_db
proc add {a b} { return [expr $a + $b] }
proc ret {a} { return $a }
-db function add_i -returntype integer add
+db function add_i -returntype integer add
db function add_r -ret real add
-db function add_t -return text add
-db function add_b -returntype blob add
-db function add_a -returntype any add
+db function add_t -return text add
+db function add_b -returntype blob add
+db function add_a -returntype any add
-db function ret_i -returntype int ret
+db function ret_i -returntype int ret
db function ret_r -returntype real ret
-db function ret_t -returntype text ret
-db function ret_b -returntype blob ret
-db function ret_a -r any ret
+db function ret_t -returntype text ret
+db function ret_b -returntype blob ret
+db function ret_a -r any ret
do_execsql_test 17.0 {
SELECT quote( add_i(2, 3) );
- SELECT quote( add_r(2, 3) );
- SELECT quote( add_t(2, 3) );
- SELECT quote( add_b(2, 3) );
- SELECT quote( add_a(2, 3) );
+ SELECT quote( add_r(2, 3) );
+ SELECT quote( add_t(2, 3) );
+ SELECT quote( add_b(2, 3) );
+ SELECT quote( add_a(2, 3) );
} {5 5.0 '5' X'35' 5}
do_execsql_test 17.1 {
SELECT quote( add_i(2.2, 3.3) );
- SELECT quote( add_r(2.2, 3.3) );
- SELECT quote( add_t(2.2, 3.3) );
- SELECT quote( add_b(2.2, 3.3) );
- SELECT quote( add_a(2.2, 3.3) );
+ SELECT quote( add_r(2.2, 3.3) );
+ SELECT quote( add_t(2.2, 3.3) );
+ SELECT quote( add_b(2.2, 3.3) );
+ SELECT quote( add_a(2.2, 3.3) );
} {5.5 5.5 '5.5' X'352E35' 5.5}
do_execsql_test 17.2 {
SELECT quote( ret_i(2.5) );
- SELECT quote( ret_r(2.5) );
- SELECT quote( ret_t(2.5) );
- SELECT quote( ret_b(2.5) );
- SELECT quote( ret_a(2.5) );
+ SELECT quote( ret_r(2.5) );
+ SELECT quote( ret_t(2.5) );
+ SELECT quote( ret_b(2.5) );
+ SELECT quote( ret_a(2.5) );
} {2.5 2.5 '2.5' X'322E35' 2.5}
do_execsql_test 17.3 {
SELECT quote( ret_i('2.5') );
- SELECT quote( ret_r('2.5') );
- SELECT quote( ret_t('2.5') );
- SELECT quote( ret_b('2.5') );
- SELECT quote( ret_a('2.5') );
+ SELECT quote( ret_r('2.5') );
+ SELECT quote( ret_t('2.5') );
+ SELECT quote( ret_b('2.5') );
+ SELECT quote( ret_a('2.5') );
} {2.5 2.5 '2.5' X'322E35' '2.5'}
do_execsql_test 17.4 {
SELECT quote( ret_i('abc') );
- SELECT quote( ret_r('abc') );
- SELECT quote( ret_t('abc') );
- SELECT quote( ret_b('abc') );
- SELECT quote( ret_a('abc') );
+ SELECT quote( ret_r('abc') );
+ SELECT quote( ret_t('abc') );
+ SELECT quote( ret_b('abc') );
+ SELECT quote( ret_a('abc') );
} {'abc' 'abc' 'abc' X'616263' 'abc'}
do_execsql_test 17.5 {
SELECT quote( ret_i(X'616263') );
- SELECT quote( ret_r(X'616263') );
- SELECT quote( ret_t(X'616263') );
- SELECT quote( ret_b(X'616263') );
- SELECT quote( ret_a(X'616263') );
+ SELECT quote( ret_r(X'616263') );
+ SELECT quote( ret_t(X'616263') );
+ SELECT quote( ret_b(X'616263') );
+ SELECT quote( ret_a(X'616263') );
} {'abc' 'abc' 'abc' X'616263' X'616263'}
do_test 17.6.1 {
@@ -848,21 +861,70 @@ do_catchsql_test 19.911 {
} {1 {invalid command name "bind_fallback_does_not_exist"}}
db bind_fallback {}
-#-------------------------------------------------------------------------
+# 2025-05-05: the -asdict eval flag
+#
do_test 20.0 {
+ execsql {CREATE TABLE tad(a,b)}
+ execsql {INSERT INTO tad(a,b) VALUES('aa','bb'),('AA','BB')}
+ db eval -asdict {
+ SELECT a, b FROM tad WHERE 0
+ } D {}
+ set D
+} {* {a b}}
+
+do_test 20.1 {
+ unset D
+ set i 0
+ set res {}
+ set colNames {}
+ db eval -asdict {
+ SELECT a, b FROM tad ORDER BY a
+ } D {
+ dict set D i [incr i]
+ lappend res $i [dict get $D a] [dict get $D b]
+ if {1 == $i} {
+ set colNames [dict get $D *]
+ }
+ }
+ lappend res $colNames
+ unset D
+ set res
+} {1 AA BB 2 aa bb {a b}}
+
+do_test 20.2 {
+ set res {}
+ db eval -asdict -withoutnulls {
+ SELECT n, a, b FROM (
+ SELECT 1 as n, 'aa' as a, NULL as b
+ UNION ALL
+ SELECT 2 as n, NULL as a, 'bb' as b
+ )
+ ORDER BY n
+ } D {
+ dict unset D *
+ lappend res [dict values $D]
+ }
+ unset D
+ execsql {DROP TABLE tad}
+ set res
+} {{1 aa} {2 bb}}
+
+#-------------------------------------------------------------------------
+do_test 21.0 {
db transaction {
db close
}
} {}
-do_test 20.1 {
+do_test 21.1 {
sqlite3 db test.db
set rc [catch {
db eval {SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3} { db close }
} msg]
list $rc $msg
} {1 {invalid command name "db"}}
-
+
+
proc closedb {} {
db close
@@ -874,7 +936,7 @@ sqlite3 db test.db
db func closedb closedb
db func func1 func1
-do_test 20.2 {
+do_test 21.2 {
set rc [catch {
db eval {
SELECT closedb(),func1() UNION ALL SELECT 20,30 UNION ALL SELECT 30,40
@@ -884,9 +946,10 @@ do_test 20.2 {
} {0 {10 1 20 30 30 40}}
sqlite3 db :memory:
-do_test 21.1 {
+do_test 22.1 {
catch {db eval {SELECT 1 2 3;}} msg
db erroroffset
} {9}
+
finish_test
diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
index 557c31b80..3998bd9cc 100644
--- a/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@ -458,16 +458,17 @@ proc trd_fuzztest_data {buildname} {
if {$::tcl_platform(platform) eq "windows"} {
return [list fuzzcheck.exe $lFuzzDb]
- } elseif {[lsearch $sanBuilds $buildname]>=0} {
- return [list [trd_get_bin_name fuzzcheck] $lFuzzDb \
- [trd_get_bin_name fuzzcheck-asan] $lFuzzDb \
- [trd_get_bin_name fuzzcheck-ubsan] $lFuzzDb \
- {sessionfuzz run} $lSessionDb]
} else {
- return [list [trd_get_bin_name fuzzcheck] $lFuzzDb \
- {sessionfuzz run} $lSessionDb]
+ set lRet [list [trd_get_bin_name fuzzcheck] $lFuzzDb]
+ if {[lsearch $sanBuilds $buildname]>=0} {
+ lappend lRet [trd_get_bin_name fuzzcheck-asan] $lFuzzDb
+ if {$::tcl_platform(os) ne "OpenBSD"} {
+ lappend lRet [trd_get_bin_name fuzzcheck-ubsan] $lFuzzDb
+ }
+ }
+ lappend lRet {sessionfuzz run} $lSessionDb
+ return $lRet
}
-
}
diff --git a/test/vacuum.test b/test/vacuum.test
index 57429c29e..82dd00d09 100644
--- a/test/vacuum.test
+++ b/test/vacuum.test
@@ -401,4 +401,25 @@ do_test vacuum-10.1 {
} {}
do_test vacuum-10.2 { execsql VACUUM } {}
+# Verify that VACUUM still works if ATTACH is disabled.
+#
+do_execsql_test vacuum-11.1 {
+ PRAGMA page_size=1024;
+ VACUUM;
+ PRAGMA page_size;
+} {1024}
+sqlite3_db_config db ATTACH_CREATE 0
+do_execsql_test vacuum-11.2 {
+ PRAGMA page_size=2048;
+ VACUUM;
+ PRAGMA page_size;
+} {2048}
+sqlite3_db_config db ATTACH_CREATE 1
+sqlite3_db_config db ATTACH_WRITE 0
+do_execsql_test vacuum-11.3 {
+ PRAGMA page_size=4096;
+ VACUUM;
+ PRAGMA page_size;
+} {4096}
+
finish_test
diff --git a/test/walcksum.test b/test/walcksum.test
index 10329ba6c..0c9a7e55c 100644
--- a/test/walcksum.test
+++ b/test/walcksum.test
@@ -16,6 +16,7 @@ source $testdir/lock_common.tcl
source $testdir/wal_common.tcl
ifcapable !wal {finish_test ; return }
+set testprefix walcksum
# Read and return the contents of file $filename. Treat the content as
# binary data.
@@ -331,5 +332,152 @@ do_test walcksum-2.1 {
catch { db close }
catch { db2 close }
+#-------------------------------------------------------------------------
+# Test cases based on the bug reported at:
+#
+# <https://sqlite.org/forum/forumpost/b490f726db>
+#
+reset_db
+
+do_execsql_test 3.0 {
+ PRAGMA auto_vacuum = 0;
+ PRAGMA synchronous = NORMAL;
+ PRAGMA journal_mode = WAL;
+ PRAGMA cache_size = 1;
+
+ CREATE TABLE t1 (i INTEGER PRIMARY KEY, b BLOB, t TEXT);
+ PRAGMA wal_checkpoint;
+ INSERT INTO t1 VALUES(1, randomblob(2048), 'one');
+} {wal 0 2 2}
+
+do_execsql_test 3.1 {
+ BEGIN;
+ INSERT INTO t1 VALUES(2, randomblob(2048), 'two');
+ SAVEPOINT one;
+ INSERT INTO t1 VALUES(3, randomblob(2048), 'three');
+ INSERT INTO t1 VALUES(4, randomblob(2048), 'four');
+ INSERT INTO t1 VALUES(5, randomblob(2048), 'five');
+ INSERT INTO t1 VALUES(6, randomblob(2048), 'six');
+ INSERT INTO t1 VALUES(7, randomblob(2048), 'seven');
+
+ UPDATE t1 SET b=randomblob(2048) WHERE i=5;
+ UPDATE t1 SET b=randomblob(2048) WHERE i=6;
+ UPDATE t1 SET b=randomblob(2048) WHERE i=7;
+ ROLLBACK TO one;
+ INSERT INTO t1 VALUES(8, NULL, 'eight');
+ COMMIT;
+} {}
+
+do_execsql_test 3.2 {
+ SELECT i, t FROM t1
+} {1 one 2 two 8 eight}
+
+forcecopy test.db test2.db
+forcecopy test.db-wal test2.db-wal
+
+sqlite3 db2 test2.db
+do_test 1.3 {
+ execsql {
+ SELECT i, t FROM t1
+ } db2
+} {1 one 2 two 8 eight}
+
+catch { db2 close }
+
+#-------------------------------------------------------------------------
+reset_db
+
+do_execsql_test 4.0 {
+ PRAGMA auto_vacuum = 0;
+ PRAGMA synchronous = NORMAL;
+ PRAGMA journal_mode = WAL;
+ PRAGMA cache_size = 1;
+
+ CREATE TABLE t1 (i INTEGER PRIMARY KEY, b BLOB, t TEXT);
+ PRAGMA wal_checkpoint;
+ INSERT INTO t1 VALUES(1, randomblob(2048), 'one');
+} {wal 0 2 2}
+
+do_execsql_test 4.1.1 {
+ SAVEPOINT one;
+ INSERT INTO t1 VALUES(2, randomblob(2048), 'two');
+ INSERT INTO t1 VALUES(3, randomblob(2048), 'three');
+ INSERT INTO t1 VALUES(4, randomblob(2048), 'four');
+ INSERT INTO t1 VALUES(5, randomblob(2048), 'five');
+ INSERT INTO t1 VALUES(6, randomblob(2048), 'six');
+ INSERT INTO t1 VALUES(7, randomblob(2048), 'seven');
+
+ UPDATE t1 SET b=randomblob(2048) WHERE i=5;
+ UPDATE t1 SET b=randomblob(2048) WHERE i=6;
+ UPDATE t1 SET b=randomblob(2048) WHERE i=7;
+}
+
+do_execsql_test 4.1.2 {
+ ROLLBACK TO one;
+ INSERT INTO t1 VALUES(8, NULL, 'eight');
+ RELEASE one;
+} {}
+
+do_execsql_test 4.2 {
+ SELECT i, t FROM t1
+} {1 one 8 eight}
+
+forcecopy test.db test2.db
+forcecopy test.db-wal test2.db-wal
+
+sqlite3 db2 test2.db
+do_test 4.3 {
+ execsql {
+ SELECT i, t FROM t1
+ } db2
+} {1 one 8 eight}
+
+catch { db2 close }
+
+#-------------------------------------------------------------------------
+reset_db
+
+do_execsql_test 5.0 {
+ PRAGMA auto_vacuum = 0;
+ PRAGMA synchronous = NORMAL;
+ PRAGMA journal_mode = WAL;
+ PRAGMA cache_size = 1;
+
+ CREATE TABLE t1 (i INTEGER PRIMARY KEY, b BLOB, t TEXT);
+ INSERT INTO t1 VALUES(1, randomblob(2048), 'one');
+ INSERT INTO t1 VALUES(2, randomblob(2048), 'two');
+ INSERT INTO t1 VALUES(3, randomblob(2048), 'three');
+ PRAGMA wal_checkpoint;
+} {wal 0 14 14}
+
+do_execsql_test 5.1 {
+ BEGIN;
+ SELECT count(*) FROM t1;
+ SAVEPOINT one;
+ INSERT INTO t1 VALUES(4, randomblob(2048), 'four');
+ INSERT INTO t1 VALUES(5, randomblob(2048), 'five');
+ INSERT INTO t1 VALUES(6, randomblob(2048), 'six');
+ INSERT INTO t1 VALUES(7, randomblob(2048), 'seven');
+ ROLLBACK TO one;
+ INSERT INTO t1 VALUES(8, randomblob(2048), 'eight');
+ INSERT INTO t1 VALUES(9, randomblob(2048), 'nine');
+ COMMIT;
+} {3}
+
+forcecopy test.db test2.db
+forcecopy test.db-wal test2.db-wal
+
+sqlite3 db2 test2.db
+do_test 5.2 {
+ execsql {
+ SELECT i, t FROM t1
+ } db2
+} {1 one 2 two 3 three 8 eight 9 nine}
+db2 close
+
+do_execsql_test 5.3 {
+ SELECT i, t FROM t1
+} {1 one 2 two 3 three 8 eight 9 nine}
+
finish_test
diff --git a/test/walsetlk2.test b/test/walsetlk2.test
index 92630b3fd..7ffd8f03d 100644
--- a/test/walsetlk2.test
+++ b/test/walsetlk2.test
@@ -90,6 +90,8 @@ tvfs delete
# but other operations do not use the retry mechanism.
#
reset_db
+db close
+sqlite3 db test.db -fullmutex 1
do_execsql_test 2.0 {
CREATE TABLE t1(a, b);
diff --git a/test/walsetlk_recover.test b/test/walsetlk_recover.test
new file mode 100644
index 000000000..1daece747
--- /dev/null
+++ b/test/walsetlk_recover.test
@@ -0,0 +1,104 @@
+# 2025 May 30
+#
+# The author disclaims copyright to this source code. In place of
+# a legal notice, here is a blessing:
+#
+# May you do good and not evil.
+# May you find forgiveness for yourself and forgive others.
+# May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# TESTRUNNER: slow
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+source $testdir/lock_common.tcl
+set testprefix walsetlk_recover
+
+ifcapable !wal {finish_test ; return }
+# ifcapable !setlk_timeout {finish_test ; return }
+
+do_execsql_test 1.0 {
+ PRAGMA journal_mode = wal;
+ CREATE TABLE t1(a, b);
+ INSERT INTO t1 VALUES(1, 2);
+ INSERT INTO t1 VALUES(3, 4);
+ INSERT INTO t1 VALUES(5, 6);
+} {wal}
+
+db_save_and_close
+db_restore
+
+testfixture_nb myvar {
+
+ testvfs tvfs -fullshm 1
+ sqlite3 db test.db -vfs tvfs
+ tvfs script vfs_callback
+ tvfs filter xRead
+
+ set ::done 0
+ proc vfs_callback {method file args} {
+ if {$::done==0 && [string match *wal $file]} {
+ after 4000
+ set ::done 1
+ }
+ return "SQLITE_OK"
+ }
+
+ db eval {
+ SELECT * FROM t1
+ }
+
+ db close
+}
+
+# Give the [testfixture_nb] command time to start
+after 1000 {set xyz 1}
+vwait xyz
+
+testvfs tvfs -fullshm 1
+sqlite3 db test.db -vfs tvfs
+
+tvfs script sleep_callback
+tvfs filter xSleep
+set ::sleep_count 0
+proc sleep_callback {args} {
+ incr ::sleep_count
+}
+
+sqlite3 db test.db -vfs tvfs
+db timeout 500
+set tm [lindex [time {
+ catch {
+ db eval {SELECT * FROM t1}
+ } msg
+}] 0]
+
+do_test 1.2 { set ::msg } {database is locked}
+do_test 1.3.($::tm) { expr $::tm>400000 && $::tm<2000000 } 1
+
+vwait myvar
+
+do_execsql_test 1.4 {
+ SELECT * FROM t1
+} {1 2 3 4 5 6}
+
+db close
+tvfs delete
+
+# All SQLite builds should pass the tests above. SQLITE_ENABLE_SETLK_TIMEOUT=1
+# builds do so without calling the VFS xSleep method.
+if {$::sqlite_options(setlk_timeout)==1} {
+ do_test 1.5.1 {
+ set ::sleep_count
+ } 0
+} else {
+ do_test 1.5.2 {
+ expr $::sleep_count>0
+ } 1
+}
+
+finish_test
+
diff --git a/test/walsetlk_snapshot.test b/test/walsetlk_snapshot.test
new file mode 100644
index 000000000..e05ad69cc
--- /dev/null
+++ b/test/walsetlk_snapshot.test
@@ -0,0 +1,109 @@
+# 2025 May 30
+#
+# The author disclaims copyright to this source code. In place of
+# a legal notice, here is a blessing:
+#
+# May you do good and not evil.
+# May you find forgiveness for yourself and forgive others.
+# May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# TESTRUNNER: slow
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+source $testdir/lock_common.tcl
+set testprefix walsetlk_snapshot
+
+ifcapable !wal {finish_test ; return }
+ifcapable !snapshot {finish_test; return}
+
+db close
+testvfs tvfs -fullshm 1
+sqlite3 db test.db -vfs tvfs
+tvfs script sleep_callback
+tvfs filter xSleep
+set ::sleep_count 0
+proc sleep_callback {args} {
+ incr ::sleep_count
+}
+
+do_execsql_test 1.0 {
+ PRAGMA journal_mode = wal;
+ CREATE TABLE t1(a, b);
+ INSERT INTO t1 VALUES(1, 2);
+ INSERT INTO t1 VALUES(3, 4);
+ INSERT INTO t1 VALUES(5, 6);
+} {wal}
+
+do_test 1.1 {
+ db eval BEGIN
+ set ::snap [sqlite3_snapshot_get db main]
+ db eval {
+ INSERT INTO t1 VALUES(7, 8);
+ COMMIT;
+ }
+} {}
+
+testfixture_nb myvar {
+
+ testvfs tvfs -fullshm 1
+ sqlite3 db test.db -vfs tvfs
+ tvfs script vfs_callback
+ tvfs filter {xWrite}
+
+ set ::done 0
+ proc vfs_callback {args} {
+ if {$::done==0} {
+ after 4000
+ set ::done 1
+ }
+ return "SQLITE_OK"
+ }
+
+ db eval {
+ PRAGMA wal_checkpoint;
+ }
+
+ db close
+}
+
+# Give the [testfixture_nb] command time to start
+after 1000 {set xyz 1}
+vwait xyz
+
+db timeout 500
+set tm [lindex [time {
+ catch {
+ db eval BEGIN
+ sqlite3_snapshot_open db main $::snap
+ } msg
+}] 0]
+
+do_test 1.2 { set ::msg } {SQLITE_BUSY}
+do_test 1.3.($::tm) { expr $::tm<2000000 } 1
+
+do_execsql_test 1.4 {
+ SELECT * FROM t1
+} {1 2 3 4 5 6 7 8}
+
+sqlite3_snapshot_free $::snap
+
+vwait myvar
+
+# All SQLite builds should pass the tests above. SQLITE_ENABLE_SETLK_TIMEOUT=1
+# builds do so without calling the VFS xSleep method.
+if {$::sqlite_options(setlk_timeout)==1} {
+ do_test 1.5.1 {
+ set ::sleep_count
+ } 0
+} else {
+ do_test 1.5.2 {
+ expr $::sleep_count>0
+ } 1
+}
+
+finish_test
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 09:18:41 +0000