Fix the .archive command in the CLI so that it actually compresses content.

FossilOrigin-Name: 3c2e3c2d3dd5d951099ad8d9f74d3c20dae11dd5615d86a6e2283b28ff5b19aa

diff --git a/manifest b/manifest
index 6776f25637400b2644c2bb754a4517b16ef00c4a..9f9966817e40d9d7a4f49efbe1225924f2afd84b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\s".ar"\scommand\sin\sthe\sCLI\sso\sthat\sit\sis\sable\sto\supdate\sand\ncreate\sZIP\sArchives.
-D 2018-03-09T21:54:01.608
+C Fix\sthe\s.archive\scommand\sin\sthe\sCLI\sso\sthat\sit\sactually\scompresses\scontent.
+D 2018-03-09T22:18:53.260
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -490,7 +490,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c f02352ac5cbb6fad3804add825743b924cfb6c742ba2e8666d726828a9985d73
-F src/shell.c.in b499275d69fffce0012681ddf0c00a2856b65af0028a7e5b9aee3886180e91e9
+F src/shell.c.in b0aad8855b1c04ff4637c9f244a5537255f5d3dc6625e334454f5bd7d9794c61
 F src/sqlite.h.in 49d776d536076894e38de837a6c999e5150949baf008aa02d91fea70471eae78
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
@@ -1712,7 +1712,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7fea00fd96a8ab7e65734540edb907b6224659ae95d7e0504755f2610c545587
-R 85f130d4e717fcf952736cd9ba56b3e7
+P 9404765ef7487013f01ecf24c0a1f70040cd11e7dbb6378646d15de4e5660a40
+R 1cd3e74076aeeddb27298f9b682d994e
 U drh
-Z 22e107de180218309232866a05b8494f
+Z bc56d5f75527153520ea094ccb89c567

diff --git a/manifest.uuid b/manifest.uuid
index cf7a4ad9e07bd39a6f89d6d1a7ba55c1ce32279f..a264a73a737eb8da0c109c77a562e74fdb8232ad 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9404765ef7487013f01ecf24c0a1f70040cd11e7dbb6378646d15de4e5660a40
\ No newline at end of file
+3c2e3c2d3dd5d951099ad8d9f74d3c20dae11dd5615d86a6e2283b28ff5b19aa
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index facbca99790111ac36ae18d04c43647faefc4595..7cdd361779ca990d90a4b1a7b468ed561f0f9fa1 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -5278,7 +5278,7 @@ static int arCreateOrUpdateCommand(
      "      WHEN '-' THEN length(data)\n"
      "      WHEN 'd' THEN 0\n"
      "      ELSE -1 END,\n"
-     "    data\n"
+     "    sqlar_compress(data)\n"
      "  FROM fsdir(%Q,%Q)\n"
      "  WHERE lsmode(mode) NOT LIKE '?%%';",
      "REPLACE INTO %s(name,mode,mtime,data)\n"
@@ -5398,9 +5398,7 @@ static int arDotCommand(
         goto end_ar_command;
       }
       sqlite3_fileio_init(cmd.db, 0, 0);
-#ifdef SQLITE_HAVE_ZLIB
       sqlite3_sqlar_init(cmd.db, 0, 0);
-#endif
       sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
                               shellPutsFunc, 0, 0);