Add the --ifexists option to the CLI and to the ".open" command of the CLI.
Also the undocumented and unsupported --exclusive option on the same. FossilOrigin-Name: 9a1947814d235d270dec265bb85db37e75cc077289e444d3d00f8345016c683e
This commit is contained in:
drh
@@ -1,5 +1,5 @@
|
||||
C Prevent\sembedded\s0x00\scharacters\sin\sthe\soutput\sstrings\sfrom\sconfusing\nthe\scompletion\sextension\sand\scausing\sit\sto\sread\spast\sthe\send\sof\san\sarray.\n[forum:/forumpost/88a08b3201|Forum\spost\s88a08b3201].
|
||||
D 2025-10-01T19:01:19.592
|
||||
C Add\sthe\s--ifexists\soption\sto\sthe\sCLI\sand\sto\sthe\s".open"\scommand\sof\sthe\sCLI.\nAlso\sthe\sundocumented\sand\sunsupported\s--exclusive\soption\son\sthe\ssame.
|
||||
D 2025-10-01T20:41:02.802
|
||||
F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
@@ -737,7 +737,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
|
||||
F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d
|
||||
F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
|
||||
F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957
|
||||
F src/shell.c.in e9042383a072e2ec8f85f326f8e154f9c788183b7a851b4402c2d9e1e8508372
|
||||
F src/shell.c.in 9cfc941ea2068076bb54b10b7c18c2958bda29e9d6aa2d0e807bf4af29a8ac05
|
||||
F src/sqlite.h.in 5732519a2acb09066032ceac21f25996eb3f28f807a4468e30633c7c70faae1c
|
||||
F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
|
||||
F src/sqlite3ext.h 3f0c4ed6934e7309a61c6f3c30f70a30a5b869f785bb3d9f721a36c5e4359126
|
||||
@@ -2169,8 +2169,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
|
||||
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
|
||||
F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
|
||||
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
||||
P 90f7318308ca8372cbd9f183d88ff6cb884446f6df0695294c9a9955c5109f72
|
||||
R 5e5e89dd59f0bc5083897f9a01f819fd
|
||||
P 26f6d41f9d3ab656129af333d54a8645c6890314919bcae90351ba0c2240ceef
|
||||
R 2138b2f147a275dd02f69cff7c85833e
|
||||
U drh
|
||||
Z bbcedf6ac724dcefe9f6d93f09a2453f
|
||||
Z 00cc7d6c4887dcdef642741988cdb5f0
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
26f6d41f9d3ab656129af333d54a8645c6890314919bcae90351ba0c2240ceef
|
||||
9a1947814d235d270dec265bb85db37e75cc077289e444d3d00f8345016c683e
|
||||
|
||||
+39
-18
@@ -1596,9 +1596,8 @@ static ShellState shellState;
|
||||
#define SHELL_OPEN_NORMAL 1 /* Normal database file */
|
||||
#define SHELL_OPEN_APPENDVFS 2 /* Use appendvfs */
|
||||
#define SHELL_OPEN_ZIPFILE 3 /* Use the zipfile virtual table */
|
||||
#define SHELL_OPEN_READONLY 4 /* Open a normal database read-only */
|
||||
#define SHELL_OPEN_DESERIALIZE 5 /* Open using sqlite3_deserialize() */
|
||||
#define SHELL_OPEN_HEXDB 6 /* Use "dbtotxt" output as data source */
|
||||
#define SHELL_OPEN_DESERIALIZE 4 /* Open using sqlite3_deserialize() */
|
||||
#define SHELL_OPEN_HEXDB 5 /* Use "dbtotxt" output as data source */
|
||||
|
||||
/* Allowed values for ShellState.eTraceType
|
||||
*/
|
||||
@@ -5263,7 +5262,13 @@ static const char *(azHelp[]) = {
|
||||
#endif
|
||||
#ifndef SQLITE_OMIT_DESERIALIZE
|
||||
" --deserialize Load into memory using sqlite3_deserialize()",
|
||||
#endif
|
||||
/*" --exclusive Set the SQLITE_OPEN_EXCLUSIVE flag", UNDOCUMENTED */
|
||||
#ifndef SQLITE_OMIT_DESERIALIZE
|
||||
" --hexdb Load the output of \"dbtotxt\" as an in-memory db",
|
||||
#endif
|
||||
" --ifexist Only open if FILE already exists",
|
||||
#ifndef SQLITE_OMIT_DESERIALIZE
|
||||
" --maxsize N Maximum size for --hexdb or --deserialized database",
|
||||
#endif
|
||||
" --new Initialize FILE to an empty database",
|
||||
@@ -5808,10 +5813,13 @@ static void open_db(ShellState *p, int openFlags){
|
||||
(openFlags & OPEN_DB_ZIPFILE)!=0);
|
||||
}
|
||||
}
|
||||
if( (p->openFlags & (SQLITE_OPEN_READONLY|SQLITE_OPEN_READWRITE))==0 ){
|
||||
if( p->openFlags==0 ) p->openFlags = SQLITE_OPEN_CREATE;
|
||||
p->openFlags |= SQLITE_OPEN_READWRITE;
|
||||
}
|
||||
switch( p->openMode ){
|
||||
case SHELL_OPEN_APPENDVFS: {
|
||||
sqlite3_open_v2(zDbFilename, &p->db,
|
||||
SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|p->openFlags, "apndvfs");
|
||||
sqlite3_open_v2(zDbFilename, &p->db, p->openFlags, "apndvfs");
|
||||
break;
|
||||
}
|
||||
case SHELL_OPEN_HEXDB:
|
||||
@@ -5823,15 +5831,9 @@ static void open_db(ShellState *p, int openFlags){
|
||||
sqlite3_open(":memory:", &p->db);
|
||||
break;
|
||||
}
|
||||
case SHELL_OPEN_READONLY: {
|
||||
sqlite3_open_v2(zDbFilename, &p->db,
|
||||
SQLITE_OPEN_READONLY|p->openFlags, 0);
|
||||
break;
|
||||
}
|
||||
case SHELL_OPEN_UNSPEC:
|
||||
case SHELL_OPEN_NORMAL: {
|
||||
sqlite3_open_v2(zDbFilename, &p->db,
|
||||
SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|p->openFlags, 0);
|
||||
sqlite3_open_v2(zDbFilename, &p->db, p->openFlags, 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -10210,6 +10212,7 @@ static int do_meta_command(char *zLine, ShellState *p){
|
||||
int iName = 1; /* Index in azArg[] of the filename */
|
||||
int newFlag = 0; /* True to delete file before opening */
|
||||
int openMode = SHELL_OPEN_UNSPEC;
|
||||
int openFlags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
|
||||
|
||||
/* Check for command-line arguments */
|
||||
for(iName=1; iName<nArg; iName++){
|
||||
@@ -10224,9 +10227,14 @@ static int do_meta_command(char *zLine, ShellState *p){
|
||||
}else if( optionMatch(z, "append") ){
|
||||
openMode = SHELL_OPEN_APPENDVFS;
|
||||
}else if( optionMatch(z, "readonly") ){
|
||||
openMode = SHELL_OPEN_READONLY;
|
||||
openFlags &= ~(SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE);
|
||||
openFlags |= SQLITE_OPEN_READONLY;
|
||||
}else if( optionMatch(z, "exclusive") ){
|
||||
openFlags |= SQLITE_OPEN_EXCLUSIVE;
|
||||
}else if( optionMatch(z, "ifexists") ){
|
||||
openFlags &= ~(SQLITE_OPEN_CREATE);
|
||||
}else if( optionMatch(z, "nofollow") ){
|
||||
p->openFlags |= SQLITE_OPEN_NOFOLLOW;
|
||||
openFlags |= SQLITE_OPEN_NOFOLLOW;
|
||||
#ifndef SQLITE_OMIT_DESERIALIZE
|
||||
}else if( optionMatch(z, "deserialize") ){
|
||||
openMode = SHELL_OPEN_DESERIALIZE;
|
||||
@@ -10258,7 +10266,7 @@ static int do_meta_command(char *zLine, ShellState *p){
|
||||
sqlite3_free(p->pAuxDb->zFreeOnClose);
|
||||
p->pAuxDb->zFreeOnClose = 0;
|
||||
p->openMode = openMode;
|
||||
p->openFlags = 0;
|
||||
p->openFlags = openFlags;
|
||||
p->szMax = 0;
|
||||
|
||||
/* If a filename is specified, try to open it first */
|
||||
@@ -12947,6 +12955,7 @@ static const char zOptions[] =
|
||||
#endif
|
||||
" -help show this message\n"
|
||||
" -html set output mode to HTML\n"
|
||||
" -ifexists only open if database already exists\n"
|
||||
" -interactive force interactive I/O\n"
|
||||
" -json set output mode to 'json'\n"
|
||||
" -line set output mode to 'line'\n"
|
||||
@@ -13359,9 +13368,15 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
|
||||
data.szMax = integerValue(argv[++i]);
|
||||
#endif
|
||||
}else if( cli_strcmp(z,"-readonly")==0 ){
|
||||
data.openMode = SHELL_OPEN_READONLY;
|
||||
data.openFlags &= ~(SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE);
|
||||
data.openFlags |= SQLITE_OPEN_READONLY;
|
||||
}else if( cli_strcmp(z,"-nofollow")==0 ){
|
||||
data.openFlags = SQLITE_OPEN_NOFOLLOW;
|
||||
data.openFlags |= SQLITE_OPEN_NOFOLLOW;
|
||||
}else if( cli_strcmp(z,"-exclusive")==0 ){ /* UNDOCUMENTED */
|
||||
data.openFlags |= SQLITE_OPEN_EXCLUSIVE;
|
||||
}else if( cli_strcmp(z,"-ifexists")==0 ){
|
||||
data.openFlags &= ~(SQLITE_OPEN_CREATE);
|
||||
if( data.openFlags==0 ) data.openFlags = SQLITE_OPEN_READWRITE;
|
||||
#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB)
|
||||
}else if( cli_strncmp(z, "-A",2)==0 ){
|
||||
/* All remaining command-line arguments are passed to the ".archive"
|
||||
@@ -13515,9 +13530,15 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
|
||||
data.szMax = integerValue(argv[++i]);
|
||||
#endif
|
||||
}else if( cli_strcmp(z,"-readonly")==0 ){
|
||||
data.openMode = SHELL_OPEN_READONLY;
|
||||
data.openFlags &= ~(SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE);
|
||||
data.openFlags |= SQLITE_OPEN_READONLY;
|
||||
}else if( cli_strcmp(z,"-nofollow")==0 ){
|
||||
data.openFlags |= SQLITE_OPEN_NOFOLLOW;
|
||||
}else if( cli_strcmp(z,"-exclusive")==0 ){ /* UNDOCUMENTED */
|
||||
data.openFlags |= SQLITE_OPEN_EXCLUSIVE;
|
||||
}else if( cli_strcmp(z,"-ifexists")==0 ){
|
||||
data.openFlags &= ~(SQLITE_OPEN_CREATE);
|
||||
if( data.openFlags==0 ) data.openFlags = SQLITE_OPEN_READWRITE;
|
||||
}else if( cli_strcmp(z,"-ascii")==0 ){
|
||||
data.mode = MODE_Ascii;
|
||||
sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,SEP_Unit);
|
||||
|
||||
Reference in New Issue
Block a user