From: dan Date: Thu, 30 Aug 2018 20:03:44 +0000 (+0000) Subject: Test the schema after renaming a table. Ensure that temp database triggers and X-Git-Tag: version-3.25.0~39^2~12^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d324823a8f6587fb296d85d9a52a3835bb3eacd;p=thirdparty%2Fsqlite.git Test the schema after renaming a table. Ensure that temp database triggers and views are updated when renaming a column. FossilOrigin-Name: f3c27d916d4837f8fc3dd812bd004535f04c7a53bd2a0a2419613275f48bec76 --- diff --git a/manifest b/manifest index fa7a7425a2..1c3355c32e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\san\sALTER\sTABLE\sproblem\swith\sprocessing\stemp\sschema\sviews\sand\striggers. -D 2018-08-30T16:26:48.167 +C Test\sthe\sschema\safter\srenaming\sa\stable.\sEnsure\sthat\stemp\sdatabase\striggers\sand\nviews\sare\supdated\swhen\srenaming\sa\scolumn. +D 2018-08-30T20:03:44.965 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 f46a4188f954d41d9c461d2af065efd48eb56d46c838c90d752e25ed2aa9dce8 +F src/alter.c 5ff9eba02edd4fb3635fee57593de12d8f9a8c926e1ae6a42d86f2881dd61229 F src/analyze.c 3dc6b98cf007b005af89df165c966baaa48e8124f38c87b4d2b276fe7f0b9eb9 F src/attach.c 4bd5b92633671d3e8ce431153ebb1893b50335818423b5373f3f27969f79769a F src/auth.c 32a5bbe3b755169ab6c66311c5225a3cd4f75a46c041f7fb117e0cbb68055114 @@ -599,10 +599,10 @@ F test/alter.test 8388947daa6caee09f624242d5907dbb0c0da6704cb40c44a6a1c1b4119142 F test/alter2.test 7ea05c7d92ac99349a802ef7ada17294dd647060 F test/alter3.test 4d79934d812eaeacc6f22781a080f8cfe012fdc3 F test/alter4.test b6d7b86860111864f6cddb54af313f5862dda23b -F test/altercol.test 919898b3eef41d5d582af22d3c67c8b5a211ba30ac06821933421c24e3449e7d +F test/altercol.test b89cd928c1e7513e569a18021f59754b164978860f5069bbebff703e4c7d2c50 F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc F test/altermalloc2.test 0231398534c494401a70a1d06a63d7849cb5b317fcc14228cbdb53039eba7eae -F test/altertab.test 5b768709de64e33752be1449819691d615672a08b4295cb67f2d09f391e379bc +F test/altertab.test 8c9631e9daca782905207c3c728c89181320d5ff8bfe1dc10cced233446a017f F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f F test/analyze.test b3a9c67d00e1df7588a5b7be9a0292899f94fe8cac1f94a017277474ca2e59df F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8 @@ -1759,7 +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 01308bae3acf33f78b5bb90892085eab340df093aafc17e6ccf6a7d6cf324897 -R 41ac1858095cfee395fda21fca593944 +P 72cfb1be29971d91a164f1d4f20cb054de68960a0bd547630bcd1160565971c5 +R 79fac94bb61d9aa70a424b0f3bdeede1 U dan -Z db3c3dc1bf76c870ed05c4a5c4e73881 +Z 2a5b5dbe0b0f3a53631f87af8692d7e9 diff --git a/manifest.uuid b/manifest.uuid index 17687ef669..5582d34222 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -72cfb1be29971d91a164f1d4f20cb054de68960a0bd547630bcd1160565971c5 \ No newline at end of file +f3c27d916d4837f8fc3dd812bd004535f04c7a53bd2a0a2419613275f48bec76 \ No newline at end of file diff --git a/src/alter.c b/src/alter.c index bfd7055136..113404cfed 100644 --- a/src/alter.c +++ b/src/alter.c @@ -161,6 +161,29 @@ static int isSystemTable(Parse *pParse, const char *zName){ return 0; } +void renameTestSchema(Parse *pParse, const char *zDb, int bTemp){ + sqlite3NestedParse(pParse, + "SELECT 1 " + "FROM \"%w\".%s " + "WHERE name NOT LIKE 'sqlite_%%'" + " AND sql NOT LIKE 'create virtual%%'" + " AND sqlite_rename_test(%Q, sql, type, name, %d)=0 ", + zDb, MASTER_NAME, + zDb, bTemp + ); + + if( bTemp==0 ){ + sqlite3NestedParse(pParse, + "SELECT 1 " + "FROM temp.%s " + "WHERE name NOT LIKE 'sqlite_%%'" + " AND sql NOT LIKE 'create virtual%%'" + " AND sqlite_rename_test(%Q, sql, type, name, 1)=0 ", + MASTER_NAME, zDb + ); + } +} + /* ** Generate code to implement the "ALTER TABLE xxx RENAME TO yyy" ** command. @@ -325,6 +348,8 @@ void sqlite3AlterRenameTable( sqlite3VdbeAddParseSchemaOp(pParse->pVdbe, iDb, 0); if( iDb!=1 ) sqlite3VdbeAddParseSchemaOp(pParse->pVdbe, 1, 0); + renameTestSchema(pParse, zDb, iDb==1); + exit_rename_table: sqlite3SrcListDelete(db, pSrc); sqlite3DbFree(db, zName); @@ -651,22 +676,22 @@ void sqlite3AlterRenameColumn( pTab->zName ); + sqlite3NestedParse(pParse, + "UPDATE temp.%s SET " + "sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d) " + "WHERE type IN ('trigger', 'view')", + MASTER_NAME, + zDb, pTab->zName, iCol, zNew, bQuote + ); + /* Drop and reload the database schema. */ if( pParse->pVdbe ){ sqlite3ChangeCookie(pParse, iSchema); sqlite3VdbeAddParseSchemaOp(pParse->pVdbe, iSchema, 0); + if( iSchema!=1 ) sqlite3VdbeAddParseSchemaOp(pParse->pVdbe, 1, 0); } - sqlite3NestedParse(pParse, - "SELECT 1 " - "FROM \"%w\".%s " - "WHERE name NOT LIKE 'sqlite_%%' AND (type != 'index' OR tbl_name = %Q)" - " AND sql NOT LIKE 'create virtual%%'" - " AND sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, -1)=0 ", - zDb, MASTER_NAME, - pTab->zName, - zDb, pTab->zName, iCol, zNew - ); + renameTestSchema(pParse, zDb, iSchema==1); exit_rename_column: sqlite3SrcListDelete(db, pSrc); @@ -1149,10 +1174,7 @@ static void renameWalkTrigger(Walker *pWalker, Trigger *pTrigger){ ** 4. Table: Table name ** 5. iCol: Index of column to rename ** 6. zNew: New column name -** 7. bQuote: Non-zero if the new column name should be quoted. Negative -** if this function is being called to check that the schema -** can still be parsed and symbols resolved after the column -** has been renamed. +** 7. bQuote: Non-zero if the new column name should be quoted. ** ** Do a column rename operation on the CREATE statement given in zSql. ** The iCol-th column (left-most is 0) of table zTable is renamed from zCol @@ -1304,7 +1326,7 @@ static void renameColumnFunc( renameColumnFunc_done: if( rc!=SQLITE_OK ){ if( sParse.zErrMsg ){ - renameColumnParseError(context, (bQuote<0), argv[1], argv[2], &sParse); + renameColumnParseError(context, 0, argv[1], argv[2], &sParse); }else{ sqlite3_result_error_code(context, rc); } @@ -1486,6 +1508,48 @@ static void renameTableFunc( return; } +static void renameTableTest( + sqlite3_context *context, + int NotUsed, + sqlite3_value **argv +){ + sqlite3 *db = sqlite3_context_db_handle(context); + unsigned char const *zDb = sqlite3_value_text(argv[0]); + unsigned char const *zInput = sqlite3_value_text(argv[1]); + int bTemp = sqlite3_value_int(argv[4]); + int rc; + Parse sParse; + + rc = renameParseSql(&sParse, zDb, 1, db, zInput, bTemp); + if( rc==SQLITE_OK ){ + if( sParse.pNewTable && sParse.pNewTable->pSelect ){ + NameContext sNC; + memset(&sNC, 0, sizeof(sNC)); + sNC.pParse = &sParse; + sqlite3SelectPrep(&sParse, sParse.pNewTable->pSelect, &sNC); + if( sParse.nErr ) rc = sParse.rc; + } + + else if( sParse.pNewTrigger ){ + rc = renameResolveTrigger(&sParse, bTemp ? 0 : zDb); + } + } + + if( rc!=SQLITE_OK ){ + renameColumnParseError(context, 1, argv[2], argv[3], &sParse); + } + + if( sParse.pVdbe ){ + sqlite3VdbeFinalize(sParse.pVdbe); + } + sqlite3DeleteTable(db, sParse.pNewTable); + if( sParse.pNewIndex ) sqlite3FreeIndex(db, sParse.pNewIndex); + sqlite3DeleteTrigger(db, sParse.pNewTrigger); + sqlite3DbFree(db, sParse.zErrMsg); + renameTokenFree(db, sParse.pRename); + sqlite3ParserReset(&sParse); +} + /* ** Register built-in functions used to help implement ALTER TABLE */ @@ -1493,6 +1557,7 @@ void sqlite3AlterFunctions(void){ static FuncDef aAlterTableFuncs[] = { FUNCTION(sqlite_rename_column, 8, 0, 0, renameColumnFunc), FUNCTION(sqlite_rename_table, 5, 0, 0, renameTableFunc), + FUNCTION(sqlite_rename_test, 5, 0, 0, renameTableTest), }; sqlite3InsertBuiltinFuncs(aAlterTableFuncs, ArraySize(aAlterTableFuncs)); } diff --git a/test/altercol.test b/test/altercol.test index 6181ae5f36..967da67187 100644 --- a/test/altercol.test +++ b/test/altercol.test @@ -652,7 +652,7 @@ do_execsql_test 15.2 { #------------------------------------------------------------------------- # -do_execsql_test 16.0 { +do_execsql_test 16.1.0 { CREATE TABLE t1(a,b,c); CREATE TABLE t2(d,e,f); INSERT INTO t1 VALUES(1,2,3); @@ -661,15 +661,15 @@ do_execsql_test 16.0 { SELECT * FROM v4; } {1 4} -do_catchsql_test 16.1 { +do_catchsql_test 16.1.1 { ALTER TABLE t2 RENAME d TO a; } {1 {error in view v4 after rename: ambiguous column name: a}} -do_execsql_test 16.2 { +do_execsql_test 16.1.2 { SELECT * FROM v4; } {1 4} -do_execsql_test 16.3 { +do_execsql_test 16.1.3 { CREATE UNIQUE INDEX t2d ON t2(d); CREATE TRIGGER tr1 AFTER INSERT ON t1 BEGIN INSERT INTO t2 VALUES(new.a, new.b, new.c) @@ -677,21 +677,34 @@ do_execsql_test 16.3 { END; } -do_execsql_test 16.4 { +do_execsql_test 16.1.4 { INSERT INTO t1 VALUES(4, 8, 456); SELECT * FROM t2; } {4 5 456} -do_execsql_test 16.5 { +do_execsql_test 16.1.5 { ALTER TABLE t2 RENAME COLUMN f TO "big f"; INSERT INTO t1 VALUES(4, 0, 20456); SELECT * FROM t2; } {4 5 20456} -do_execsql_test 16.6 { +do_execsql_test 16.1.6 { ALTER TABLE t1 RENAME COLUMN c TO "big c"; INSERT INTO t1 VALUES(4, 0, 0); SELECT * FROM t2; } {4 5 0} +do_execsql_test 16.2.1 { + CREATE VIEW temp.v5 AS SELECT "big c" FROM t1; + SELECT * FROM v5; +} {3 456 20456 0} + +do_execsql_test 16.2.2 { + ALTER TABLE t1 RENAME COLUMN "big c" TO reallybigc; +} {} + +do_execsql_test 16.2.3 { + SELECT * FROM v5; +} {3 456 20456 0} + finish_test diff --git a/test/altertab.test b/test/altertab.test index 20dbc2299b..fb0dd7dec8 100644 --- a/test/altertab.test +++ b/test/altertab.test @@ -178,6 +178,33 @@ do_execsql_test 5.1 { ALTER TABLE temp.t9 RENAME TO 't1234567890' } +do_execsql_test 5.2 { + CREATE TABLE t1(a, b); + CREATE TABLE t2(a, b); + INSERT INTO t1 VALUES(1, 2); + INSERT INTO t2 VALUES(3, 4); + CREATE VIEW v AS SELECT one.a, one.b, t2.a, t2.b FROM t1 AS one, t2; + SELECT * FROM v; +} {1 2 3 4} + +do_catchsql_test 5.3 { + ALTER TABLE t2 RENAME TO one; +} {1 {error in view v after rename: ambiguous column name: one.a}} + +do_execsql_test 5.4 { + SELECT * FROM v +} {1 2 3 4} + +do_execsql_test 5.5 { + DROP VIEW v; + CREATE VIEW temp.vv AS SELECT one.a, one.b, t2.a, t2.b FROM t1 AS one, t2; + SELECT * FROM vv; +} {1 2 3 4} + +do_catchsql_test 5.6 { + ALTER TABLE t2 RENAME TO one; +} {1 {error in view vv after rename: ambiguous column name: one.a}} + finish_test