Fix for sqlite3_table_column_metadata() on REUSE_SCHEMA databases.

FossilOrigin-Name: 53220ad7809954eb4118d9127849efa82787f43898af00c9127cd4998a12c619

diff --git a/manifest b/manifest
index c06a0550a34924e72104cc41680f3e4fdb836575..7b3cde67635c0bbfae462e12245b301b30971337 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\scrashing\safter\sparsing\sa\scorrupt\sschema\swith\sa\sREUSE_SCHEMA\sconnection.
-D 2019-02-13T18:29:49.853
+C Fix\sfor\ssqlite3_table_column_metadata()\son\sREUSE_SCHEMA\sdatabases.
+D 2019-02-13T19:17:30.631
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 56456706c4da271309914c756c9c8ea537685f1c79f8785afa72f968d6810482
@@ -478,7 +478,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 4cf069988908f650bec92fd821a082f6eda87c01191047e49a1a5007af93274c
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c e6f10875d52aca3b7e57ce1ec174aeafc9b6c00b43000cd30d791f9cb490b7a6
-F src/main.c 45866058b9cd1232901b17a76ea81157e87e114facee6686c3bffe696ef35e6a
+F src/main.c c86165813ba7aa00cde67fdca38074f1e26ed338d4980d00d562660658f6b448
 F src/malloc.c 0f9da2a66b230a5785af94b9672126845099b57b70a32c987d04ac28c69da990
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -586,7 +586,7 @@ F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
 F src/util.c 82a2e3f691a3b654be872e305dab1f455e565dedf5e6a90c818c1ab307c00432
 F src/vacuum.c 7dbed4a756f014f3ce54e6ae3c403ee725e8179cf73fc6dd5c064e5627649f9f
-F src/vdbe.c 5f0e3dc94889a4e68497127d0bca320401797c7107035bc0408e6b5e49d6d733
+F src/vdbe.c 361c8525aa3670519a869fcce187880a441eb42fb1f729b4e34abff15bd09e9c
 F src/vdbe.h 323218c4bfd64c719ba85d05fbc87cdd126991cadb39e73ccac7b59f30c3d53e
 F src/vdbeInt.h a76d5eed62c76bcd8de7afd3147fac1bc40c5a870582664bcd7d071ef437c37f
 F src/vdbeapi.c 57a2d794a8833f269b878dbc24e955369bdb379af6c4e93ebc5ce1a20fa3daf4
@@ -1227,7 +1227,7 @@ F test/releasetest.tcl 7712811e0f4e2f198ec786cb2e1352b3793d7395f48a3cceef0572d88
 F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/reuse1.test 5eee2efc7ee559fa9bdd214e35b351d5a949ad466c1671c256fee1f133e7eeea
-F test/reuse2.test 7d9e63de7909711a970b848f1f068d820c0f8e61f12b68ee5ec11a019beba20e
+F test/reuse2.test d9fd3a796db599bbe76554f0f0f635874c7de198205fcd36c4b8261c7b0786a2
 F test/reuse3.test c9cc919586a6005d7ed19cf5ab8eb8c618f35dab5ed5ef8526f37815888c4973
 F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
 F test/rollback2.test bc868d57899dc6972e2b4483faae0e03365a0556941474eec487ae21d8d38bb6
@@ -1808,7 +1808,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 34f0f96f47040df1e305ac9fd4664c5ed4246580e22a00573c73d6528a5725b5
-R d8eb2edb5addad96a4a6091026ccb42a
+P b102148e71c0102eedbf28d9bc8ea8d9bd742eac45ee7f1b08ece60bcdab5036
+R aede17ab79809dac49b20137e1ac0c75
 U dan
-Z 700b51cb945ffefb19ca39cbc0189c26
+Z ec172fa91078d6896dd36c8049445c38

