Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Check-in included unrelated debugging code by mistake. Was: Fix a test case in the shell1.test script so that it works even for very long pathnames. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | mistake |
| Files: | files | file ages | folders |
| SHA1: |
0c0a03987cc144fa017b0a0f9cf45c36 |
| User & Date: | drh 2012-05-20 20:14:18 |
| Original Comment: | Fix a test case in the shell1.test script so that it works even for very long pathnames. |
Context
|
2012-05-20
| ||
| 20:23 | Fix a test case so that it works even with very long pathnames. check-in: ecd4a063 user: drh tags: trunk | |
| 20:14 | Check-in included unrelated debugging code by mistake. Was: Fix a test case in the shell1.test script so that it works even for very long pathnames. Closed-Leaf check-in: 0c0a0398 user: drh tags: mistake | |
|
2012-05-15
| ||
| 12:49 | Add assert()s to verify that Table objects in the schema never use lookaside memory. check-in: 736d6ea6 user: drh tags: trunk | |
Changes
Changes to src/vdbe.c.
6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 |
/* Jump to here if the sqlite3_interrupt() API sets the interrupt ** flag. */ abort_due_to_interrupt: assert( db->u1.isInterrupted ); rc = SQLITE_INTERRUPT; p->rc = rc; sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3ErrStr(rc)); goto vdbe_error_halt; } |
> |
6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 |
/* Jump to here if the sqlite3_interrupt() API sets the interrupt
** flag.
*/
abort_due_to_interrupt:
assert( db->u1.isInterrupted );
rc = SQLITE_INTERRUPT;
p->rc = rc;
printf("INTERRUPT [%s]\n", p->zSql); fflush(stdout);
sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3ErrStr(rc));
goto vdbe_error_halt;
}
|
Changes to test/shell1.test.
280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 |
# too many arguments
catchcmd "test.db" ".bail OFF BAD"
} {1 {Error: unknown command or invalid arguments: "bail". Enter ".help" for help}}
# .databases List names and files of attached databases
do_test shell1-3.3.1 {
catchcmd "-csv test.db" ".databases"
} {/0 +.*main +.*test.db.*/}
do_test shell1-3.3.2 {
# too many arguments
catchcmd "test.db" ".databases BAD"
} {1 {Error: unknown command or invalid arguments: "databases". Enter ".help" for help}}
# .dump ?TABLE? ... Dump the database in an SQL text format
# If TABLE specified, only dump tables matching
|
| |
280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 |
# too many arguments
catchcmd "test.db" ".bail OFF BAD"
} {1 {Error: unknown command or invalid arguments: "bail". Enter ".help" for help}}
# .databases List names and files of attached databases
do_test shell1-3.3.1 {
catchcmd "-csv test.db" ".databases"
} "/0 +.*main +[string map {/ .} [string range [pwd] 0 10]].*/"
do_test shell1-3.3.2 {
# too many arguments
catchcmd "test.db" ".databases BAD"
} {1 {Error: unknown command or invalid arguments: "databases". Enter ".help" for help}}
# .dump ?TABLE? ... Dump the database in an SQL text format
# If TABLE specified, only dump tables matching
|