From d919fe17e0048b26ed628a9295f7f60a8f45b8a6 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 11 Dec 2007 19:34:44 +0000 Subject: [PATCH] Build the CLI using the amalgamation. Relax the limit on SQL statement length when building the CLI. (CVS 4609) FossilOrigin-Name: a5d81cd371913dff4b1337a9586645f967371ab9 --- Makefile.in | 10 ++++++---- main.mk | 11 +++++++---- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- src/pager.c | 4 ++-- src/sqliteInt.h | 5 +++-- 6 files changed, 29 insertions(+), 23 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5efb24a775..657b812f83 100644 --- a/Makefile.in +++ b/Makefile.in @@ -317,10 +317,12 @@ libtclsqlite3.la: tclsqlite.lo libsqlite3.la -rpath $(libdir)/sqlite \ -version-info "8:6:8" -sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h - $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \ - -o $@ $(TOP)/src/shell.c libsqlite3.la \ - $(LIBREADLINE) $(TLIBS) +sqlite3$(EXE): $(TOP)/src/shell.c sqlite3.c sqlite3.h + $(LTLINK) $(READLINE_FLAGS) -o $@ \ + -DSQLITE_MAX_SQL_LENGTH=1000000000 \ + -USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0 \ + $(TOP)/src/shell.c sqlite3.c \ + $(LIBREADLINE) $(TLIBS) $(THREADLIB) # This target creates a directory named "tsrc" and fills it with # copies of all of the C source code and header files needed to diff --git a/main.mk b/main.mk index 83eb9cad4a..35f75de6a9 100644 --- a/main.mk +++ b/main.mk @@ -277,10 +277,12 @@ libsqlite3.a: $(LIBOBJ) $(AR) libsqlite3.a $(LIBOBJ) $(RANLIB) libsqlite3.a -sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h +sqlite3$(EXE): $(TOP)/src/shell.c sqlite3.c sqlite3.h $(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) \ - $(TOP)/src/shell.c \ - libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB) + -DSQLITE_MAX_SQL_LENGTH=1000000000 \ + -USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0 \ + $(TOP)/src/shell.c sqlite3.c \ + $(LIBREADLINE) $(TLIBS) $(THREADLIB) objects: $(LIBOBJ_ORIG) @@ -295,6 +297,7 @@ target_source: $(SRC) mkdir tsrc cp -f $(SRC) tsrc rm tsrc/sqlite.h.in tsrc/parse.y + touch target_source sqlite3.c: target_source $(TOP)/tool/mksqlite3c.tcl tclsh $(TOP)/tool/mksqlite3c.tcl @@ -477,6 +480,6 @@ clean: rm -f lemon lempar.c parse.* sqlite*.tar.gz mkkeywordhash keywordhash.h rm -f $(PUBLISH) rm -f *.da *.bb *.bbg gmon.out - rm -rf tsrc + rm -rf tsrc target_source rm -f testloadext.dll libtestloadext.so rm -f sqlite3.c fts?amal.c diff --git a/manifest b/manifest index bce9bc873a..f42aee6c81 100644 --- a/manifest +++ b/manifest @@ -1,7 +1,7 @@ -C Fix\sa\s'const'\sissue\sin\strimFunc().\s(CVS\s4608) -D 2007-12-11T04:23:20 +C Build\sthe\sCLI\susing\sthe\samalgamation.\s\sRelax\sthe\slimit\son\sSQL\sstatement\nlength\swhen\sbuilding\sthe\sCLI.\s(CVS\s4609) +D 2007-12-11T19:34:45 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 -F Makefile.in 30789bf70614bad659351660d76b8e533f3340e9 +F Makefile.in 0590398f62fc2c456ff4c45e9741f5a718b7e2ac F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F VERSION 37c652fc2532226ab2fef7184de9500dafa52d7d @@ -64,7 +64,7 @@ F ext/icu/README.txt 3b130aa66e7a681136f6add198b076a2f90d1e33 F ext/icu/icu.c 61a345d8126686aa3487aa8d2d0f68abd655f7a4 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 F ltmain.sh 56abb507100ed2d4261f6dd1653dec3cf4066387 -F main.mk ba3fca8903c6f3ca26cf4fa7a123c0d3eb2fe151 +F main.mk 89d3e2796cd3be0e784184eab97b5964af5dc5c0 F mkdll.sh 5f8438dcac98e795d7df6529159a1ec566de0183 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f F mkextw.sh 1a866b53637dab137191341cc875575a5ca110fb @@ -124,7 +124,7 @@ F src/os_unix.c 10641ed959b960915deaf2d053105e1ee9849d88 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_win.c 737fe6858340982054c22bde0c3cff7622c9dc44 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b -F src/pager.c 2f420d4605159f3a3cd06c70c927cb00a731affa +F src/pager.c 50d373df61a42d9cebbad37dc56dedf03aa0d6b0 F src/pager.h f504f7ae84060fee0416a853e368d3d113c3d6fa F src/parse.y a780b33ef45dd7b3272319cf91e609d6f109a31c F src/pragma.c 0246032dbe681dded8710ac43eaf654eead1434e @@ -136,7 +136,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/shell.c c97be281cfc3dcb14902f45e4b16f20038eb83ff F src/sqlite.h.in 544587c10005dde0ad8f132dd9b7816b132b2bea F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb -F src/sqliteInt.h 5c86734aaecc6c498c1ed0497935f3f1d3c2f842 +F src/sqliteInt.h 5c390e902c88648035110d0fe156a279dcace271 F src/sqliteLimit.h 15ffe2116746c27ace2b428a26a4fcd6dba6fa65 F src/table.c 1aeb9eab57b4235db86fe15a35dec76fb445a9c4 F src/tclsqlite.c 9923abeffc9b3d7dad58e92b319661521f60debf @@ -598,7 +598,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 19db91fd683c465b8c8a862143a01178682da445 -R 02b51d131f38d3372c7db479963e4078 -U danielk1977 -Z 855904ab9f628931c080d37cbbc68490 +P 64787d78b99a549a87bc2baeff8ae87691612b77 +R 3e068966c3112f87d80204beb2f1eb85 +U drh +Z fdba4a6d0b544d4b7441db6a0e74a7af diff --git a/manifest.uuid b/manifest.uuid index 016642bb67..fc79690438 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -64787d78b99a549a87bc2baeff8ae87691612b77 \ No newline at end of file +a5d81cd371913dff4b1337a9586645f967371ab9 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 7ba506af44..b5dfb45187 100644 --- a/src/pager.c +++ b/src/pager.c @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: pager.c,v 1.398 2007/12/07 18:55:28 drh Exp $ +** @(#) $Id: pager.c,v 1.399 2007/12/11 19:34:45 drh Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -5106,7 +5106,7 @@ int sqlite3PagerLockingMode(Pager *pPager, int eMode){ return (int)pPager->exclusiveMode; } -#ifdef SQLITE_DEBUG +#ifdef SQLITE_TEST /* ** Print a listing of all referenced pages and their ref count. */ diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 49906f9955..635e93bcb6 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.624 2007/12/07 18:55:29 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.625 2007/12/11 19:34:45 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -1647,6 +1647,8 @@ char *sqlite3MPrintf(sqlite3*,const char*, ...); char *sqlite3VMPrintf(sqlite3*,const char*, va_list); #if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) void sqlite3DebugPrintf(const char*, ...); +#endif +#if defined(SQLITE_TEST) void *sqlite3TextToPtr(const char*); #endif void sqlite3SetString(char **, ...); @@ -1895,7 +1897,6 @@ int sqlite3CreateFunc(sqlite3 *, const char *, int, int, void *, void (*)(sqlite3_context*,int,sqlite3_value **), void (*)(sqlite3_context*,int,sqlite3_value **), void (*)(sqlite3_context*)); int sqlite3ApiExit(sqlite3 *db, int); -void sqlite3AbortOtherActiveVdbes(sqlite3 *, Vdbe *); int sqlite3OpenTempDatabase(Parse *); void sqlite3StrAccumAppend(StrAccum*,const char*,int);