diff --git a/manifest.uuid b/manifest.uuid
index b7bac1769a1635d56f4d5425c260230669bdc225..0fcf48e27ba15c63aea2e36e40e8595c87726694 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b102148e71c0102eedbf28d9bc8ea8d9bd742eac45ee7f1b08ece60bcdab5036
\ No newline at end of file
+53220ad7809954eb4118d9127849efa82787f43898af00c9127cd4998a12c619
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 26530a8ea800b8c9828175d5a1eff6a59c46a337..c8b77f0dbf458f7027f1f84ea3f2401eb5c46d4f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -3604,7 +3604,7 @@ int sqlite3_table_column_metadata(
   int *pPrimaryKey,           /* OUTPUT: True if column part of PK */
   int *pAutoinc               /* OUTPUT: True if column is auto-increment */
 ){
-  int rc;
+  int rc = SQLITE_OK;
   char *zErrMsg = 0;
   Table *pTab = 0;
   Column *pCol = 0;
@@ -3614,6 +3614,7 @@ int sqlite3_table_column_metadata(
   int notnull = 0;
   int primarykey = 0;
   int autoinc = 0;
+  int bUnlock;
 
 
 #ifdef SQLITE_ENABLE_API_ARMOR
@@ -3624,12 +3625,16 @@ int sqlite3_table_column_metadata(
 
   /* Ensure the database schema has been loaded */
   sqlite3_mutex_enter(db->mutex);
+  bUnlock = sqlite3LockReusableSchema(db);
   sqlite3BtreeEnterAll(db);
-  rc = sqlite3Init(db, &zErrMsg);
+  if( IsReuseSchema(db)==0 ){
+    rc = sqlite3Init(db, &zErrMsg);
+  }
   if( SQLITE_OK!=rc ){
     goto error_out;
   }
 
+
   /* Locate the table in question */
   pTab = sqlite3FindTable(db, zTableName, zDbName);
   if( !pTab || pTab->pSelect ){
@@ -3704,6 +3709,7 @@ error_out:
   sqlite3ErrorWithMsg(db, rc, (zErrMsg?"%s":0), zErrMsg);
   sqlite3DbFree(db, zErrMsg);
   rc = sqlite3ApiExit(db, rc);
+  sqlite3UnlockReusableSchema(db, bUnlock);
   sqlite3_mutex_leave(db->mutex);
   return rc;
 }

diff --git a/src/vdbe.c b/src/vdbe.c
index 2f65d708f082d8dce5b0af2792882319ef99a0c1..84631e4207f5a0c051b15f33b86f94961da7042f 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -463,21 +463,12 @@ static SQLITE_NOINLINE int parseSchemaOp(Vdbe *p, VdbeOp *pOp, sqlite3 *db){
     if( zSql==0 ){
       rc = SQLITE_NOMEM_BKPT;
     }else{
-      bRelease = sqlite3LockReusableSchema(db);
-      if( IsReuseSchema(db) ){
-        rc = sqlite3Init(db, &p->zErrMsg);
-        if( rc ){
-          sqlite3UnlockReusableSchema(db, bRelease);
-          return rc;
-        }
-      }
       assert( db->init.busy==0 );
       db->init.busy = 1;
       initData.rc = SQLITE_OK;
       initData.nInitRow = 0;
       assert( !db->mallocFailed );
       rc = sqlite3_exec(db, zSql, sqlite3InitCallback, &initData, 0);
-      sqlite3UnlockReusableSchema(db, bRelease);
       if( rc==SQLITE_OK ) rc = initData.rc;
       if( rc==SQLITE_OK && initData.nInitRow==0 ){
         /* The OP_ParseSchema opcode with a non-NULL P4 argument should parse

diff --git a/test/reuse2.test b/test/reuse2.test
index 54b80da6b89d2b0f8f90765ee75dcf9afbcaed0d..a07f1b2614859b52d3bc2699f1841c03108d7d0c 100644 (file)
--- a/test/reuse2.test
+++ b/test/reuse2.test
@@ -287,6 +287,16 @@ do_execsql_test -db db2 5.1.2 {
   SELECT 'nref=' || nRef, 'nschema=' || nSchema FROM schemapool ORDER BY 1;
 } {nref=6 nschema=1}
 
+do_test 5.2.1 {
+  sqlite3_table_column_metadata db2 main bbb a
+} {INTEGER BINARY 0 1 0}
+do_test 5.2.2 {
+  sqlite3_table_column_metadata db2 main bbb b
+} {{} BINARY 0 0 0}
+
+do_execsql_test -db db2 5.2.3 {
+  SELECT 'nref=' || nRef, 'nschema=' || nSchema FROM schemapool ORDER BY 1;
+} {nref=6 nschema=1}
 
 finish_test