Fix a problem with fix [b4b57413].

FossilOrigin-Name: ca7b7aaed010ec67bec5355a9ac1d7f229d6d5f2ba2d796b76f5e908b1267688

diff --git a/manifest b/manifest
index f8985735aa0516961240db0a7892e806f84e7319..d30cd22f6dc62b06ecc2f374f4c626052f0dfa72 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\sthe\sfts3\smatchinfo()\sfunction\swith\scorrupt\sdatabase\shandling.
-D 2019-01-16T19:44:09.299
+C Fix\sa\sproblem\swith\sfix\s[b4b57413].
+D 2019-01-16T20:48:13.541
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 2a9d0331ab57c68173a4c2fe9046fe89c4d916a888e04dd7a2d36958c2bff777
@@ -511,7 +511,7 @@ F src/pragma.h fdd03d78a7497f74a3f652909f945328480089189526841ae829ce7313d98d13
 F src/prepare.c 63b8395d728cc63c3fdc6cb98eb01e1ce84d66c46aa3c32f38332ea789429922
 F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 4bfb39273d61cc20634fb3bd8d37a60391546fcef63b19ec11c60b3f79011fa7
+F src/resolve.c a40867ce07a9b58121d6f9a8fc969555d3c9bdcb6c2b5fc202670815af8dbd91
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 5cbd6ab60bd017cf5857f9153680a64d04678a9d2a0ea56b90cae2f61deb18b3
 F src/shell.c.in b3cd745b53439674fdc3dc4db12e094d11cff91495be68bb09ac52726084b583
@@ -621,7 +621,7 @@ F test/alterlegacy.test 82022721ce0de29cedc9a7af63bc9fcc078b0ee000f8283b4b6ea9c3
 F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74a3fb80c9
 F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
 F test/altertab.test 6e13f13d8c30708f16187908c31dadb1bfff9e3cb2a07a7392a7a5e076f58f4a
-F test/altertab2.test 1a4dffbd353754c8df1e96af8cf2e0755cb0a33854ee31191260fb64a95b8e6b
+F test/altertab2.test b80f1b4c1f8346326b9ba35ad741544c1a9610c82187e49b08f84b869d5f01db
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test 7168c8bffa5d5cbc53c05b7e9c7fcdd24b365a1bc5046ce80c45efa3c02e6b7c
 F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
@@ -1800,7 +1800,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 49fcde2f1f981ac0c75728bed3444e7c1d3167311db282d3375c96ce090b2210
-R e10c8270e6a4762be5d375dc46d1facb
+P 24ed5fb6aea30b098d2faf3cf9d638933e518657217e903239ffaa1e25d34f66
+R 517a448534cc4b6034034d2b08e4e979
 U dan
-Z 45a76f21c4e762a5579bae4bb6c1267c
+Z 547d0b49d1156d2841b1ae4c65318cc5

diff --git a/manifest.uuid b/manifest.uuid
index 9e7e361681c01c857baf45ed29917104a0a5b336..5606b4160a872c4eb5437cab134fa5437efa1277 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-24ed5fb6aea30b098d2faf3cf9d638933e518657217e903239ffaa1e25d34f66
\ No newline at end of file
+ca7b7aaed010ec67bec5355a9ac1d7f229d6d5f2ba2d796b76f5e908b1267688
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 3a5b467ad7932adfe1a1e28e7b8ee11db9ba1d50..da2febb1fe66868807a1eeea9e25928d23957744 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1163,7 +1163,7 @@ static int resolveCompoundOrderBy(
           if( IN_RENAME_OBJECT ){
             if( iCol>0 ){
               pItem->done = 1;
-              break;
+              continue;
             }
           }else{
             sqlite3ExprDelete(db, pDup);

diff --git a/test/altertab2.test b/test/altertab2.test
index c825841fe457524ec83e5b31ad0a4bff9a1e1192..22995744a440cf38d6426142f2e9912115308c32 100644 (file)
--- a/test/altertab2.test
+++ b/test/altertab2.test
@@ -263,6 +263,49 @@ do_execsql_test 6.2 {
   END}
 }
 
+#-------------------------------------------------------------------------
+reset_db
+
+do_execsql_test 7.0 {
+  CREATE TABLE t1(a,b,c,d,e,f);
+  INSERT INTO t1 VALUES(1,2,3,4,5,6);
+  CREATE TABLE t2(x,y,z);
+}
+
+do_execsql_test 7.1 {
+  SELECT a,b,c FROM t1 UNION SELECT d,e,f FROM t1 ORDER BY b,c;
+} {1 2 3 4 5 6}
+
+do_execsql_test 7.2 {
+  CREATE TRIGGER r1 AFTER INSERT ON t1 BEGIN
+    INSERT INTO t2
+    SELECT a,b,c FROM t1 UNION SELECT d,e,f FROM t1 ORDER BY b,c;
+  END;
+  INSERT INTO t1 VALUES(2,3,4,5,6,7);
+  SELECT * FROM t2;
+} {1 2 3  2 3 4  4 5 6  5 6 7}
+
+do_execsql_test 7.3 {
+  ALTER TABLE t1 RENAME TO xyzzy;
+  SELECT sql FROM sqlite_master WHERE name='r1'
+} {
+  {CREATE TRIGGER r1 AFTER INSERT ON "xyzzy" BEGIN
+    INSERT INTO t2
+    SELECT a,b,c FROM "xyzzy" UNION SELECT d,e,f FROM "xyzzy" ORDER BY b,c;
+  END}
+}
+
+do_execsql_test 7.3 {
+  ALTER TABLE xyzzy RENAME c TO ccc;
+  SELECT sql FROM sqlite_master WHERE name='r1'
+} {
+  {CREATE TRIGGER r1 AFTER INSERT ON "xyzzy" BEGIN
+    INSERT INTO t2
+    SELECT a,b,ccc FROM "xyzzy" UNION SELECT d,e,f FROM "xyzzy" ORDER BY b,ccc;
+  END}
+}
+
+
 finish_test