Have this branch call sqlite3LockAndPrepare() instead of sqlite3Prepare() when parsin...

FossilOrigin-Name: 7a4ec57985fc5d980048bb7f1677452fb8cc4825cff8956760a1747b81b648bb

diff --git a/manifest b/manifest
index 48d9559124b43825d1d6b00199d2ec5f8ee122a6..1cbfdc504157aa68c51f9d80cf13763fc9ca6dea 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sassert_schema_state_ok()\sroutine\sso\sthat\sit\scorrectly\signores\nATTACH-ed\sdatabase\sthat\sfailed\sto\sopen\sdue\sto\san\serror.
-D 2020-01-15T17:18:34.986
+C Have\sthis\sbranch\scall\ssqlite3LockAndPrepare()\sinstead\sof\ssqlite3Prepare()\swhen\sparsing\sSQL\sfor\snew\sschema\sobjects\sin\sorder\sto\sensure\sthat\sschemas\sare\sreleased\sas\ssoon\sas\spossible.
+D 2020-01-18T18:59:15.834
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -527,7 +527,7 @@ F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
 F src/pragma.c 21e7a213702f29fe652e7b856b3bde55070c889957b5c04da68985b1eaa5f39d
 F src/pragma.h 3b8fc00c101f379352e1c733ce9c5180ac6826575d0cca118c6e70fd20664d02
-F src/prepare.c 3078898f6883b7f0e656428fddfc55aabde531fab390f35a7224938af5a6a75f
+F src/prepare.c 9e8f3d609602eb51b8224fca3dc9a0d30392937cec147955ca5e11c6cc5f65ef
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 1139e3157c710c6e6f04fe726f4e0d8bdb1ae89a276d3b0ca4975af163141c9c
@@ -1867,7 +1867,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 f783917800a5ce7c4bb31725b26d266cd4f133a0cc8414c6bf4789a8cd1e45c8
-R 1bde647fe757f77de20e17786fe10a5d
-U drh
-Z 30567749446507a8d59fb6fb0f28e948
+P 1194a42add4119715347bb592feef352e4958d0c669c946d976a42049a712b68
+R 01663a3eb9a498ec25c9650f89f16d04
+U dan
+Z f3c90030fbb7e240c42a213fcdcfd809

diff --git a/manifest.uuid b/manifest.uuid
index ec47bc6b8da85ffef0d51f943a3a31bc9129340e..3fc89859f695d38fa8d84531f917042c541dc244 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1194a42add4119715347bb592feef352e4958d0c669c946d976a42049a712b68
\ No newline at end of file
+7a4ec57985fc5d980048bb7f1677452fb8cc4825cff8956760a1747b81b648bb
\ No newline at end of file

diff --git a/src/prepare.c b/src/prepare.c
index 293a91211df93d9b7fc7724fc71d8e9ec235ee98..87219a382017d8d4771592379569da24e9b7bb65 100644 (file)
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -94,6 +94,15 @@ static int sqlite3Prepare(
   sqlite3_stmt **ppStmt,    /* OUT: A pointer to the prepared statement */
   const char **pzTail       /* OUT: End of parsed string */
 );
+static int sqlite3LockAndPrepare(
+  sqlite3 *db,              /* Database handle. */
+  const char *zSql,         /* UTF-8 encoded SQL statement. */
+  int nBytes,               /* Length of zSql in bytes. */
+  u32 prepFlags,            /* Zero or more SQLITE_PREPARE_* flags */
+  Vdbe *pReprepare,         /* VM being reprepared */
+  sqlite3_stmt **ppStmt,    /* OUT: A pointer to the prepared statement */
+  const char **pzTail       /* OUT: End of parsed string */
+);
 
 
 /*
@@ -146,7 +155,11 @@ int sqlite3InitCallback(void *pInit, int argc, char **argv, char **NotUsed){
     db->init.orphanTrigger = 0;
     db->init.azInit = argv;
     pStmt = 0;
+#ifdef SQLITE_ENABLE_SHARED_SCHEMA
+    TESTONLY(rcp = ) sqlite3LockAndPrepare(db, argv[4], -1, 0, 0, &pStmt, 0);
+#else
     TESTONLY(rcp = ) sqlite3Prepare(db, argv[4], -1, 0, 0, &pStmt, 0);
+#endif
     rc = db->errCode;
     assert( (rc&0xFF)==(rcp&0xFF) );
     db->init.iDb = saved_iDb;