From e26d16240220096cc778a4946f6f8f7312f4cc33 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 19 May 2022 22:04:23 +0000 Subject: [PATCH] #if'd out the '.nonce' and '.check' commends in WASM builds. FossilOrigin-Name: 326f79ea54566a9302be99d920856f13b48f2c2ed265fa87d78ced367d4b1946 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 8 +++++++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 42336e1a43..12e9202189 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C #if'd\sout\sthe\sthe\s'.cd'\sand\s'.clone'\scommands\sfor\sWASM\sbuilds. -D 2022-05-19T21:56:50.043 +C #if'd\sout\sthe\s'.nonce'\sand\s'.check'\scommends\sin\sWASM\sbuilds. +D 2022-05-19T22:04:23.547 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -559,7 +559,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c F src/resolve.c a4eb3c617027fd049b07432f3b942ea7151fa793a332a11a7d0f58c9539e104f F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 74060a09f66c0c056f3c61627e22cb484af0bbfa29d7d14dcf17c684742c15de -F src/shell.c.in 3316815dd4aba4ad151f9a46d540a24197e5b1d9b91eb9a6a2822ea6863b0fac +F src/shell.c.in 198aed4b4d225acdaf89c19b1c32b5e1a5c5956ef25c6de993ec6ac872369215 F src/sqlite.h.in d15c307939039086adca159dd340a94b79b69827e74c6d661f343eeeaefba896 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d @@ -1959,8 +1959,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P d3175a793fb2d1ac9ecfd7a7c3b1627fe583effcd37740206a11b115f099d521 -R 42d0ca5c67ceea270880218da3bcbfc1 +P fa391868dd626ffdb220bed6834d0a10c7336f0fc4ca56055147784de1a4f99d +R ecfaf227f75d4bef58737ff0c6c5c4c5 U stephan -Z b82e2305c283c356a7fd95759eb9583d +Z c416bbcbbdae88d64354eab148e9450d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 41cc92e704..19989f10f8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fa391868dd626ffdb220bed6834d0a10c7336f0fc4ca56055147784de1a4f99d \ No newline at end of file +326f79ea54566a9302be99d920856f13b48f2c2ed265fa87d78ced367d4b1946 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index 6950dcf4ee..1dedcad42c 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -4286,8 +4286,8 @@ static const char *(azHelp[]) = { ".cd DIRECTORY Change the working directory to DIRECTORY", #endif ".changes on|off Show number of rows changed by SQL", - ".check GLOB Fail if output since .testcase does not match", #ifndef SQLITE_SHELL_WASM_MODE + ".check GLOB Fail if output since .testcase does not match", ".clone NEWDB Clone data into NEWDB from the existing database", #endif ".connection [close] [#] Open or close an auxiliary database connection", @@ -4384,7 +4384,9 @@ static const char *(azHelp[]) = { " --quote Quote output text as SQL literals", " --noquote Do not quote output text", " TABLE The name of SQL table used for \"insert\" mode", +#ifndef SQLITE_SHELL_WASM_MODE ".nonce STRING Suspend safe mode for one command if nonce matches", +#endif ".nullvalue STRING Use STRING in place of NULL values", #ifndef SQLITE_SHELL_WASM_MODE ".once ?OPTIONS? ?FILE? Output for the next SQL command only to FILE", @@ -8309,6 +8311,7 @@ static int do_meta_command(char *zLine, ShellState *p){ } }else +#ifndef SQLITE_SHELL_WASM_MODE /* Cancel output redirection, if it is currently set (by .testcase) ** Then read the content of the testcase-out.txt file and compare against ** azArg[1]. If there are differences, report an error and exit. @@ -8333,6 +8336,7 @@ static int do_meta_command(char *zLine, ShellState *p){ } sqlite3_free(zRes); }else +#endif /* !defined(SQLITE_SHELL_WASM_MODE) */ #ifndef SQLITE_SHELL_WASM_MODE if( c=='c' && strncmp(azArg[0], "clone", n)==0 ){ @@ -9533,6 +9537,7 @@ static int do_meta_command(char *zLine, ShellState *p){ p->cMode = p->mode; }else +#ifndef SQLITE_SHELL_WASM_MODE if( c=='n' && strcmp(azArg[0], "nonce")==0 ){ if( nArg!=2 ){ raw_printf(stderr, "Usage: .nonce NONCE\n"); @@ -9547,6 +9552,7 @@ static int do_meta_command(char *zLine, ShellState *p){ ** at the end of this procedure */ } }else +#endif /* !defined(SQLITE_SHELL_WASM_MODE) */ if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){ if( nArg==2 ){ -- 2.47.2