Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the error message for invalid ".mode" arguments in the command-line shell, so that it mentions the new "quote" mode. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
9a603a18ef626b7d7a24b82eb961d6d8 |
| User & Date: | drh 2016-11-23 23:18:45 |
Context
|
2016-11-25
| ||
| 14:30 | Add a comment to help clarify the EP_FromJoin hack in exprCodeBetween(). (check-in: 6df7c574 user: drh tags: trunk) | |
|
2016-11-23
| ||
| 23:18 | Fix the error message for invalid ".mode" arguments in the command-line shell, so that it mentions the new "quote" mode. (check-in: 9a603a18 user: drh tags: trunk) | |
| 19:31 | Code constant vector components outside of any loops in CASE and BETWEEN expressions. Fix for [1a684656]. (check-in: c08aff13 user: dan tags: trunk) | |
Changes
Changes to src/shell.c.
4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 |
p->mode = MODE_Quote;
}else if( c2=='a' && strncmp(azArg[1],"ascii",n2)==0 ){
p->mode = MODE_Ascii;
sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Unit);
sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Record);
}else {
raw_printf(stderr, "Error: mode should be one of: "
"ascii column csv html insert line list tabs tcl\n");
rc = 1;
}
p->cMode = p->mode;
}else
if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
if( nArg==2 ){
|
| |
4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 |
p->mode = MODE_Quote;
}else if( c2=='a' && strncmp(azArg[1],"ascii",n2)==0 ){
p->mode = MODE_Ascii;
sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Unit);
sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Record);
}else {
raw_printf(stderr, "Error: mode should be one of: "
"ascii column csv html insert line list quote tabs tcl\n");
rc = 1;
}
p->cMode = p->mode;
}else
if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
if( nArg==2 ){
|
Changes to test/shell1.test.
195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 ... 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 ... 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 ... 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 |
catchcmd "test.db" ".explain \"OFF"
} {0 {}}
do_test shell1-2.2.4 {
catchcmd "test.db" ".explain \'OFF"
} {0 {}}
do_test shell1-2.2.5 {
catchcmd "test.db" ".mode \"insert FOO"
} {1 {Error: mode should be one of: ascii column csv html insert line list tabs tcl}}
do_test shell1-2.2.6 {
catchcmd "test.db" ".mode \'insert FOO"
} {1 {Error: mode should be one of: ascii column csv html insert line list tabs tcl}}
# check multiple tokens, and quoted tokens
do_test shell1-2.3.1 {
catchcmd "test.db" ".explain 1"
} {0 {}}
do_test shell1-2.3.2 {
catchcmd "test.db" ".explain on"
................................................................................
do_test shell1-2.3.7 {
catchcmd "test.db" ".\'explain\' \'OFF\'"
} {0 {}}
# check quoted args are unquoted
do_test shell1-2.4.1 {
catchcmd "test.db" ".mode FOO"
} {1 {Error: mode should be one of: ascii column csv html insert line list tabs tcl}}
do_test shell1-2.4.2 {
catchcmd "test.db" ".mode csv"
} {0 {}}
do_test shell1-2.4.2 {
catchcmd "test.db" ".mode \"csv\""
} {0 {}}
................................................................................
# insert SQL insert statements for TABLE
# line One value per line
# list Values delimited by .separator strings
# tabs Tab-separated values
# tcl TCL list elements
do_test shell1-3.13.1 {
catchcmd "test.db" ".mode"
} {1 {Error: mode should be one of: ascii column csv html insert line list tabs tcl}}
do_test shell1-3.13.2 {
catchcmd "test.db" ".mode FOO"
} {1 {Error: mode should be one of: ascii column csv html insert line list tabs tcl}}
do_test shell1-3.13.3 {
catchcmd "test.db" ".mode csv"
} {0 {}}
do_test shell1-3.13.4 {
catchcmd "test.db" ".mode column"
} {0 {}}
do_test shell1-3.13.5 {
................................................................................
# extra arguments ignored
catchcmd "test.db" ".mode tcl BAD"
} {0 {}}
# don't allow partial mode type matches
do_test shell1-3.13.12 {
catchcmd "test.db" ".mode l"
} {1 {Error: mode should be one of: ascii column csv html insert line list tabs tcl}}
do_test shell1-3.13.13 {
catchcmd "test.db" ".mode li"
} {1 {Error: mode should be one of: ascii column csv html insert line list tabs tcl}}
do_test shell1-3.13.14 {
catchcmd "test.db" ".mode lin"
} {0 {}}
# .nullvalue STRING Print STRING in place of NULL values
do_test shell1-3.14.1 {
catchcmd "test.db" ".nullvalue"
|
| | | | | | | |
195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 ... 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 ... 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 ... 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 |
catchcmd "test.db" ".explain \"OFF"
} {0 {}}
do_test shell1-2.2.4 {
catchcmd "test.db" ".explain \'OFF"
} {0 {}}
do_test shell1-2.2.5 {
catchcmd "test.db" ".mode \"insert FOO"
} {1 {Error: mode should be one of: ascii column csv html insert line list quote tabs tcl}}
do_test shell1-2.2.6 {
catchcmd "test.db" ".mode \'insert FOO"
} {1 {Error: mode should be one of: ascii column csv html insert line list quote tabs tcl}}
# check multiple tokens, and quoted tokens
do_test shell1-2.3.1 {
catchcmd "test.db" ".explain 1"
} {0 {}}
do_test shell1-2.3.2 {
catchcmd "test.db" ".explain on"
................................................................................
do_test shell1-2.3.7 {
catchcmd "test.db" ".\'explain\' \'OFF\'"
} {0 {}}
# check quoted args are unquoted
do_test shell1-2.4.1 {
catchcmd "test.db" ".mode FOO"
} {1 {Error: mode should be one of: ascii column csv html insert line list quote tabs tcl}}
do_test shell1-2.4.2 {
catchcmd "test.db" ".mode csv"
} {0 {}}
do_test shell1-2.4.2 {
catchcmd "test.db" ".mode \"csv\""
} {0 {}}
................................................................................
# insert SQL insert statements for TABLE
# line One value per line
# list Values delimited by .separator strings
# tabs Tab-separated values
# tcl TCL list elements
do_test shell1-3.13.1 {
catchcmd "test.db" ".mode"
} {1 {Error: mode should be one of: ascii column csv html insert line list quote tabs tcl}}
do_test shell1-3.13.2 {
catchcmd "test.db" ".mode FOO"
} {1 {Error: mode should be one of: ascii column csv html insert line list quote tabs tcl}}
do_test shell1-3.13.3 {
catchcmd "test.db" ".mode csv"
} {0 {}}
do_test shell1-3.13.4 {
catchcmd "test.db" ".mode column"
} {0 {}}
do_test shell1-3.13.5 {
................................................................................
# extra arguments ignored
catchcmd "test.db" ".mode tcl BAD"
} {0 {}}
# don't allow partial mode type matches
do_test shell1-3.13.12 {
catchcmd "test.db" ".mode l"
} {1 {Error: mode should be one of: ascii column csv html insert line list quote tabs tcl}}
do_test shell1-3.13.13 {
catchcmd "test.db" ".mode li"
} {1 {Error: mode should be one of: ascii column csv html insert line list quote tabs tcl}}
do_test shell1-3.13.14 {
catchcmd "test.db" ".mode lin"
} {0 {}}
# .nullvalue STRING Print STRING in place of NULL values
do_test shell1-3.14.1 {
catchcmd "test.db" ".nullvalue"
|