Report an error if an UPDATE...FROM statement has an ORDER BY but no LIMIT clause...

FossilOrigin-Name: ffcdb6689123bb871c9bd8f977197f86f37c42e9094e2d4bb187ff479f74cf65

diff --git a/manifest b/manifest
index e0eba4c3f84ac4dd90d3a46b03570c69348eecb2..f4649ed808b1df54ab74c64e70336846de96d8eb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sproblems\swith\susing\sLIMIT\sand\sFROM\sclauses\sas\spart\sof\ssingle\sUPDATE\sstatement.
-D 2020-04-29T20:11:01.860
+C Report\san\serror\sif\san\sUPDATE...FROM\sstatement\shas\san\sORDER\sBY\sbut\sno\sLIMIT\sclause.\sAdd\stests\sfor\smulti-column\sprimary\skeys.
+D 2020-04-30T15:49:56.938
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -599,7 +599,7 @@ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c eee7bae3ec0bc4abee951554bf46a8ba567c0f7752ac90c820ed8afff4c612dc
 F src/treeview.c 82c6391a3ba76215d4185fd4719a56ec4caf186a40c8a7b6e6ba4ae4467c2742
 F src/trigger.c 4ada1037cc99777f647a882cdacbd1a4deb6567b69daf02946286401b88cdc04
-F src/update.c 15c1e9b6191be56d0752235f38e8c4e0eddf7b8a26e31992631a848cf3a87517
+F src/update.c 0f27f4b1128a447df648ba458b08dc119d0974af052a555e038dcce27f7a4bf6
 F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
 F src/utf.c 95fb6e03a5ca679045c5adccd05380f0addccabef5911abddcb06af069500ab7
 F src/util.c 3b6cedf7a0c69bd6e1acce832873952d416212d6293b18d03064e07d7a9b5118
@@ -1618,7 +1618,7 @@ F test/update.test e906ca7cb1dc6f52af1ea243e08f727edfa79f924c2691f2f9e72481f8473
 F test/update2.test 67455bc61fcbcf96923c45b3bc4f87bc72be7d67575ad35f134906148c7b06d3
 F test/upfrom1.tcl 62efddee869b3a6f3e076b2816793fec9422e38d10ea42b63da733cdd2b1ad8e
 F test/upfrom1.test 543389b4eef43c7a21079df018cf95e29d7c2a4efd09b2597e54a03bbdbd30b9
-F test/upfrom2.test 1c0f8d3b963304f0feb04ca172484942a15ffca975cd25463fdfd4614d1245d0
+F test/upfrom2.test cbf5e1cb5066c9c04034ccb7a937f10a752ee7291670a1fdb4218aedcdaa960e
 F test/upsert1.test 88f9e258c6a0eeeb85937b08831e8daad440ba41f125af48439e9d33f266fb18
 F test/upsert2.test 9c3cdbb1a890227f6504ce4b0e3de68f4cdfa16bb21d8641208a9239896c5a09
 F test/upsert3.test 88d7d590a1948a9cb6eac1b54b0642f67a9f35a1fc0f19b200e97d5d39e3179c
@@ -1865,7 +1865,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 823ba94e29dece1687e28711e503a1f56d392c306b0cbc0a20548180834530d1
-R c7060e5765cacf17cc72ccb6e64f7f11
+P b717dc3c5fafb9b86a141e7ecffc030fd9b36aa57a0b3e5200d64ad23a0aa13d
+R 8112d214c23c0825cafbe3ae9671b4b5
 U dan
-Z 2cbbaf692ee6084a41961733ac9445a3
+Z 00088545d453cb111fa959dd326ff545

diff --git a/manifest.uuid b/manifest.uuid
index d8889b7ff8fb55fa1dd0d23b0fa25c8f87b72e54..4460169f93ff901cc81131185d586b57a25ffb6c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b717dc3c5fafb9b86a141e7ecffc030fd9b36aa57a0b3e5200d64ad23a0aa13d
\ No newline at end of file
+ffcdb6689123bb871c9bd8f977197f86f37c42e9094e2d4bb187ff479f74cf65
\ No newline at end of file

