From: danielk1977 <danielk1977@noemail.net>
Date: Thu, 4 Oct 2007 18:11:15 +0000 (+0000)
Subject: Fixes for OMIT_AUTHORIZATION builds. #2691. (CVS 4466)
X-Git-Tag: version-3.5.2~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5258c3db37bcab5962ccf68245c188d4592613b;p=thirdparty%2Fsqlite.git

Fixes for OMIT_AUTHORIZATION builds. #2691. (CVS 4466)

FossilOrigin-Name: 755fcaf7e355042d88fed6b9b49669300b010695
---

diff --git a/manifest b/manifest
index 89ee046a43..a041752e81 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.5.1\s(CVS\s4465)
-D 2007-10-04T00:30:53
+C Fixes\sfor\sOMIT_AUTHORIZATION\sbuilds.\s#2691.\s(CVS\s4466)
+D 2007-10-04T18:11:16
 F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -84,7 +84,7 @@ F src/btmutex.c 442be6f068d77ca9ffd69899cf0a3943c244548c
 F src/btree.c a491c45b4412e6f19458e122bafa0cca8f22d224
 F src/btree.h d0736ebca4b6eafbdd823c46a8de574cea078211
 F src/btreeInt.h 4330c19b8314545fdb209cc77e2a57f6a5290e9c
-F src/build.c 94d0d6dfd1e706c480903fbdda2e77466f21b898
+F src/build.c fec792576c6e64200259ae5c0f7ee34a6c1abbae
 F src/callback.c 77b302b0d41468dcda78c70e706e5b84577f0fa0
 F src/complete.c 4cf68fd75d60257524cbe74f87351b9848399131
 F src/date.c 49c5a6d2de6c12000905b4d36868b07d3011bbf6
@@ -132,7 +132,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 82089379833e361ba8a2ae65316a2173785300c0
 F src/sqlite.h.in 0b8875192b9cea40cf4a5d1dfda2d0172a0bd4c4
 F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb
-F src/sqliteInt.h 9092213f1ff14cd7edee8d0649d8a193dbbad4b2
+F src/sqliteInt.h 3fa9f4e9d2f07e162509f75d827d32f41fcd4f30
 F src/sqliteLimit.h 1bcbbdfa856f8b71b561abb31edb864b0eca1d12
 F src/table.c 1aeb9eab57b4235db86fe15a35dec76fb445a9c4
 F src/tclsqlite.c 9659ec914abfdb35e184eee908d07eba11a39018
@@ -581,7 +581,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 837fc86166bfc789a53de1853043044f5e8ae3ac
-R f8bfaa703e1e463c9d733910321c4533
-U drh
-Z e9ffee3d744279b2211a56e91fc33742
+P 81cf518646b277b08e04079c67053450a259542b
+R 31dfbe867d981c04386bb89c8b5d2aa3
+U danielk1977
+Z b6b461fcc376266e5d3af087856eaf2e
diff --git a/manifest.uuid b/manifest.uuid
index 5fa1d7f43f..9c003aa79b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-81cf518646b277b08e04079c67053450a259542b
\ No newline at end of file
+755fcaf7e355042d88fed6b9b49669300b010695
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index f46d28ee1e..fe94663b6c 100644
--- a/src/build.c
+++ b/src/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.444 2007/09/03 15:19:35 drh Exp $
+** $Id: build.c,v 1.445 2007/10/04 18:11:16 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1912,6 +1912,13 @@ void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, int noErr){
   }
   iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
   assert( iDb>=0 && iDb<db->nDb );
+
+  /* If pTab is a virtual table, call ViewGetColumnNames() to ensure
+  ** it is initialized.
+  */
+  if( IsVirtual(pTab) && sqlite3ViewGetColumnNames(pParse, pTab) ){
+    goto exit_drop_table;
+  }
 #ifndef SQLITE_OMIT_AUTHORIZATION
   {
     int code;
@@ -1929,9 +1936,6 @@ void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, int noErr){
       }
 #ifndef SQLITE_OMIT_VIRTUALTABLE
     }else if( IsVirtual(pTab) ){
-      if( sqlite3ViewGetColumnNames(pParse, pTab) ){
-        goto exit_drop_table;
-      }
       code = SQLITE_DROP_VTABLE;
       zArg2 = pTab->pMod->zName;
 #endif
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 2170e53912..8b85beac6b 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.613 2007/10/03 08:46:45 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.614 2007/10/04 18:11:16 danielk1977 Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1765,7 +1765,7 @@ void sqlite3DeferForeignKey(Parse*, int);
   void sqlite3AuthContextPush(Parse*, AuthContext*, const char*);
   void sqlite3AuthContextPop(AuthContext*);
 #else
-# define sqlite3AuthRead(a,b,c)
+# define sqlite3AuthRead(a,b,c,d)
 # define sqlite3AuthCheck(a,b,c,d,e)    SQLITE_OK
 # define sqlite3AuthContextPush(a,b,c)
 # define sqlite3AuthContextPop(a)  ((void)(a))