Link the json1 extension into the command-line shell by default.

FossilOrigin-Name: 2e8e239cec5a12ac81cf62c0fbe94fb5713c31b1

diff --git a/Makefile.in b/Makefile.in
index 8f3d6f7dfe550d71e5ae1a78b5de02089a9ef5dd..99af3e44e52cee6c98aeef27d3ccbc72292fa647 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -566,9 +566,9 @@ libtclsqlite3.la:   tclsqlite.lo libsqlite3.la
                -version-info "8:6:8" \
                -avoid-version
 
-sqlite3$(TEXE):        $(TOP)/src/shell.c libsqlite3.la sqlite3.h
-       $(LTLINK) $(READLINE_FLAGS) \
-               -o $@ $(TOP)/src/shell.c libsqlite3.la \
+sqlite3$(TEXE):        $(TOP)/src/shell.c libsqlite3.la sqlite3.h $(TOP)/ext/misc/json1.c
+       $(LTLINK) $(READLINE_FLAGS) -DSQLITE_ENABLE_JSON1 -o $@ \
+               $(TOP)/src/shell.c $(TOP)/ext/misc/json1.c libsqlite3.la \
                $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
 
 sqldiff$(TEXE):        $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h

diff --git a/Makefile.msc b/Makefile.msc
index 441c499df84be5c2c0b36bdb07daca0d35c5f38f..7b971aa2f141b9f7fcdd8de898d1e83a2d433b00 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -390,9 +390,9 @@ CORE_LINK_OPTS = /DEF:sqlite3.def
 #
 !IFNDEF SHELL_COMPILE_OPTS
 !IF $(DYNAMIC_SHELL)!=0
-SHELL_COMPILE_OPTS = $(SHELL_CCONV_OPTS) -DSQLITE_API=__declspec(dllimport)
+SHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 $(SHELL_CCONV_OPTS) -DSQLITE_API=__declspec(dllimport)
 !ELSE
-SHELL_COMPILE_OPTS = $(SHELL_CCONV_OPTS)
+SHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 $(SHELL_CCONV_OPTS)
 !ENDIF
 !ENDIF
 
@@ -1224,8 +1224,8 @@ libsqlite3.lib:   $(LIBOBJ)
 libtclsqlite3.lib:     tclsqlite.lo libsqlite3.lib
        $(LTLIB) $(LTLIBOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCL:tcl=tclstub) $(TLIBS)
 
-sqlite3.exe:   $(TOP)\src\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h
-       $(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) $(TOP)\src\shell.c \
+sqlite3.exe:   $(TOP)\src\shell.c $(TOP)\ext\misc\json1.c $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h
+       $(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) $(TOP)\src\shell.c $(TOP)\ext\misc\json1.c \
                /link /pdb:sqlite3sh.pdb $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
 
 sqldiff.exe:   $(TOP)\tool\sqldiff.c sqlite3.c sqlite3.h

diff --git a/main.mk b/main.mk
index 9988fe2775031be43adbe1e091ae8c2bfc5c35ab..7cc09d6c8ddfe6e11a2937429fc52591734d8705 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -439,9 +439,9 @@ libsqlite3.a:       $(LIBOBJ)
        $(AR) libsqlite3.a $(LIBOBJ)
        $(RANLIB) libsqlite3.a
 
-sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h
-       $(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE)                  \
-               $(TOP)/src/shell.c                                  \
+sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h $(TOP)/ext/misc/json1.c
+       $(TCCX) $(READLINE_FLAGS) -DSQLITE_ENABLE_JSON1 -o sqlite3$(EXE)  \
+               $(TOP)/src/shell.c $(TOP)/ext/misc/json1.c                \
                libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
 
 sqldiff$(EXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h

diff --git a/manifest b/manifest
index 9b8023b059432850adb79d48b634ad485f2c0b7c..119ce7f47da4bc244ad95c536da65ca7ceb94381 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C New\stest\scases\sfor\sthe\sjson1\sextension.
-D 2015-08-29T18:30:30.457
+C Link\sthe\sjson1\sextension\sinto\sthe\scommand-line\sshell\sby\sdefault.
+D 2015-08-29T19:03:33.633
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in e2218eb228374422969de7b1680eda6864affcef
+F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 10af19cc089862481d49b347acd99c02635ddc49
+F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@ -258,7 +258,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 04840e8277ab5159af16172eafd214dae7cffff5
+F main.mk 8da13ed011a7ae19450b7554910ff4afa3bd22b7
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -338,7 +338,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c b52c80f2b1bdb62491f9ce40eea0c5f80c78d105
-F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23
+F src/shell.c bbe2bab590b7dd04dd8f9119d4473cb8c52906e3
 F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
@@ -1380,7 +1380,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 752918def7231f7846b3e985c9953a1cc825ab6b
-R 4e95d91aa0ecccfdfe103208bb14f5d9
+P daff4832af963f98bcc1d2c2f84bd815d384f850
+R 082d6d0f70d8c030232efb6a589595f2
 U drh
-Z dd982e2b56c4c4ec66263dd341e5829e
+Z 988619e0978b399609ee7513adf0867a

diff --git a/manifest.uuid b/manifest.uuid
index 7b3cfd163afeaa31573ce652b029e50a0074f6fd..d0eeda427c169025f35307c5ce712605a3d0d6a8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-daff4832af963f98bcc1d2c2f84bd815d384f850
\ No newline at end of file
+2e8e239cec5a12ac81cf62c0fbe94fb5713c31b1
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index c289998a7b69791cc58784c405a3f0df2c810c39..e04fe784a87056875a30ab2a6d4f5a73edea0c7b 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -4619,6 +4619,13 @@ int SQLITE_CDECL main(int argc, char **argv){
   }
   data.out = stdout;
 
+#ifdef SQLITE_ENABLE_JSON1
+  {
+    extern int sqlite3_json_init(sqlite3*);
+    sqlite3_auto_extension((void(*)(void))sqlite3_json_init);
+  }
+#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