From 01b4171e579a634b5936d4fc676cdf4d90b9639e Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 29 Aug 2005 23:06:23 +0000 Subject: [PATCH] Make the shell aware of SQLITE_OMIT_MEMORYDB. Ticket #1395. (CVS 2640) FossilOrigin-Name: 71a71cef5b3c97744322ceceb48ac3055512c987 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c | 9 ++++++++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 5ecf55d30d..c66696f59e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Increase\sresolution\sof\stime-of-day\son\sunix.\s\sAdd\san\sexperimental\nsqlite3_profile()\sAPI.\s(CVS\s2639) -D 2005-08-29T23:00:04 +C Make\sthe\sshell\saware\sof\sSQLITE_OMIT_MEMORYDB.\s\sTicket\s#1395.\s(CVS\s2640) +D 2005-08-29T23:06:24 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -64,7 +64,7 @@ F src/prepare.c 86f0d8e744b8d956eff6bc40e29049efee017610 F src/printf.c cea584c5888688c650d856563aadc4296b5afac7 F src/random.c 90adff4e73a3b249eb4f1fc2a6ff9cf78c7233a4 F src/select.c f8a9993bcd953eb325c8c3f32985cc52b2947354 -F src/shell.c 7fb744da457b0d11e0af7f6a2f6b000fc09fe588 +F src/shell.c d2d4ef04732c28a84d108b8413cd4e584754a158 F src/sqlite.h.in d6561d51025d08de4f455607f3f9f9aa76e855d5 F src/sqliteInt.h f379d29ba17d7082e680c092bce0e6d4bd2d839a F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9 @@ -299,7 +299,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 9b914901a18f8ea39c39a51509c0b3b862c13d6a -R 96cb61bb4ce476297e665f65a9bddb8d +P ed2ca0873fa89d6cfd123541d5d1c6b92c72b6ab +R 41099399cd49b9960dee1069a4863a31 U drh -Z 62e9fd06364aae1ba0c7353d50daae6d +Z 615ba8ef5a759c76ee392a7c5fb87948 diff --git a/manifest.uuid b/manifest.uuid index 2a803f4f20..1bebf1fbde 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ed2ca0873fa89d6cfd123541d5d1c6b92c72b6ab \ No newline at end of file +71a71cef5b3c97744322ceceb48ac3055512c987 \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index 74e542d396..b05a219e22 100644 --- a/src/shell.c +++ b/src/shell.c @@ -12,7 +12,7 @@ ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** -** $Id: shell.c,v 1.124 2005/08/27 01:50:54 drh Exp $ +** $Id: shell.c,v 1.125 2005/08/29 23:06:24 drh Exp $ */ #include #include @@ -1698,6 +1698,13 @@ int main(int argc, char **argv){ } data.out = stdout; +#ifdef SQLITE_OMIT_MEMORYDB + if( data.zDbFilename==0 ){ + fprintf(stderr,"%s: no database filename specified\n", argv[0]); + exit(1); + } +#endif + /* Go ahead and open the database file if it already exists. If the ** file does not exist, delay opening it. This prevents empty database ** files from being created if a user mistypes the database name argument -- 2.47.2