Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix a segfault in swarmvtab that could occur if there was an error in the SQL statement passed to the constructor. Add other test cases. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
6ce8b7ca62fcf97875395fc1a9891793 |
User & Date: | dan 2017-08-05 16:15:33.260 |
Context
2017-08-07
| ||
17:14 | Add new test file "bigmmap.test". For testing builds with -DSQLITE_MAX_MMAP_SIZE > 2GB. (check-in: 1744706279 user: dan tags: trunk) | |
14:15 | Update this branch with latest trunk changes. (check-in: 17bc7ded07 user: dan tags: server-process-edition) | |
2017-08-05
| ||
16:15 | Fix a segfault in swarmvtab that could occur if there was an error in the SQL statement passed to the constructor. Add other test cases. (check-in: 6ce8b7ca62 user: dan tags: trunk) | |
15:49 | Microoptimization in pcache1.c makes the code slightly smaller and faster. (check-in: 422cd9f394 user: drh tags: trunk) | |
Changes
Changes to ext/misc/unionvtab.c.
︙ | ︙ | |||
717 718 719 720 721 722 723 | } } } unionFinalize(&rc, pStmt, pzErr); pStmt = 0; /* Capture the not-found callback UDF name */ | | | 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 | } } } unionFinalize(&rc, pStmt, pzErr); pStmt = 0; /* Capture the not-found callback UDF name */ if( rc==SQLITE_OK && argc>=5 ){ pTab->zNotFoundCallback = unionStrdup(&rc, argv[4]); unionDequote(pTab->zNotFoundCallback); } /* It is an error if the SELECT statement returned zero rows. If only ** because there is no way to determine the schema of the virtual ** table in this case. */ |
︙ | ︙ |
Changes to test/swarmvtab.test.
︙ | ︙ | |||
126 127 128 129 130 131 132 133 134 135 136 137 138 139 | #------------------------------------------------------------------------- # Test some error conditions: # # 2.1: Database file does not exist. # 2.2: Table does not exist. # 2.3: Table schema does not match. # reset_db load_static_extension db unionvtab do_test 2.0.1 { db eval { CREATE TABLE t0(a INTEGER PRIMARY KEY, b TEXT); WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<400) | > | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | #------------------------------------------------------------------------- # Test some error conditions: # # 2.1: Database file does not exist. # 2.2: Table does not exist. # 2.3: Table schema does not match. # 2.4: Syntax error in SELECT statement. # reset_db load_static_extension db unionvtab do_test 2.0.1 { db eval { CREATE TABLE t0(a INTEGER PRIMARY KEY, b TEXT); WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<400) |
︙ | ︙ | |||
179 180 181 182 183 184 185 186 187 188 | } {1 {unable to open database file}} do_catchsql_test 2.2 { SELECT * FROM s1 WHERE rowid BETWEEN 101 AND 200; } {1 {no such rowid table: t15}} do_catchsql_test 2.3 { SELECT * FROM s1 WHERE rowid BETWEEN 201 AND 300; } {1 {source table schema mismatch}} finish_test | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 | } {1 {unable to open database file}} do_catchsql_test 2.2 { SELECT * FROM s1 WHERE rowid BETWEEN 101 AND 200; } {1 {no such rowid table: t15}} do_catchsql_test 2.3 { SELECT * FROM s1 WHERE rowid BETWEEN 201 AND 300; } {1 {source table schema mismatch}} do_catchsql_test 2.4 { CREATE VIRTUAL TABLE temp.x1 USING swarmvtab('SELECT * FROMdir'); } {1 {sql error: near "FROMdir": syntax error}} do_catchsql_test 2.5 { CREATE VIRTUAL TABLE temp.x1 USING swarmvtab('SELECT * FROMdir', 'fetchdb'); } {1 {sql error: near "FROMdir": syntax error}} for {set i 0} {$i < 40} {incr i} { forcedelete "test.db$i" } #------------------------------------------------------------------------- # Test the outcome of the fetch function throwing an exception. # proc fetch_db {file} { error "fetch_db error!" } 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) ', 'fetch_db_no_such_function' ); } {1 {no such function: fetch_db_no_such_function}} do_catchsql_test 3.2 { CREATE VIRTUAL TABLE temp.xyz USING swarmvtab( 'VALUES ("test.db1", "t1", 1, 10), ("test.db2", "t1", 11, 20) ', 'fetch_db' ); } {1 {fetch_db error!}} do_execsql_test 3.3.1 { ATTACH 'test.db1' AS aux; CREATE TABLE aux.t1(a INTEGER PRIMARY KEY, b); INSERT INTO aux.t1 VALUES(1, NULL); INSERT INTO aux.t1 VALUES(2, NULL); INSERT INTO aux.t1 VALUES(9, NULL); DETACH aux; CREATE VIRTUAL TABLE temp.xyz USING swarmvtab( 'VALUES ("test.db1", "t1", 1, 10), ("test.db2", "t1", 11, 20) ', 'fetch_db' ); } {} do_catchsql_test 3.3 { SELECT * FROM xyz } {1 {fetch_db error!}} finish_test |
Added test/swarmvtabfault.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | # 2017-07-15 # # 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. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is error handling in the swarmvtab extension. # set testdir [file dirname $argv0] source $testdir/tester.tcl set testprefix swarmvtabfault ifcapable !vtab { finish_test return } proc fetch_db {file} { forcedelete $file sqlite3 dbX $file dbX eval { CREATE TABLE t1(a INTEGER PRIMARY KEY, b) } dbX close } forcedelete test.db1 do_execsql_test 1.0 { ATTACH 'test.db1' AS aux; CREATE TABLE aux.t1(a INTEGER PRIMARY KEY, b); INSERT INTO aux.t1 VALUES(1, NULL); INSERT INTO aux.t1 VALUES(2, NULL); INSERT INTO aux.t1 VALUES(9, NULL); DETACH aux; } {} faultsim_save_and_close do_faultsim_test 1.1 -faults oom* -prep { faultsim_restore_and_reopen db func fetch_db fetch_db load_static_extension db unionvtab db eval { CREATE VIRTUAL TABLE temp.xyz USING swarmvtab( 'VALUES ("test.db1", "t1", 1, 10), ("test.db2", "t1", 11, 20) ', 'fetch_db' ); } } -body { execsql { SELECT a FROM xyz } } -test { faultsim_test_result {0 {1 2 9}} {1 {sql error: out of memory}} } finish_test |