diff --git a/src/update.c b/src/update.c
index 5d4e5ae7db8931ffa5b294fd8d95ba7b81e2e6c1..fa80a7da85bab59b6a8eb20842bdbfe902459361 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -169,18 +169,28 @@ static void updatePopulateEphTable(
   Expr *pLimit
 ){
   int i;
-  sqlite3 *db = pParse->db;
   SelectDest dest;
   Select *pSelect = 0;
   ExprList *pList = 0;
-  Table *pTab = pTabList->a[0].pTab;
-  SrcList *pSrc = sqlite3SrcListDup(db, pTabList, 0);
-  Expr *pWhere2 = sqlite3ExprDup(db, pWhere, 0);
-  Expr *pLimit2 = sqlite3ExprDup(db, pLimit, 0);
-  ExprList *pOrderBy2 = sqlite3ExprListDup(db, pOrderBy, 0);
   ExprList *pGroupBy = 0;
+  sqlite3 *db = pParse->db;
+  Table *pTab = pTabList->a[0].pTab;
+  SrcList *pSrc;
+  Expr *pWhere2;
+  Expr *pLimit2;
+  ExprList *pOrderBy2;
   int eDest;
 
+  if( pOrderBy && pLimit==0 ) {
+    sqlite3ErrorMsg(pParse, "ORDER BY without LIMIT on UPDATE");
+    return;
+  }
+
+  pSrc = sqlite3SrcListDup(db, pTabList, 0);
+  pWhere2 = sqlite3ExprDup(db, pWhere, 0);
+  pLimit2 = sqlite3ExprDup(db, pLimit, 0);
+  pOrderBy2 = sqlite3ExprListDup(db, pOrderBy, 0);
+
   assert( pTabList->nSrc>1 );
   if( pSrc ){
     pSrc->a[0].iCursor = -1;

diff --git a/test/upfrom2.test b/test/upfrom2.test
index 2d8d51b82d058dcb670b23164161e52eea3d94f0..de9610e6afd0611224009fc8927815425a8bc2d5 100644 (file)
--- a/test/upfrom2.test
+++ b/test/upfrom2.test
@@ -125,6 +125,93 @@ foreach {tn wo} {
     fifteen->sixteen  iv->iv
   }
 
+  #--------------------------------------------------------------
+
+  do_execsql_test 1.%TN%.7 {
+    CREATE TABLE o1(w, x, y, z UNIQUE, PRIMARY KEY(w, x)) %WO%;
+    CREATE INDEX o1y ON t1(y);
+
+    INSERT INTO o1 VALUES(0, 0, 'i', 'one');
+    INSERT INTO o1 VALUES(0, 1, 'ii', 'two');
+    INSERT INTO o1 VALUES(1, 0, 'iii', 'three');
+    INSERT INTO o1 VALUES(1, 1, 'iv', 'four');
+
+    CREATE TRIGGER tro1 BEFORE UPDATE ON o1 BEGIN
+      INSERT INTO log VALUES(old.z || '->' || new.z);
+    END;
+    CREATE TRIGGER tro2 AFTER UPDATE ON o1 BEGIN
+      INSERT INTO log VALUES(old.y || '->' || new.y);
+    END;
+  }
+
+  do_execsql_test 1.%TN%.8 {
+    DELETE FROM log;
+    WITH data(k, v) AS (
+      VALUES(3, 'thirty'), (1, 'ten')
+    )
+    UPDATE o1 SET z=v FROM data WHERE (1+x+w*2)=k;
+
+    SELECT * FROM o1;
+    SELECT * FROM log;
+  } {
+    0 0 i ten   0 1 ii two   1 0 iii thirty   1 1 iv four
+    one->ten        i->i
+    three->thirty   iii->iii
+  }
+
+  do_execsql_test 1.%TN%.9 {
+    DELETE FROM log;
+    UPDATE o1 SET y=v FROM t2, t3 WHERE (1+o1.w*2+o1.x)=t2.a AND t3.k=t2.b;
+  
+    SELECT * FROM o1;
+    SELECT * FROM log;
+  } {
+    0 0 i ten   0 1 xii two   1 0 v thirty   1 1 iv four
+    two->two         ii->xii
+    thirty->thirty   iii->v
+  }
+
+  do_execsql_test 1.%TN%.10 {
+    DELETE FROM log;
+    WITH data(k, v) AS (
+      VALUES(1, 'seven'), (1, 'eight'), (2, 'eleven'), (2, 'twelve')
+    )
+    UPDATE o1 SET z=v FROM data WHERE (1+w*2+x)=k;
+  
+    SELECT * FROM o1;
+    SELECT * FROM log;
+  } {
+    0 0 i eight   0 1 xii twelve   1 0 v thirty   1 1 iv four
+    ten->eight        i->i
+    two->twelve       xii->xii
+  }
+
+  do_test 1.%TN%.11 { db changes } {2}
+
+  do_execsql_test 1.%TN%.12 { 
+    CREATE VIEW w1 AS SELECT * FROM o1;
+    CREATE TRIGGER w1tr INSTEAD OF UPDATE ON w1 BEGIN
+      UPDATE o1 SET y=new.y, z=new.z WHERE w=new.w AND x=new.x;
+    END;
+
+    DELETE FROM log;
+    WITH data(k, v) AS (
+      VALUES(3, 'thirteen'), (3, 'fourteen'), (4, 'fifteen'), (4, 'sixteen')
+    )
+    UPDATE w1 SET z=v FROM data WHERE (1+w*2+x)=k;
+  }
+
+  do_execsql_test 1.%TN%.13 {
+    SELECT * FROM w1;
+    SELECT * FROM log;
+  } {
+    0 0 i eight   0 1 xii twelve   1 0 v fourteen   1 1 iv sixteen
+    thirty->thirteen  v->v
+    thirteen->fourteen  v->v
+    four->fifteen  iv->iv
+    fifteen->sixteen  iv->iv
+  }
+
 }]
 }
 
