aboutsummaryrefslogtreecommitdiff
path: root/test/rowid.test
diff options
context:
space:
mode:
authordan <Dan Kennedy>2024-03-19 15:27:15 +0000
committerdan <Dan Kennedy>2024-03-19 15:27:15 +0000
commitf891ef8d6111c8c8aa7de74bcd36aaf2f4569c47 (patch)
treedd7c6b579f751efb065bb88eefca846fb4046cd9 /test/rowid.test
parent967c3032124b1365c65946371809660404376169 (diff)
downloadsqlite-f891ef8d6111c8c8aa7de74bcd36aaf2f4569c47.tar.gz
sqlite-f891ef8d6111c8c8aa7de74bcd36aaf2f4569c47.zip
Update tests to work with SQLITE_ALLOW_ROWID_IN_VIEW.
FossilOrigin-Name: 495b8c7b08b998ddfe2ad055703f058c768e7e94014952e5cd8a81c7c1515cb1
Diffstat (limited to 'test/rowid.test')
-rw-r--r--test/rowid.test33
1 files changed, 23 insertions, 10 deletions
diff --git a/test/rowid.test b/test/rowid.test
index 4327004d3..450ae35cc 100644
--- a/test/rowid.test
+++ b/test/rowid.test
@@ -803,17 +803,30 @@ do_execsql_test 16.0 {
INSERT INTO t3(rowid, z) VALUES(3, 3);
}
-do_execsql_test 16.1 { SELECT rowid FROM t1, t2; } {1}
-do_execsql_test 16.2 { SELECT rowid FROM t1, v1; } {1}
-do_execsql_test 16.3 { SELECT rowid FROM t3, v1; } {3}
-do_execsql_test 16.4 { SELECT rowid FROM t3, (SELECT 123); } {3}
-
-do_execsql_test 16.5 { SELECT rowid FROM t2, t1; } {1}
-do_execsql_test 16.6 { SELECT rowid FROM v1, t1; } {1}
-do_execsql_test 16.7 { SELECT rowid FROM v1, t3; } {3}
-do_execsql_test 16.8 { SELECT rowid FROM (SELECT 123), t3; } {3}
+ifcapable allow_rowid_in_view {
+ set nosuch "1 {no such column: rowid}"
+ do_execsql_test 16.1 { SELECT rowid FROM t1, t2; } {1}
+ do_catchsql_test 16.2 { SELECT rowid FROM t1, v1; } $nosuch
+ do_catchsql_test 16.3 { SELECT rowid FROM t3, v1; } $nosuch
+ do_catchsql_test 16.4 { SELECT rowid FROM t3, (SELECT 123); } $nosuch
+
+ do_execsql_test 16.5 { SELECT rowid FROM t2, t1; } {1}
+ do_catchsql_test 16.6 { SELECT rowid FROM v1, t1; } $nosuch
+ do_catchsql_test 16.7 { SELECT rowid FROM v1, t3; } $nosuch
+ do_catchsql_test 16.8 { SELECT rowid FROM (SELECT 123), t3; } $nosuch
+} else {
+ do_execsql_test 16.1 { SELECT rowid FROM t1, t2; } {1}
+ do_execsql_test 16.2 { SELECT rowid FROM t1, v1; } {1}
+ do_execsql_test 16.3 { SELECT rowid FROM t3, v1; } {3}
+ do_execsql_test 16.4 { SELECT rowid FROM t3, (SELECT 123); } {3}
+
+ do_execsql_test 16.5 { SELECT rowid FROM t2, t1; } {1}
+ do_execsql_test 16.6 { SELECT rowid FROM v1, t1; } {1}
+ do_execsql_test 16.7 { SELECT rowid FROM v1, t3; } {3}
+ do_execsql_test 16.8 { SELECT rowid FROM (SELECT 123), t3; } {3}
+}
-do_catchsql_test 16.5 { SELECT rowid FROM t1, t3; } {1 {no such column: rowid}}
+do_catchsql_test 16.9 { SELECT rowid FROM t1, t3; } {1 {no such column: rowid}}