Fix an ALTER TABLE problem with processing temp schema views and triggers.

FossilOrigin-Name: 72cfb1be29971d91a164f1d4f20cb054de68960a0bd547630bcd1160565971c5

diff --git a/manifest b/manifest
index ee32bec3703a8a07c7efc51a6d649680cc14bc0a..fa7a7425a262ef0e46ff3efd3098204be8c56dd8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Extend\sRENAME\sTABLE\sto\sedit\striggers\sand\sviews.\sStill\sbuggy.
-D 2018-08-29T21:00:16.110
+C Fix\san\sALTER\sTABLE\sproblem\swith\sprocessing\stemp\sschema\sviews\sand\striggers.
+D 2018-08-30T16:26:48.167
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 2729786d5d188974913f07ea63cc84cd42cb9cac5f4aac823c40105e68e22f63
@@ -432,7 +432,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 78188ded77cf1d0a9abb273e7139e218ab24a4bcfdfa6ee07300430e539a12b6
+F src/alter.c f46a4188f954d41d9c461d2af065efd48eb56d46c838c90d752e25ed2aa9dce8
 F src/analyze.c 3dc6b98cf007b005af89df165c966baaa48e8124f38c87b4d2b276fe7f0b9eb9
 F src/attach.c 4bd5b92633671d3e8ce431153ebb1893b50335818423b5373f3f27969f79769a
 F src/auth.c 32a5bbe3b755169ab6c66311c5225a3cd4f75a46c041f7fb117e0cbb68055114
@@ -602,7 +602,7 @@ F test/alter4.test b6d7b86860111864f6cddb54af313f5862dda23b
 F test/altercol.test 919898b3eef41d5d582af22d3c67c8b5a211ba30ac06821933421c24e3449e7d
 F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
 F test/altermalloc2.test 0231398534c494401a70a1d06a63d7849cb5b317fcc14228cbdb53039eba7eae
-F test/altertab.test 6b2ebbe3a8fc3222ba773c7f884900367ef528cd90be361468fb15eb97dfcc51
+F test/altertab.test 5b768709de64e33752be1449819691d615672a08b4295cb67f2d09f391e379bc
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test b3a9c67d00e1df7588a5b7be9a0292899f94fe8cac1f94a017277474ca2e59df
 F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
@@ -1759,10 +1759,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 5858c0bde7c210f07cfa72cee95325847b26733abab4f56301b57cd816931e97
-R 2ca3dc5affa16de92546f4b6ec0792d4
-T *branch * alter-table-rename-table
-T *sym-alter-table-rename-table *
-T -sym-alter-table-rename-column *
+P 01308bae3acf33f78b5bb90892085eab340df093aafc17e6ccf6a7d6cf324897
+R 41ac1858095cfee395fda21fca593944
 U dan
-Z 93949a0c450c29bbb5ee4cb93008ceac
+Z db3c3dc1bf76c870ed05c4a5c4e73881

diff --git a/manifest.uuid b/manifest.uuid
index dbb09bc3cb92412c6f1a0c1ba49a0d3f8f406432..17687ef669e49dec36352a07b7f8596c06f26283 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01308bae3acf33f78b5bb90892085eab340df093aafc17e6ccf6a7d6cf324897
\ No newline at end of file
+72cfb1be29971d91a164f1d4f20cb054de68960a0bd547630bcd1160565971c5
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index 65880752c9e58097168aa61e3ad38c5c3721eab0..bfd705513685a7e4faf4f6e69a68006bec9c3a83 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -275,10 +275,10 @@ void sqlite3AlterRenameTable(
   ** the schema to use the new table name.  */
   sqlite3NestedParse(pParse, 
       "UPDATE \"%w\".%s SET "
-      "sql = sqlite_rename_table(%Q, sql, %Q, %Q, 0) "
+      "sql = sqlite_rename_table(%Q, sql, %Q, %Q, %d) "
       "WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)"
       "AND   name NOT LIKE 'sqlite_%%'"
-      , zDb, MASTER_NAME, zDb, zTabName, zName, zTabName
+      , zDb, MASTER_NAME, zDb, zTabName, zName, (iDb==1), zTabName
   );
 
   /* Update the tbl_name and name columns of the sqlite_master table
@@ -1271,7 +1271,7 @@ static void renameColumnFunc(
   }else{
     /* A trigger */
     TriggerStep *pStep;
-    rc = renameResolveTrigger(&sParse, zDb);
+    rc = renameResolveTrigger(&sParse, (bTemp ? 0 : zDb));
     if( rc!=SQLITE_OK ) goto renameColumnFunc_done;
 
     for(pStep=sParse.pNewTrigger->step_list; pStep; pStep=pStep->pNext){
@@ -1451,14 +1451,13 @@ static void renameTableFunc(
         renameTokenFind(&sParse, &sCtx, sParse.pNewTrigger->table);
       }
 
-      rc = renameResolveTrigger(&sParse, zDb);
+      rc = renameResolveTrigger(&sParse, bTemp ? 0 : zDb);
       if( rc==SQLITE_OK ){
         renameWalkTrigger(&sWalker, pTrigger);
-      }
-
-      for(pStep=pTrigger->step_list; pStep; pStep=pStep->pNext){
-        if( pStep->zTarget && 0==sqlite3_stricmp(pStep->zTarget, zOld) ){
-          renameTokenFind(&sParse, &sCtx, pStep->zTarget);
+        for(pStep=pTrigger->step_list; pStep; pStep=pStep->pNext){
+          if( pStep->zTarget && 0==sqlite3_stricmp(pStep->zTarget, zOld) ){
+            renameTokenFind(&sParse, &sCtx, pStep->zTarget);
+          }
         }
       }
     }

diff --git a/test/altertab.test b/test/altertab.test
index d09e19b79a456db87077c26d97665bc0e9a7e475..20dbc2299b6ca24a63c1bc87a1b7e86999e2f977 100644 (file)
--- a/test/altertab.test
+++ b/test/altertab.test
@@ -159,6 +159,24 @@ do_test 4.2 {
   END
 }]]
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 5.0 {
+  CREATE TABLE t9(a, b, c);
+  CREATE TABLE t10(a, b, c);
+  CREATE TEMP TABLE t9(a, b, c);
+
+  CREATE TRIGGER temp.t9t AFTER INSERT ON temp.t9 BEGIN
+    INSERT INTO t10 VALUES(new.a, new.b, new.c);
+  END;
+
+  INSERT INTO temp.t9 VALUES(1, 2, 3);
+  SELECT * FROM t10;
+} {1 2 3}
+
+do_execsql_test 5.1 {
+  ALTER TABLE temp.t9 RENAME TO 't1234567890'
+}
 
 finish_test