-C Allow\sa\swritable\svirtual\stable\sto\shave\sa\sschema\swith\san\sINTEGER\sPRIMARY\sKEY\nand\sWITHOUT\sROWID.\s\sThis\sfixes\sticket\n[f25d5ceebe1d710ff61a571e395356869d8272ef].\s\sTest\scase\sin\sTH3.
-D 2018-09-24T19:41:12.240
+C Add\sthe\s"PRAGMA\slegacy_alter_table=ON"\scommand\sto\senable\sthe\spre-3.25.0\nbehavior\sof\sALTER\sTABLE\sthat\sdoes\snot\smodify\sthe\sbodies\sof\striggers\sor\nviews\sor\sthe\sWHERE\sclause\sof\sa\spartial\sindex.\s\sEnable\sthe\slegacy\sbehavior\nby\sdefault\swhen\srunning\sthe\sxRename\smethod\sof\svirtual\stables.
+D 2018-09-24T20:48:20.320
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 2269dd2f37ba963fde4c51e9e83542f126c86a8e10357c17f48137c6bee5299b
+F src/alter.c 70dd115eb1f949f69f61773733dc89d6494915ec6a736f259c7a7de4aeb51726
F src/analyze.c 3dc6b98cf007b005af89df165c966baaa48e8124f38c87b4d2b276fe7f0b9eb9
F src/attach.c 4bd5b92633671d3e8ce431153ebb1893b50335818423b5373f3f27969f79769a
F src/auth.c 32a5bbe3b755169ab6c66311c5225a3cd4f75a46c041f7fb117e0cbb68055114
F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
F src/pragma.c 79abc65c08d2754048efee3ba99fe91863dfeab0ba699a4439fa5053ec87cf36
-F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
+F src/pragma.h fb46b1e663128f6827979ad8ebddb55be2a0276ea923c47adeac02144207a682
F src/prepare.c f8e260d940a0e08494c0f30744521b2f832d7263eca9d02b050cea0ba144b097
F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
F src/sqlite.h.in 4b4c2f2daeeed4412ba9d81bc78092c69831fe6eda4f0ae5bf951da51a8dccec
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 305adca1b5da4a33ce2db5bd236935768e951d5651bfe5560ed55cfcdbce6a63
-F src/sqliteInt.h ce34da1aacca2cd4b63803db697f682af95c02d1e1750f240438b0d96a59bdb8
+F src/sqliteInt.h 10d7835f2a1ae736a468c38a413b754933051fc97255aa2f4ac2df2ad349e863
F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
F src/vacuum.c 36e7d21a20c0bf6ef4ef7c399d192b5239410b7c4d3c1070fba4e30810d0b855
-F src/vdbe.c 80603eb66708c2f27879912a4e9456900e66491c3409ca5e392109114e8f6337
+F src/vdbe.c 7433ac76608b80b745f57b8544416dc0178db52ce2cc806a10353309e5f781fb
F src/vdbe.h 5081dcc497777efe5e9ebe7330d283a044a005e4bdda2e2e984f03bf89a0d907
F src/vdbeInt.h f1f35f70460698d8f5a2bdef1001114babf318e2983a067804e2ae077d8e9827
F src/vdbeapi.c 2ba821c5929a2769e4b217dd85843479c718b8989d414723ec8af0616a83d611
F test/alter4.test 7e93a21fe131e1dfeb317e90056856f96b10381fc7fe3a05e765569a23400433
F test/alterauth.test dc50064e3d57d60cf8708decefed15cfa154242f6d44069858d4c6c9b1aea961
F test/altercol.test 53fb5e218c9296afc160f2c4fcbeaf42bd0604815d9b3896a7d2eec583ad8704
+F test/alterlegacy.test e7c07d605c2a85e7d1696c89e6bf64dfc932fc6d9320fe8708c8f5fc0b524d41
F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
-F test/altermalloc2.test 0231398534c494401a70a1d06a63d7849cb5b317fcc14228cbdb53039eba7eae
+F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
F test/altertab.test 3b830144c18ae00abd2a27e3d2851c8bb1ee8fe655fa16d8a5971066dc71b58a
+F test/altertab2.test 159fd5f7b23ddc841fe678f579f9b1b8e69f44296f3ff75d1b4c155d37a59832
F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
F test/analyze.test b3a9c67d00e1df7588a5b7be9a0292899f94fe8cac1f94a017277474ca2e59df
F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
F tool/mkopcodeh.tcl 352a4319c0ad869eb26442bf7c3b015aa15594c21f1cce5a6420dbe999367c21
F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
-F tool/mkpragmatab.tcl 2144bc8550a6471a029db262a132d2df4b9e0db61b90398bf64f5b7b3f8d92cd
+F tool/mkpragmatab.tcl 8b9b448b5eb7222d4e3f7afb3c678596784180d319eb4e01c842887ed8213b85
F tool/mkshellc.tcl 1f45770aea226ac093a9c72f718efbb88a2a2833409ec2e1c4cecae4202626f5
F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8694c3d565f6f8209e24230765efa476e10048abb69a300b9df5cbaa45824ab8
-Q +5a38d9281b4ad63b853efa5cdd5ad4a64b19dfaf8250ef8e0e186684df1211ea
-R eeb48d42c18c8e67bdcc3851a0756248
+P 3139af9910e484682d37eeac9dca188a73859b3241017bde31bc6cb597b40d3c
+Q +7edd26ed27ed1e7eab603058f7d55f2eac45e7bd1908bfa5f32293611883b157
+R babd6a7c85debca3b8fe29750a063d2a
U drh
-Z ca5171cd2aeb1aca88d661e57a661354
+Z 3378cdc13ab2b15117f1f3887be68031
-3139af9910e484682d37eeac9dca188a73859b3241017bde31bc6cb597b40d3c
\ No newline at end of file
+31dc8b191c3b7921f1e9ac1a07854d2bd9e39bc4a20cf2a70a28c41cdb0d0e95
\ No newline at end of file
goto exit_rename_table;
}
- /* If this is a virtual table, invoke the xRename() function if
- ** one is defined. The xRename() callback will modify the names
- ** of any resources used by the v-table implementation (including other
- ** SQLite tables) that are identified by the name of the virtual table.
- */
-#ifndef SQLITE_OMIT_VIRTUALTABLE
- if( pVTab ){
- int i = ++pParse->nMem;
- sqlite3VdbeLoadString(v, i, zName);
- sqlite3VdbeAddOp4(v, OP_VRename, i, 0, 0,(const char*)pVTab, P4_VTAB);
- sqlite3MayAbort(pParse);
- }
-#endif
-
/* figure out how many UTF-8 characters are in zName */
zTabName = pTab->zName;
nTabName = sqlite3Utf8CharLen(zTabName, -1);
, zDb, zTabName, zName, zTabName, zDb, zName);
}
+ /* If this is a virtual table, invoke the xRename() function if
+ ** one is defined. The xRename() callback will modify the names
+ ** of any resources used by the v-table implementation (including other
+ ** SQLite tables) that are identified by the name of the virtual table.
+ */
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+ if( pVTab ){
+ int i = ++pParse->nMem;
+ sqlite3VdbeLoadString(v, i, zName);
+ sqlite3VdbeAddOp4(v, OP_VRename, i, 0, 0,(const char*)pVTab, P4_VTAB);
+ sqlite3MayAbort(pParse);
+ }
+#endif
+
renameReloadSchema(pParse, iDb);
renameTestSchema(pParse, zDb, iDb==1);
rc = renameParseSql(&sParse, zDb, 1, db, zInput, bTemp);
if( rc==SQLITE_OK ){
+ int isLegacy = (db->flags & SQLITE_LegacyAlter);
if( sParse.pNewTable ){
Table *pTab = sParse.pNewTable;
if( pTab->pSelect ){
- NameContext sNC;
- memset(&sNC, 0, sizeof(sNC));
- sNC.pParse = &sParse;
-
- sqlite3SelectPrep(&sParse, pTab->pSelect, &sNC);
- if( sParse.nErr ) rc = sParse.rc;
- sqlite3WalkSelect(&sWalker, pTab->pSelect);
+ if( isLegacy==0 ){
+ NameContext sNC;
+ memset(&sNC, 0, sizeof(sNC));
+ sNC.pParse = &sParse;
+
+ sqlite3SelectPrep(&sParse, pTab->pSelect, &sNC);
+ if( sParse.nErr ) rc = sParse.rc;
+ sqlite3WalkSelect(&sWalker, pTab->pSelect);
+ }
}else{
/* Modify any FK definitions to point to the new table. */
#ifndef SQLITE_OMIT_FOREIGN_KEY
** "CREATE [VIRTUAL] TABLE" bit. */
if( sqlite3_stricmp(zOld, pTab->zName)==0 ){
sCtx.pTab = pTab;
- sqlite3WalkExprList(&sWalker, pTab->pCheck);
+ if( isLegacy==0 ){
+ sqlite3WalkExprList(&sWalker, pTab->pCheck);
+ }
renameTokenFind(&sParse, &sCtx, pTab->zName);
}
}
else if( sParse.pNewIndex ){
renameTokenFind(&sParse, &sCtx, sParse.pNewIndex->zName);
- sqlite3WalkExpr(&sWalker, sParse.pNewIndex->pPartIdxWhere);
+ if( isLegacy==0 ){
+ sqlite3WalkExpr(&sWalker, sParse.pNewIndex->pPartIdxWhere);
+ }
}
#ifndef SQLITE_OMIT_TRIGGER
renameTokenFind(&sParse, &sCtx, sParse.pNewTrigger->table);
}
- 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);
+ if( isLegacy==0 ){
+ 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);
+ }
}
}
}
char const *zDb = (const char*)sqlite3_value_text(argv[0]);
char const *zInput = (const char*)sqlite3_value_text(argv[1]);
int bTemp = sqlite3_value_int(argv[4]);
+ int isLegacy = (db->flags & SQLITE_LegacyAlter);
#ifndef SQLITE_OMIT_AUTHORIZATION
sqlite3_xauth xAuth = db->xAuth;
Parse sParse;
rc = renameParseSql(&sParse, zDb, 1, db, zInput, bTemp);
if( rc==SQLITE_OK ){
- if( sParse.pNewTable && sParse.pNewTable->pSelect ){
+ if( isLegacy==0 && sParse.pNewTable && sParse.pNewTable->pSelect ){
NameContext sNC;
memset(&sNC, 0, sizeof(sNC));
sNC.pParse = &sParse;
}
else if( sParse.pNewTrigger ){
- rc = renameResolveTrigger(&sParse, bTemp ? 0 : zDb);
+ if( isLegacy==0 ){
+ rc = renameResolveTrigger(&sParse, bTemp ? 0 : zDb);
+ }
if( rc==SQLITE_OK ){
int i1 = sqlite3SchemaToIndex(db, sParse.pNewTrigger->pTabSchema);
int i2 = sqlite3FindDbName(db, zDb);
/* iArg: */ 0 },
#endif
#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+ {/* zName: */ "legacy_alter_table",
+ /* ePragTyp: */ PragTyp_FLAG,
+ /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1,
+ /* ColNames: */ 0, 0,
+ /* iArg: */ SQLITE_LegacyAlter },
{/* zName: */ "legacy_file_format",
/* ePragTyp: */ PragTyp_FLAG,
/* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1,
/* iArg: */ SQLITE_WriteSchema },
#endif
};
-/* Number of pragmas: 60 on by default, 77 total. */
+/* Number of pragmas: 61 on by default, 78 total. */
#define SQLITE_EnableQPSG 0x00800000 /* Query Planner Stability Guarantee*/
#define SQLITE_TriggerEQP 0x01000000 /* Show trigger EXPLAIN QUERY PLAN */
#define SQLITE_ResetDatabase 0x02000000 /* Reset the database */
+#define SQLITE_LegacyAlter 0x04000000 /* Legacy ALTER TABLE behaviour */
/* Flags used only if debugging */
#ifdef SQLITE_DEBUG
case OP_VRename: {
sqlite3_vtab *pVtab;
Mem *pName;
-
+ int isLegacy;
+
+ isLegacy = (db->flags & SQLITE_LegacyAlter);
+ db->flags |= SQLITE_LegacyAlter;
pVtab = pOp->p4.pVtab->pVtab;
pName = &aMem[pOp->p1];
assert( pVtab->pModule->xRename );
rc = sqlite3VdbeChangeEncoding(pName, SQLITE_UTF8);
if( rc ) goto abort_due_to_error;
rc = pVtab->pModule->xRename(pVtab, pName->z);
+ if( isLegacy==0 ) db->flags &= ~SQLITE_LegacyAlter;
sqlite3VtabImportErrmsg(p, pVtab);
p->expired = 0;
if( rc ) goto abort_due_to_error;
--- /dev/null
+# 2018 September 20
+#
+# The author disclaims copyright to this source code. In place of
+# a legal notice, here is a blessing:
+#
+# May you do good and not evil.
+# May you find forgiveness for yourself and forgive others.
+# May you share freely, never taking more than you give.
+#
+#*************************************************************************
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix alterlegacy
+
+# If SQLITE_OMIT_ALTERTABLE is defined, omit this file.
+ifcapable !altertable {
+ finish_test
+ return
+}
+
+do_execsql_test 1.0 {
+ PRAGMA legacy_alter_table = 1;
+ CREATE TABLE t1(a, b, CHECK(t1.a != t1.b));
+ CREATE TABLE t2(a, b);
+ CREATE INDEX t2expr ON t2(a) WHERE t2.b>0;
+}
+
+do_execsql_test 1.1 {
+ SELECT sql FROM sqlite_master
+} {
+ {CREATE TABLE t1(a, b, CHECK(t1.a != t1.b))}
+ {CREATE TABLE t2(a, b)}
+ {CREATE INDEX t2expr ON t2(a) WHERE t2.b>0}
+}
+
+# Legacy behavior is to corrupt the schema in this case, as the table name in
+# the CHECK constraint is incorrect after "t1" is renamed. This version is
+# slightly different - it rejects the change and rolls back the transaction.
+do_catchsql_test 1.2 {
+ ALTER TABLE t1 RENAME TO t1new;
+} {1 {no such column: t1.a}}
+
+do_execsql_test 1.3 {
+ CREATE TABLE t3(c, d);
+ ALTER TABLE t3 RENAME TO t3new;
+ DROP TABLE t3new;
+}
+
+do_execsql_test 1.4 {
+ SELECT sql FROM sqlite_master
+} {
+ {CREATE TABLE t1(a, b, CHECK(t1.a != t1.b))}
+ {CREATE TABLE t2(a, b)}
+ {CREATE INDEX t2expr ON t2(a) WHERE t2.b>0}
+}
+
+
+do_catchsql_test 1.3 {
+ ALTER TABLE t2 RENAME TO t2new;
+} {1 {no such column: t2.b}}
+do_execsql_test 1.4 {
+ SELECT sql FROM sqlite_master
+} {
+ {CREATE TABLE t1(a, b, CHECK(t1.a != t1.b))}
+ {CREATE TABLE t2(a, b)}
+ {CREATE INDEX t2expr ON t2(a) WHERE t2.b>0}
+}
+
+
+#-------------------------------------------------------------------------
+reset_db
+ifcapable vtab {
+ register_echo_module db
+
+ do_execsql_test 2.0 {
+ PRAGMA legacy_alter_table = 1;
+ CREATE TABLE abc(a, b, c);
+ INSERT INTO abc VALUES(1, 2, 3);
+ CREATE VIRTUAL TABLE eee USING echo('abc');
+ SELECT * FROM eee;
+ } {1 2 3}
+
+ do_execsql_test 2.1 {
+ ALTER TABLE eee RENAME TO fff;
+ SELECT * FROM fff;
+ } {1 2 3}
+
+ db close
+ sqlite3 db test.db
+
+ do_catchsql_test 2.2 {
+ ALTER TABLE fff RENAME TO ggg;
+ } {1 {no such module: echo}}
+}
+
+#-------------------------------------------------------------------------
+reset_db
+
+do_execsql_test 3.0 {
+ PRAGMA legacy_alter_table = 1;
+ CREATE TABLE txx(a, b, c);
+ INSERT INTO txx VALUES(1, 2, 3);
+ CREATE VIEW vvv AS SELECT main.txx.a, txx.b, c FROM txx;
+ CREATE VIEW uuu AS SELECT main.one.a, one.b, c FROM txx AS one;
+ CREATE VIEW temp.ttt AS SELECT main.txx.a, txx.b, one.b, main.one.a FROM txx AS one, txx;
+}
+
+do_execsql_test 3.1.1 {
+ SELECT * FROM vvv;
+} {1 2 3}
+do_execsql_test 3.1.2a {
+ ALTER TABLE txx RENAME TO "t xx";
+}
+do_catchsql_test 3.1.2b {
+ SELECT * FROM vvv;
+} {1 {no such table: main.txx}}
+do_execsql_test 3.1.3 {
+ SELECT sql FROM sqlite_master WHERE name='vvv';
+} {{CREATE VIEW vvv AS SELECT main.txx.a, txx.b, c FROM txx}}
+
+
+do_catchsql_test 3.2.1 {
+ SELECT * FROM uuu;
+} {1 {no such table: main.txx}}
+do_execsql_test 3.2.2 {
+ SELECT sql FROM sqlite_master WHERE name='uuu';;
+} {{CREATE VIEW uuu AS SELECT main.one.a, one.b, c FROM txx AS one}}
+
+do_catchsql_test 3.3.1 {
+ SELECT * FROM ttt;
+} {1 {no such table: txx}}
+do_execsql_test 3.3.2 {
+ SELECT sql FROM sqlite_temp_master WHERE name='ttt';
+} {{CREATE VIEW ttt AS SELECT main.txx.a, txx.b, one.b, main.one.a FROM txx AS one, txx}}
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 4.0 {
+ PRAGMA legacy_alter_table = 1;
+ CREATE table t1(x, y);
+ CREATE table t2(a, b);
+
+ CREATE TRIGGER tr1 AFTER INSERT ON t1 BEGIN
+ SELECT t1.x, * FROM t1, t2;
+ INSERT INTO t2 VALUES(new.x, new.y);
+ END;
+}
+
+do_execsql_test 4.1 {
+ INSERT INTO t1 VALUES(1, 1);
+ ALTER TABLE t1 RENAME TO t11;
+}
+do_catchsql_test 4.1a {
+ INSERT INTO t11 VALUES(2, 2);
+} {1 {no such table: main.t1}}
+do_execsql_test 4.1b {
+ ALTER TABLE t11 RENAME TO t1;
+ ALTER TABLE t2 RENAME TO t22;
+}
+do_catchsql_test 4.1c {
+ INSERT INTO t1 VALUES(3, 3);
+} {1 {no such table: main.t2}}
+
+proc squish {a} {
+ string trim [regsub -all {[[:space:]][[:space:]]*} $a { }]
+}
+db func squish squish
+do_test 4.2 {
+ execsql { SELECT squish(sql) FROM sqlite_master WHERE name = 'tr1' }
+} [list [squish {
+ CREATE TRIGGER tr1 AFTER INSERT ON "t1" BEGIN
+ SELECT t1.x, * FROM t1, t2;
+ INSERT INTO t2 VALUES(new.x, new.y);
+ END
+}]]
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 5.0 {
+ PRAGMA legacy_alter_table = 1;
+ 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'
+}
+
+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_execsql_test 5.3 {
+ ALTER TABLE t2 RENAME TO one;
+} {}
+
+do_catchsql_test 5.4 {
+ SELECT * FROM v
+} {1 {no such table: main.t2}}
+
+do_execsql_test 5.5 {
+ ALTER TABLE one RENAME TO t2;
+ 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_execsql_test 5.6 {
+ ALTER TABLE t2 RENAME TO one;
+} {}
+do_catchsql_test 5.7 {
+ SELECT * FROM vv
+} {1 {no such table: t2}}
+
+#-------------------------------------------------------------------------
+
+ifcapable vtab {
+ register_tcl_module db
+ proc tcl_command {method args} {
+ switch -- $method {
+ xConnect {
+ return "CREATE TABLE t1(a, b, c)"
+ }
+ }
+ return {}
+ }
+
+ do_execsql_test 6.0 {
+ CREATE VIRTUAL TABLE x1 USING tcl(tcl_command);
+ }
+
+ do_execsql_test 6.1 {
+ ALTER TABLE x1 RENAME TO x2;
+ SELECT sql FROM sqlite_master WHERE name = 'x2'
+ } {{CREATE VIRTUAL TABLE "x2" USING tcl(tcl_command)}}
+
+ do_execsql_test 7.1 {
+ CREATE TABLE ddd(db, sql, zOld, zNew, bTemp);
+ INSERT INTO ddd VALUES(
+ 'main', 'CREATE TABLE x1(i INTEGER, t TEXT)', 'ddd', NULL, 0
+ ), (
+ 'main', 'CREATE TABLE x1(i INTEGER, t TEXT)', NULL, 'eee', 0
+ ), (
+ 'main', NULL, 'ddd', 'eee', 0
+ );
+ } {}
+}
+
+#-------------------------------------------------------------------------
+#
+reset_db
+forcedelete test.db2
+do_execsql_test 8.1 {
+ PRAGMA legacy_alter_table = 1;
+ ATTACH 'test.db2' AS aux;
+ PRAGMA foreign_keys = on;
+ CREATE TABLE aux.p1(a INTEGER PRIMARY KEY, b);
+ CREATE TABLE aux.c1(x INTEGER PRIMARY KEY, y REFERENCES p1(a));
+ INSERT INTO aux.p1 VALUES(1, 1);
+ INSERT INTO aux.p1 VALUES(2, 2);
+ INSERT INTO aux.c1 VALUES(NULL, 2);
+ CREATE TABLE aux.c2(x INTEGER PRIMARY KEY, y REFERENCES c1(a));
+}
+
+do_execsql_test 8.2 {
+ ALTER TABLE aux.p1 RENAME TO ppp;
+}
+
+do_execsql_test 8.2 {
+ INSERT INTO aux.c1 VALUES(NULL, 1);
+ SELECT sql FROM aux.sqlite_master WHERE name = 'c1';
+} {{CREATE TABLE c1(x INTEGER PRIMARY KEY, y REFERENCES "ppp"(a))}}
+
+reset_db
+do_execsql_test 9.0 {
+ PRAGMA legacy_alter_table = 1;
+ CREATE TABLE t1(a, b, c);
+ CREATE VIEW v1 AS SELECT * FROM t2;
+}
+do_execsql_test 9.1 {
+ ALTER TABLE t1 RENAME TO t3;
+} {}
+do_execsql_test 9.1b {
+ ALTER TABLE t3 RENAME TO t1;
+} {}
+do_execsql_test 9.2 {
+ DROP VIEW v1;
+ CREATE TRIGGER tr AFTER INSERT ON t1 BEGIN
+ INSERT INTO t2 VALUES(new.a);
+ END;
+}
+do_execsql_test 9.3 {
+ ALTER TABLE t1 RENAME TO t3;
+} {}
+
+forcedelete test.db2
+do_execsql_test 9.4 {
+ ALTER TABLE t3 RENAME TO t1;
+ DROP TRIGGER tr;
+
+ ATTACH 'test.db2' AS aux;
+ CREATE TRIGGER tr AFTER INSERT ON t1 WHEN new.a IS NULL BEGIN SELECT 1, 2, 3; END;
+
+ CREATE TABLE aux.t1(x);
+ CREATE TEMP TRIGGER tr AFTER INSERT ON aux.t1 BEGIN SELECT 1, 2, 3; END;
+}
+do_execsql_test 9.5 {
+ ALTER TABLE main.t1 RENAME TO t3;
+}
+do_execsql_test 9.6 {
+ SELECT sql FROM sqlite_temp_master;
+ SELECT sql FROM sqlite_master WHERE type='trigger';
+} {
+ {CREATE TRIGGER tr AFTER INSERT ON aux.t1 BEGIN SELECT 1, 2, 3; END}
+ {CREATE TRIGGER tr AFTER INSERT ON "t3" WHEN new.a IS NULL BEGIN SELECT 1, 2, 3; END}
+}
+
+#-------------------------------------------------------------------------
+reset_db
+ifcapable fts5 {
+ do_execsql_test 10.0 {
+ PRAGMA legacy_alter_table = 1;
+ CREATE VIRTUAL TABLE fff USING fts5(x, y, z);
+ }
+
+ do_execsql_test 10.1 {
+ BEGIN;
+ INSERT INTO fff VALUES('a', 'b', 'c');
+ ALTER TABLE fff RENAME TO ggg;
+ COMMIT;
+ }
+
+ do_execsql_test 10.2 {
+ SELECT * FROM ggg;
+ } {a b c}
+}
+
+#-------------------------------------------------------------------------
+reset_db
+forcedelete test.db2
+db func trigger trigger
+set ::trigger [list]
+proc trigger {args} {
+ lappend ::trigger $args
+}
+do_execsql_test 11.0 {
+ PRAGMA legacy_alter_table = 1;
+ ATTACH 'test.db2' AS aux;
+ CREATE TABLE aux.t1(a, b, c);
+ CREATE TABLE main.t1(a, b, c);
+ CREATE TEMP TRIGGER tr AFTER INSERT ON aux.t1 BEGIN
+ SELECT trigger(new.a, new.b, new.c);
+ END;
+}
+
+do_execsql_test 11.1 {
+ INSERT INTO main.t1 VALUES(1, 2, 3);
+ INSERT INTO aux.t1 VALUES(4, 5, 6);
+}
+do_test 11.2 { set ::trigger } {{4 5 6}}
+
+do_execsql_test 11.3 {
+ SELECT name, tbl_name FROM sqlite_temp_master;
+} {tr t1}
+
+do_execsql_test 11.4 {
+ ALTER TABLE main.t1 RENAME TO t2;
+ SELECT name, tbl_name FROM sqlite_temp_master;
+} {tr t1}
+
+do_execsql_test 11.5 {
+ ALTER TABLE aux.t1 RENAME TO t2;
+ SELECT name, tbl_name FROM sqlite_temp_master;
+} {tr t2}
+
+do_execsql_test 11.6 {
+ INSERT INTO aux.t2 VALUES(7, 8, 9);
+}
+do_test 11.7 { set ::trigger } {{4 5 6} {7 8 9}}
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 12.0 {
+ PRAGMA legacy_alter_table = 1;
+ CREATE TABLE t1(a);
+ CREATE TABLE t2(w);
+ CREATE TRIGGER temp.r1 AFTER INSERT ON main.t2 BEGIN
+ INSERT INTO t1(a) VALUES(new.w);
+ END;
+ CREATE TEMP TABLE t2(x);
+}
+
+do_execsql_test 12.1 {
+ ALTER TABLE main.t2 RENAME TO t3;
+}
+
+do_execsql_test 12.2 {
+ INSERT INTO t3 VALUES('WWW');
+ SELECT * FROM t1;
+} {WWW}
+
+
+#-------------------------------------------------------------------------
+reset_db
+
+ifcapable rtree {
+ do_execsql_test 14.0 {
+ PRAGMA legacy_alter_table = 1;
+ CREATE VIRTUAL TABLE rt USING rtree(id, minx, maxx, miny, maxy);
+
+ CREATE TABLE "mytable" ( "fid" INTEGER PRIMARY KEY, "geom" BLOB);
+
+ CREATE TRIGGER tr1 AFTER UPDATE OF "geom" ON "mytable"
+ WHEN OLD."fid" = NEW."fid" AND NEW."geom" IS NULL BEGIN
+ DELETE FROM rt WHERE id = OLD."fid";
+ END;
+
+ INSERT INTO mytable VALUES(1, X'abcd');
+ }
+
+ do_execsql_test 14.1 {
+ UPDATE mytable SET geom = X'1234'
+ }
+
+ do_execsql_test 14.2 {
+ ALTER TABLE mytable RENAME TO mytable_renamed;
+ }
+
+ do_execsql_test 14.3 {
+ CREATE TRIGGER tr2 AFTER INSERT ON mytable_renamed BEGIN
+ DELETE FROM rt WHERE id=(SELECT min(id) FROM rt);
+ END;
+ }
+
+ do_execsql_test 14.4 {
+ ALTER TABLE mytable_renamed RENAME TO mytable2;
+ }
+}
+
+reset_db
+do_execsql_test 14.5 {
+ PRAGMA legacy_alter_table = 1;
+ CREATE TABLE t1(a, b, c);
+ CREATE VIEW v1 AS SELECT * FROM t1;
+ CREATE TRIGGER xyz AFTER INSERT ON t1 BEGIN
+ SELECT a, b FROM v1;
+ END;
+}
+do_execsql_test 14.6 {
+ ALTER TABLE t1 RENAME TO tt1;
+}
+
+
+finish_test
+
} -test {
faultsim_test_result {0 {}}
}
+
+reset_db
+do_execsql_test 4.0 {
+ CREATE TABLE rr(a, b);
+ CREATE VIEW vv AS SELECT * FROM rr;
+
+ CREATE TRIGGER vv1 INSTEAD OF INSERT ON vv BEGIN
+ SELECT 1, 2, 3;
+ END;
+ CREATE TRIGGER tr1 AFTER INSERT ON rr BEGIN
+ INSERT INTO vv VALUES(new.a, new.b);
+ END;
+} {}
+
+faultsim_save_and_close
+do_faultsim_test 4 -faults oom-* -prep {
+ faultsim_restore_and_reopen
+ execsql { SELECT * FROM sqlite_master }
+} -body {
+ execsql {
+ ALTER TABLE rr RENAME a TO c;
+ }
+} -test {
+ faultsim_test_result {0 {}}
+}
+
finish_test
--- /dev/null
+# 2018 September 30
+#
+# The author disclaims copyright to this source code. In place of
+# a legal notice, here is a blessing:
+#
+# May you do good and not evil.
+# May you find forgiveness for yourself and forgive others.
+# May you share freely, never taking more than you give.
+#
+#*************************************************************************
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix altertab
+
+# If SQLITE_OMIT_ALTERTABLE is defined, omit this file.
+ifcapable !altertable {
+ finish_test
+ return
+}
+
+ifcapable fts5 {
+ do_execsql_test 1.0 {
+ CREATE TABLE rr(a, b);
+ CREATE VIRTUAL TABLE ff USING fts5(a, b);
+ CREATE TRIGGER tr1 AFTER INSERT ON rr BEGIN
+ INSERT INTO ff VALUES(new.a, new.b);
+ END;
+ INSERT INTO rr VALUES('hello', 'world');
+ SELECT * FROM ff;
+ } {hello world}
+
+ do_execsql_test 1.1 {
+ ALTER TABLE ff RENAME TO ffff;
+ }
+
+ do_execsql_test 1.2 {
+ INSERT INTO rr VALUES('in', 'tcl');
+ SELECT * FROM ffff;
+ } {hello world in tcl}
+}
+
+
+finish_test
+
NAME: optimize
FLAG: Result1 NeedSchema
+
+ NAME: legacy_alter_table
+ TYPE: FLAG
+ ARG: SQLITE_LegacyAlter
+ IF: !defined(SQLITE_OMIT_FLAG_PRAGMAS)
}
# Open the output file
projects / thirdparty / sqlite.git / commitdiff