@@ -165,6 +252,40 @@ eval [string map [list %WO% $wo %TN% $tn] {
     5 five 6 six 7 seven 8 eight
   }
 
+  do_catchsql_test 2.%TN%.5 {
+    UPDATE x1 SET b=b||b ORDER BY b;
+  } {1 {ORDER BY without LIMIT on UPDATE}}
+  do_catchsql_test 2.%TN%.6 {
+    UPDATE x1 SET b=b||y FROM data1 WHERE a=x ORDER BY b;
+  } {1 {ORDER BY without LIMIT on UPDATE}}
+
+  #-----------------------------------------------------------------------
+
+  do_execsql_test 2.%TN%.6 {
+    DROP TABLE x1;
+    CREATE TABLE x1(u, v, b, PRIMARY KEY(u, v)) %WO%;
+    INSERT INTO x1 VALUES
+        (0, 1, 'one'), (1, 0, 'two'), (1, 1, 'three'), (2, 0, 'four'),
+        (2, 1, 'five'), (3, 0, 'six'), (3, 1, 'seven'), (4, 0, 'eight');
+  }
+
+  do_execsql_test 2.%TN%.7 {
+    UPDATE x1 SET b=y FROM data1 WHERE (u*2+v)=x ORDER BY u, v LIMIT 3;
+    SELECT * FROM x1;
+  } {
+    0 1 eleven 1 0 twelve 1 1 thirteen 2 0 four 
+    2 1 five 3 0 six 3 1 seven 4 0 eight
+  }
+
+  do_execsql_test 2.%TN%.8 {
+    UPDATE x1 SET b=b||y FROM data1 WHERE (u*2+v)=x ORDER BY b LIMIT 3;
+    SELECT * FROM x1;
+  } {
+    0 1 eleveneleven 1 0 twelve 1 1 thirteenthirteen 2 0 fourfourteen 
+    2 1 five  3 0 six 3 1 seven 4 0 eight
+  }
+
+
 }]
 }}