#if'd out the '.import' command in WASM builds. Several minor cosmetic UI tweaks.

FossilOrigin-Name: e4f87eb7c3ed16b7e431f86b7d337bb4097246d20780207b43e28fffda3d8a61

diff --git a/ext/fiddle/fiddle.in.html b/ext/fiddle/fiddle.in.html
index ae3bce871f02b3f2dbc87737603aec3eb703f8b6..80b9cf0fcb5e02ae6df623890eef9219c24ff312 100644 (file)
--- a/ext/fiddle/fiddle.in.html
+++ b/ext/fiddle/fiddle.in.html
@@ -81,6 +81,7 @@
           margin: 0.25em 0.5em;
           border: 1px inset;
           border-radius: 0.25em;
+          white-space: nowrap;
       }
     </style>
   </head>
@@ -106,12 +107,14 @@
     </fieldset>
     <div id='main-wrapper'>
       <div class='ta-wrapper'>
-        <textarea id="input" rows="8">-- Use ctrl-enter or shift-enter to execute SQL
+        <textarea id="input" rows="8"
+                  placeholder="Shell input. Ctrl-enter/shift-enter runs it.">
+-- Use ctrl-enter or shift-enter to execute SQL
 .nullvalue NULL
 .mode box
-create table t(a,b);
-insert into t(a,b) values('abc',123),('def',456),(NULL,789),('ghi',012);
-select * from t;</textarea>        
+CREATE TABLE t(a,b);
+INSERT INTO t(a,b) VALUES('abc',123),('def',456),(NULL,789),('ghi',012);
+SELECT * FROM t;</textarea>        
         <div class='button-bar'>
           <button id='btn-run' disabled>Run</button>
           <button id='btn-clear' disabled>Clear</button>
@@ -119,7 +122,8 @@ select * from t;</textarea>
         </div>
       </div>
       <div class='ta-wrapper'>
-        <textarea id="output" readonly rows="18" placeholder="Shell output"></textarea>
+        <textarea id="output" rows="18" readonly
+                  placeholder="Shell output."></textarea>
         <div class='button-bar'>
           <button id='btn-clear-output' disabled>Clear</button>
         </div>

diff --git a/manifest b/manifest
index a60f4ea1b9e85bc5bed805253078ed1173daa720..60a7bbf631abfbb00e7518c426f277de909b0a46 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C #if\sout\sthe\s'.load'\scommand\sin\sWASM\sbuilds.\sSeveral\sUI\slayout\stweaks.
-D 2022-05-18T23:40:27.606
+C #if'd\sout\sthe\s'.import'\scommand\sin\sWASM\sbuilds.\sSeveral\sminor\scosmetic\sUI\stweaks.
+D 2022-05-19T00:38:34.262
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -56,7 +56,7 @@ F ext/expert/sqlite3expert.c 6ca30d73b9ed75bd56d6e0d7f2c962d2affaa72c505458619d0
 F ext/expert/sqlite3expert.h ca81efc2679a92373a13a3e76a6138d0310e32be53d6c3bfaedabd158ea8969b
 F ext/expert/test_expert.c d56c194b769bdc90cf829a14c9ecbc1edca9c850b837a4d0b13be14095c32a72
 F ext/fiddle/Makefile ea647919e6ac4b50edde1490f60ee87e8ccd75141e4aa650718c6f28eb323bbc
-F ext/fiddle/fiddle.in.html a3e79d914bd340f5ef99d2c8c0debc6e5a24eb8e44d3f50daba33f2c793d6dbc
+F ext/fiddle/fiddle.in.html 7913a4cd46fd98319744fc1cee116049e24b44b24a086d50c8b838020ae547ef
 F ext/fiddle/index.md d9c1c308d8074341bc3b11d1d39073cd77754cb3ca9aeb949f23fdd8323d81cf
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
 F ext/fts1/ft_hash.c 3927bd880e65329bdc6f506555b228b28924921b
@@ -557,7 +557,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 fe3e1f36d67639e5fd81ee890d47286f178dd5cd295b6e3963d8403b542b160e
+F src/shell.c.in ce99ca3e14211ca8d3eb82ba012504422ef42a59e4abd38c9a08a9638aee8694
 F src/sqlite.h.in d15c307939039086adca159dd340a94b79b69827e74c6d661f343eeeaefba896
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -1957,8 +1957,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 bee436e62a956e49b0df4a92abff2c89f2b44e21d8f593716df0331f8fc49814
-R e1289b13b7cf898dfe59929a952893e9
+P 67d98297f01d4274c510f5c5cb2a219aeb36fcbb7ce78b8b9ed65639a4561c73
+R 59fa59fdfab93a205e0e1cfea08a2433
 U stephan
-Z 956e918f03d99cce3794ab764703b43a
+Z 0bfb7bb16263207b215ea22d8aab2a42
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ba9caa5f5eb434c7d9d18bd69de4891999cfdd7a..cb4102ea77fb2d5e9a4da993fa9d042e5537b385 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-67d98297f01d4274c510f5c5cb2a219aeb36fcbb7ce78b8b9ed65639a4561c73
\ No newline at end of file
+e4f87eb7c3ed16b7e431f86b7d337bb4097246d20780207b43e28fffda3d8a61
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index d22dd7310b49ebe3627c3985294ece9f408af0b7..c892a25bef53d51b9cadb901ef6685075e5d174c 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4321,6 +4321,7 @@ static const char *(azHelp[]) = {
   ".fullschema ?--indent?   Show schema and the content of sqlite_stat tables",
   ".headers on|off          Turn display of headers on or off",
   ".help ?-all? ?PATTERN?   Show help text for PATTERN",
+#ifndef SQLITE_SHELL_WASM_MODE
   ".import FILE TABLE       Import data from FILE into TABLE",
   "   Options:",
   "     --ascii               Use \\037 and \\036 as column and row separators",
@@ -4335,6 +4336,7 @@ static const char *(azHelp[]) = {
   "        from the \".mode\" output mode",
   "     *  If FILE begins with \"|\" then it is a command that generates the",
   "        input text.",
+#endif
 #ifndef SQLITE_OMIT_TEST_CONTROL
   ".imposter INDEX TABLE    Create imposter table TABLE on index INDEX",
 #endif
@@ -8881,6 +8883,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
   }else
 
+#ifndef SQLITE_SHELL_WASM_MODE
   if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
     char *zTable = 0;           /* Insert data into this table */
     char *zSchema = 0;          /* within this schema (may default to "main") */
@@ -9171,6 +9174,7 @@ static int do_meta_command(char *zLine, ShellState *p){
           sCtx.nRow, sCtx.nErr, sCtx.nLine-1);
     }
   }else
+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
 
 #ifndef SQLITE_UNTESTABLE
   if( c=='i' && strncmp(azArg[0], "imposter", n)==0 ){