Enable URI filenames in the command-line shell. Add a check to the

beginning of the shell to make sure it is compiled with the same
SQLite source and header.

FossilOrigin-Name: de58cb28387f44c35b1a81bdab853cafd938c1a6

diff --git a/manifest b/manifest
index f7a02d4dc599cbf5d8f663bcd9f175778f640743..16faa5700b1215ede5d5a0321cc1520ef4bdafdf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\smultiplexor\sshim\suses\sa\sfull\spathname\sfor\stemp\sfile\sthat\sit\ncreates.
-D 2011-05-18T03:02:10.059
+C Enable\sURI\sfilenames\sin\sthe\scommand-line\sshell.\s\sAdd\sa\scheck\sto\sthe\nbeginning\sof\sthe\sshell\sto\smake\ssure\sit\sis\scompiled\swith\sthe\ssame\nSQLite\ssource\sand\sheader.
+D 2011-05-18T17:15:06.501
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -178,7 +178,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
-F src/shell.c 72e7e176bf46d5c6518d15ac4ad6847c4bb5df79
+F src/shell.c decd04236a7ef26be5ef46d4ea963044bfad9a48
 F src/sqlite.h.in 8bbf8d9bc5f1a9474a633a2de7014506f1f06b90
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 F src/sqliteInt.h 771087591052966d36ac1fcd3c8bb7a8c6cf9a38
@@ -937,7 +937,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 4f7e7b44f2d17681318a1fd22466d3cc03103fc4
-R d6d83dacd40319cfb494e08bc967aebf
+P 186d7ff1d9804d508e472e4939608bf2be67bdc2
+R 45381afe8cd9a292cfb03ba775eccef4
 U drh
-Z e159c1e62c6ced1398d519693948ac08
+Z 8316bf531771ea80911215ce32a98e54

diff --git a/manifest.uuid b/manifest.uuid
index 89d525c9c08084ec6c2f18d1aada47e05d4ffafe..5de0e20c97ff7762098adede4f25740e044a5748 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-186d7ff1d9804d508e472e4939608bf2be67bdc2
\ No newline at end of file
+de58cb28387f44c35b1a81bdab853cafd938c1a6
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index aab70b29db45a244fe78bd11101f6902e8b235ba..8e9870a5a82803bff3ef306400a9476fbdc748de 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -2649,6 +2649,7 @@ static void main_init(struct callback_data *data) {
   data->mode = MODE_List;
   memcpy(data->separator,"|", 2);
   data->showHeader = 0;
+  sqlite3_config(SQLITE_CONFIG_URI, 1);
   sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
   sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
   sqlite3_snprintf(sizeof(continuePrompt), continuePrompt,"   ...> ");
@@ -2663,6 +2664,11 @@ int main(int argc, char **argv){
   int i;
   int rc = 0;
 
+  if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
+    fprintf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
+            sqlite3_sourceid(), SQLITE_SOURCE_ID);
+    exit(1);
+  }
   Argv0 = argv[0];
   main_init(&data);
   stdin_is_interactive = isatty(0);