Fix the line-number of error messages coming out of the ".import" command

when the --skip option is used.

FossilOrigin-Name: e0a8b11dfd6b3ab89ae5032d60cf3c1bba7198a1a2debe5c691b5d1f2e1befee

diff --git a/manifest b/manifest
index 9fcb493eefa1ecf0ae435269d813cfb9747290d5..e83f4577088aa52f1cd260777a825e30b1cb2709 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Fix\sa\scompiler\swarning\sabout\san\sunused\sprocedure\sin\sthe\sparser.
-D 2020-07-03T21:18:07.729
+C Fix\sthe\sline-number\sof\serror\smessages\scoming\sout\sof\sthe\s".import"\scommand\nwhen\sthe\s--skip\soption\sis\sused.
+D 2020-07-03T21:24:42.768
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -20,7 +20,7 @@ F src/pragma.c 1c6a435c92e913a65be9875c14bd2976fa1bf05b76a54785378c32b04fa34a00
 F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
 F src/resolve.c 79cee37182fea66703f90365b8b0a646ed7e9bfa9238b91fa90dfc74258b940e
 F src/select.c 860daa05592ed1b38f6266f067fa020b539548ab929aa60fa59e7681e7f3f8cb
-F src/shell.c.in d663152487d4bfddea0f6d21ebc2ed51575d22657a02c6828afd344bbd4651af
+F src/shell.c.in 81fa23ac1a3d6ac9ed13e9ae711a3d8806396ca7cc12c5d6a2e2536f70b0c7ad
 F src/test1.c fe56c4bcaa2685ca9aa25d817a0ee9345e189aff4a5a71a3d8ba946c7776feb8
 F src/update.c 6a0484134635f167594d597a33d186051125d3ef41803a90b246cea6cf7f11f9
 F src/util.c c0bacc165f46169d2b720c37c8719165e383211698fad1de39dd16a8c161815a
@@ -43,7 +43,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P ca7630a5772ab919482a3629e11627143a1e1ec290a570ce4188189e671f9015
-R 5b079e9911147ba936a4333024c8b982
+P b27bb4fe389e12472a6144441df2dca6a7393024f2621fd22dd1a2b4033c46ec
+R 4597e3b583090ca1d9f8e80cad1c285d
 U drh
-Z 7b2f51aa0567089e465b20d619c5b594
+Z 073bca9c798500a057b61d811672f64a

diff --git a/manifest.uuid b/manifest.uuid
index db8c1595cb847dd640b8097f13bf424b4a86c921..a09b7a4ad32aede42ab136bd878ae928ca1a75c4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b27bb4fe389e12472a6144441df2dca6a7393024f2621fd22dd1a2b4033c46ec
\ No newline at end of file
+e0a8b11dfd6b3ab89ae5032d60cf3c1bba7198a1a2debe5c691b5d1f2e1befee
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 2ad7f990dc4a63f5815e8e550b7d61b0c40391b7..78a80da3e9fd71de2110e3217de804e942ef3e57 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -8136,7 +8136,6 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
     while( (nSkip--)>0 ){
       while( xRead(&sCtx) && sCtx.cTerm==sCtx.cColSep ){}
-      sCtx.nLine++;
     }
     zSql = sqlite3_mprintf("SELECT * FROM %s", zTable);
     if( zSql==0 ){