In zonefile, change the "file TEXT" column back to "fileid INTEGER". The

fileid can be used as a key with the associated zonefile_files table, which
contains more information than just the filename.

FossilOrigin-Name: 38d23888cf5a7117c51bd9211bd93ec52a30360f7eb2bc83a13910c5d85fe739

diff --git a/ext/zonefile/zonefile.c b/ext/zonefile/zonefile.c
index 1714120535ed5d399ea56c89272bfcd0ac693018..d06b8fb1c65f120973b5b886720ef9229faed24e 100644 (file)
--- a/ext/zonefile/zonefile.c
+++ b/ext/zonefile/zonefile.c
@@ -503,7 +503,7 @@ static ZonefileCompress *zonefileCompressByValue(int eType){
   "CREATE TABLE z1("             \
   "  k INTEGER PRIMARY KEY,"     \
   "  v BLOB,"                    \
-  "  file TEXT,"                 \
+  "  fileid INTEGER,"            \
   "  sz INTEGER"                 \
   ")"
 
@@ -2312,13 +2312,9 @@ static int zonefileColumn(
     case 1: /* v */
       rc = zonefileGetValue(pCtx, pCsr);
       break;
-    case 2: { /* file */
-      const char *zFile = 0;
-      rc = zonefileGetFile(pCtx, pCsr, &zFile);
-      sqlite3_result_text(pCtx, zFile, -1, SQLITE_TRANSIENT);
-      zonefileReleaseFile(pCsr);
+    case 2: /* fileid */
+      sqlite3_result_value(pCtx, sqlite3_column_value(pCsr->pSelect, 1));
       break;
-    }
     default: { /* sz */
       int iCol;
       if( sqlite3_column_type(pCsr->pSelect, 5)==SQLITE_NULL ){

diff --git a/ext/zonefile/zonefile1.test b/ext/zonefile/zonefile1.test
index 660bb14e8c42fb5538b23548de6b358febf71446..33e226c0149ae84e59556a8a6fdeb29fbd608633 100644 (file)
--- a/ext/zonefile/zonefile1.test
+++ b/ext/zonefile/zonefile1.test
@@ -47,9 +47,7 @@ do_execsql_test 1.3 {
 do_execsql_test 1.4 { SELECT count(*) FROM z1_shadow_idx } 3
 
 do_execsql_test 1.5.1 { SELECT k FROM z1 } {1 2 3}
-do_execsql_test 1.5.2 { SELECT file FROM z1 } {
-  test.zonefile test.zonefile test.zonefile
-}
+do_execsql_test 1.5.2 { SELECT fileid FROM z1 } {1 1 1}
 do_execsql_test 1.5.4 { SELECT sz FROM z1 } {100 100 100}
 
 do_execsql_test 1.5.5 {

diff --git a/manifest b/manifest
index c2031e883150dde6b58164c7f715bf4b0e13c27d..7b59cd6d17581639a7c201d62b1d9bfeb38eab98 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sREADME.md\sin\sext/zonefile.
-D 2018-02-20T20:57:20.401
+C In\szonefile,\schange\sthe\s"file\sTEXT"\scolumn\sback\sto\s"fileid\sINTEGER".\sThe\nfileid\scan\sbe\sused\sas\sa\skey\swith\sthe\sassociated\szonefile_files\stable,\swhich\ncontains\smore\sinformation\sthan\sjust\sthe\sfilename.
+D 2018-02-21T10:43:19.310
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea
@@ -409,8 +409,8 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
 F ext/zonefile/README.md df86ef5b4f9aa8b07e1c8124b3f2dcea616927385aad59d525b784f0a06d446c
-F ext/zonefile/zonefile.c e65e17336a635ab1a7745924c2a9801427fcb7d90faf27495a18818c2873cf43
-F ext/zonefile/zonefile1.test a30f9604cede51f699af8192a34fac96dc05b860ffa10d6040baeda7df350ccd
+F ext/zonefile/zonefile.c 36ee984120fcfecab65d1b0f54cc6e7a440d71b6847e5d042c9c3acebaec1362
+F ext/zonefile/zonefile1.test 4cd9fa8d333c195f59792c4d5c1e8387e778e46354580fbef0b84efc932c6a47
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -1708,7 +1708,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 d8d0bdcb405610978393bb8f3ef30ee868fddda0d129036f8d0102012fe0d5d4
-R 330350d65a5b59e381d4f9046562bedf
+P a13b2b38137025d04bbfc1b12f0d0563dcf7e0ab1d4b06ffc7cacf994f00e188
+R 6d843fda370cef6d5f337c17aede902e
 U dan
-Z dfd577d68bb047c0ff359adce6e8e2de
+Z bc3200ce14e90f9591a4b7905d759f8a

diff --git a/manifest.uuid b/manifest.uuid
index 438d8112c457fb9c43c137dd156f8db05dc86671..fc4fe856fe99647e1195172b6c3bdb1858591a01 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a13b2b38137025d04bbfc1b12f0d0563dcf7e0ab1d4b06ffc7cacf994f00e188
\ No newline at end of file
+38d23888cf5a7117c51bd9211bd93ec52a30360f7eb2bc83a13910c5d85fe739
\ No newline at end of file