Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Updates to test procedures so that they all work with encryption. No changes to the core SQLite code. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | branch-3.21 |
| Files: | files | file ages | folders |
| SHA3-256: |
0481330756e861de8e1eb7136e7dca2f |
| User & Date: | drh 2017-10-23 16:34:07 |
Context
|
2017-10-23
| ||
| 20:20 | Merge trunk fixes to swarmvtabfault.test and the lsm extension into this branch. No changes to core SQLite code. check-in: f632b870 user: dan tags: branch-3.21 | |
| 16:34 | Updates to test procedures so that they all work with encryption. No changes to the core SQLite code. check-in: 04813307 user: drh tags: branch-3.21 | |
| 16:03 | Avoid passing a NULL value as the second argument to memcpy(). check-in: 58e5bb49 user: dan tags: branch-3.21 | |
Changes
Changes to src/test_config.c.
209 210 211 212 213 214 215 216 217 218 219 220 221 222 |
#endif #ifdef SQLITE_ENABLE_JSON1 Tcl_SetVar2(interp, "sqlite_options", "json1", "1", TCL_GLOBAL_ONLY); #else Tcl_SetVar2(interp, "sqlite_options", "json1", "0", TCL_GLOBAL_ONLY); #endif #ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS Tcl_SetVar2(interp, "sqlite_options", "like_match_blobs", "0", TCL_GLOBAL_ONLY); #else Tcl_SetVar2(interp, "sqlite_options", "like_match_blobs", "1", TCL_GLOBAL_ONLY); #endif |
> > > > > > |
209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 |
#endif #ifdef SQLITE_ENABLE_JSON1 Tcl_SetVar2(interp, "sqlite_options", "json1", "1", TCL_GLOBAL_ONLY); #else Tcl_SetVar2(interp, "sqlite_options", "json1", "0", TCL_GLOBAL_ONLY); #endif #ifdef SQLITE_HAS_CODEC Tcl_SetVar2(interp, "sqlite_options", "has_codec", "1", TCL_GLOBAL_ONLY); #else Tcl_SetVar2(interp, "sqlite_options", "has_codec", "0", TCL_GLOBAL_ONLY); #endif #ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS Tcl_SetVar2(interp, "sqlite_options", "like_match_blobs", "0", TCL_GLOBAL_ONLY); #else Tcl_SetVar2(interp, "sqlite_options", "like_match_blobs", "1", TCL_GLOBAL_ONLY); #endif |
Changes to test/pragma.test.
1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 |
}
db2 eval {
PRAGMA foreign_key_list(t2);
}
} {0 0 t1 y {} {NO ACTION} {NO ACTION} NONE}
db2 close
reset_db
do_execsql_test 24.0 {
PRAGMA page_size = 1024;
CREATE TABLE t1(a, b, c);
CREATE INDEX i1 ON t1(b);
INSERT INTO t1 VALUES('a', 'b', 'c');
PRAGMA integrity_check;
} {ok}
set r [db one {SELECT rootpage FROM sqlite_master WHERE name = 't1'}]
db close
hexio_write test.db [expr $r*1024 - 16] 000000000000000701040f0f1f616263
sqlite3 db test.db
do_catchsql_test 24.1 {
SELECT * FROM t1;
} {1 {database disk image is malformed}}
do_catchsql_test 24.2 {
PRAGMA integrity_check;
} {0 {{database disk image is malformed}}}
database_never_corrupt
finish_test
|
> | | | | | | | | | | | | | | | | | | | | | |
1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 |
}
db2 eval {
PRAGMA foreign_key_list(t2);
}
} {0 0 t1 y {} {NO ACTION} {NO ACTION} NONE}
db2 close
ifcapable !has_codec {
reset_db
do_execsql_test 24.0 {
PRAGMA page_size = 1024;
CREATE TABLE t1(a, b, c);
CREATE INDEX i1 ON t1(b);
INSERT INTO t1 VALUES('a', 'b', 'c');
PRAGMA integrity_check;
} {ok}
set r [db one {SELECT rootpage FROM sqlite_master WHERE name = 't1'}]
db close
hexio_write test.db [expr $r*1024 - 16] 000000000000000701040f0f1f616263
sqlite3 db test.db
do_catchsql_test 24.1 {
SELECT * FROM t1;
} {1 {database disk image is malformed}}
do_catchsql_test 24.2 {
PRAGMA integrity_check;
} {0 {{database disk image is malformed}}}
}
database_never_corrupt
finish_test
|
Changes to test/schema6.test.
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
# names, white-space, and formatting of the CREATE TABLE statement should # produce identical table content. # set testdir [file dirname $argv0] source $testdir/tester.tcl set ::testprefix schema6 # Command: check_same_database_content TESTNAME SQL1 SQL2 SQL3 ... # # This command creates fresh databases using SQL1 and subsequent arguments # and checks to make sure the content of all database files is byte-for-byte # identical. Page 1 of the database files is allowed to be different, since # page 1 contains the sqlite_master table which is expected to vary. |
> |
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
# names, white-space, and formatting of the CREATE TABLE statement should
# produce identical table content.
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
set ::testprefix schema6
do_not_use_codec
# Command: check_same_database_content TESTNAME SQL1 SQL2 SQL3 ...
#
# This command creates fresh databases using SQL1 and subsequent arguments
# and checks to make sure the content of all database files is byte-for-byte
# identical. Page 1 of the database files is allowed to be different, since
# page 1 contains the sqlite_master table which is expected to vary.
|
Changes to test/swarmvtab.test.
11
12
13
14
15
16
17
18
19
20
21
22
23
24
...
239
240
241
242
243
244
245
246
|
# This file implements regression tests for SQLite library. The
# focus of this file is the "swarmvtab" extension
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
set testprefix swarmvtab
ifcapable !vtab {
finish_test
return
}
load_static_extension db unionvtab
................................................................................
} {}
do_catchsql_test 3.3.2 { SELECT * FROM xyz } {1 {fetch_db error!}}
finish_test
|
>
<
|
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
...
240
241
242
243
244
245
246
|
# This file implements regression tests for SQLite library. The # focus of this file is the "swarmvtab" extension # set testdir [file dirname $argv0] source $testdir/tester.tcl set testprefix swarmvtab do_not_use_codec ifcapable !vtab { finish_test return } load_static_extension db unionvtab ................................................................................ } {} do_catchsql_test 3.3.2 { SELECT * FROM xyz } {1 {fetch_db error!}} finish_test |
Changes to test/swarmvtab2.test.
11 12 13 14 15 16 17 18 19 20 21 22 23 24 |
# This file implements regression tests for SQLite library. The
# focus of this file is the "swarmvtab" extension
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
set testprefix swarmvtab
ifcapable !vtab {
finish_test
return
}
|
> |
11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 |
# This file implements regression tests for SQLite library. The
# focus of this file is the "swarmvtab" extension
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
set testprefix swarmvtab
do_not_use_codec
ifcapable !vtab {
finish_test
return
}
|