From: drh Date: Thu, 3 Apr 2014 00:32:13 +0000 (+0000) Subject: In the command-line shell, run set writable_schema before running the X-Git-Tag: version-3.8.5~87 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54d0d2dd9a5898ac33363877b0aba360a81d1d5e;p=thirdparty%2Fsqlite.git In the command-line shell, run set writable_schema before running the ".clone" command. FossilOrigin-Name: 9d2ae6342c8afa904bec591ebe134ff7f536b71c --- diff --git a/manifest b/manifest index 887bb92f5b..8f224e8e55 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\sa\s(harmless)\sbuffer\soverread\sthat\sis\spossible\son\san\sOOM\swhen\nMEMSYS5\sis\sengaged. -D 2014-03-31T13:42:42.977 +C In\sthe\scommand-line\sshell,\srun\sset\swritable_schema\sbefore\srunning\sthe\n".clone"\scommand. +D 2014-04-03T00:32:13.777 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -218,7 +218,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/select.c 269c3e31a450fce642a10569221a49180348c88e -F src/shell.c cee9f46f2688a261601b1fd3d7f4b3cddf9b5cdf +F src/shell.c 5260f2ada8dd06e9f5ae0a448c8c01e7a75dd881 F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc @@ -1159,7 +1159,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 27deb6e49bcc76714dbdc61b34748603155ac770 -R 74e3f11f049d7792447568e00e413b7f +P b3296267fb67b9f59719a37093253062edde3746 +R 3857796e3bb74e57525267a0574c950a U drh -Z 4989508149fff1b415b46911a02fce9e +Z e5eef1fbe323934e85f2b63b760c4a7b diff --git a/manifest.uuid b/manifest.uuid index 70f95ac337..e11bac748d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b3296267fb67b9f59719a37093253062edde3746 \ No newline at end of file +9d2ae6342c8afa904bec591ebe134ff7f536b71c \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index 1313112709..f380962a86 100644 --- a/src/shell.c +++ b/src/shell.c @@ -2130,10 +2130,12 @@ static void tryToClone(struct callback_data *p, const char *zNewDb){ fprintf(stderr, "Cannot create output database: %s\n", sqlite3_errmsg(newDb)); }else{ + sqlite3_exec(p->db, "PRAGMA writable_schema=ON;", 0, 0, 0); sqlite3_exec(newDb, "BEGIN EXCLUSIVE;", 0, 0, 0); tryToCloneSchema(p, newDb, "type='table'", tryToCloneData); tryToCloneSchema(p, newDb, "type!='table'", 0); sqlite3_exec(newDb, "COMMIT;", 0, 0, 0); + sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0); } sqlite3_close(newDb); }