Rename the internal Schema.flags field to Schema.schemaFlags.

FossilOrigin-Name: 5ae80b3c8f032528359c8c762505ce24da8db96f

diff --git a/manifest b/manifest
index ae65d8580f489ea9891cfc86215242dbff78a484..2e9232ccf33c87f2484915564d71957c4e602761 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\s(newly)\sincorrect\spreprocessor\scheck\sto\sfix\sbuild\son\sWinRT.
-D 2014-08-02T20:44:13.563
+C Rename\sthe\sinternal\sSchema.flags\sfield\sto\sSchema.schemaFlags.
+D 2014-08-05T11:04:21.126
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -167,11 +167,11 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c b5531339cd826af46b9621e4a9323971a9380e12
+F src/btree.c 99d162e57af6e72ffd7db5bf79568a134cd87d5b
 F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
 F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
-F src/build.c c67a915cd5aabda9ac170f2af8ea25434476b66f
-F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
+F src/build.c 5abf794fe8a605f2005b422e98a3cedad9b9ef5b
+F src/callback.c fcff28cf0df2403dd2f313bb8d1b8f31f6f3cd64
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
 F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
@@ -227,7 +227,7 @@ F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
 F src/sqlite.h.in 9bbc5815c73b0e77e68b5275481a5e3e7814a804
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
-F src/sqliteInt.h 5cee19f34f6efe6e6f7733d55a5c59e3a35a378a
+F src/sqliteInt.h 85c03beef501eb79db37f7d963597810aaa581a5
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -1185,7 +1185,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9bc1c730a366e75b760b58e7a343d39165b2a469
-R 8c9bd54f21254a5c39cdbf67a68f6f01
-U mistachkin
-Z a3832f522ef0a90c3ccd915e060c6930
+P ba7826542908eac2e14789d183d0b3e35b143fed
+R 5db7ff3ac4350fd50475a1b030dd8291
+U drh
+Z 42ccecdc76986fb0ef00d15b10cbc956

diff --git a/manifest.uuid b/manifest.uuid
index d8a5cdba49ce07b7c3ac9ded22802caf83e26407..01721976cd871d167b5cc7c8d955383586181fa2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ba7826542908eac2e14789d183d0b3e35b143fed
\ No newline at end of file
+5ae80b3c8f032528359c8c762505ce24da8db96f
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index b72a2ab01d5b0c0e06947dd929a77029811b7efb..17719caf918a7abfdbcb5d0e8c940d4dae0cd721 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -162,7 +162,7 @@ static int hasSharedCacheTableLock(
   ** the correct locks are held.  So do not bother - just return true.
   ** This case does not come up very often anyhow.
   */
-  if( isIndex && (!pSchema || (pSchema->flags&DB_SchemaLoaded)==0) ){
+  if( isIndex && (!pSchema || (pSchema->schemaFlags&DB_SchemaLoaded)==0) ){
     return 1;
   }
 

diff --git a/src/build.c b/src/build.c
index 28205c4c610f741f0dd4c0f5831effa801914e07..a9a8f21793313030562928b47ef722624dc9d066 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -2130,7 +2130,7 @@ int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
       pSelTab->aCol = 0;
       sqlite3DeleteTable(db, pSelTab);
       assert( sqlite3SchemaMutexHeld(db, 0, pTable->pSchema) );
-      pTable->pSchema->flags |= DB_UnresetViews;
+      pTable->pSchema->schemaFlags |= DB_UnresetViews;
     }else{
       pTable->nCol = 0;
       nErr++;

diff --git a/src/callback.c b/src/callback.c
index 260fe806bb48967e2431facfac48a3976c186fb4..46fbe2c21ae5e85db478db6d8068b4280b55ec60 100644 (file)
--- a/src/callback.c
+++ b/src/callback.c
@@ -447,9 +447,9 @@ void sqlite3SchemaClear(void *p){
   sqlite3HashClear(&temp1);
   sqlite3HashClear(&pSchema->fkeyHash);
   pSchema->pSeqTab = 0;
-  if( pSchema->flags & DB_SchemaLoaded ){
+  if( pSchema->schemaFlags & DB_SchemaLoaded ){
     pSchema->iGeneration++;
-    pSchema->flags &= ~DB_SchemaLoaded;
+    pSchema->schemaFlags &= ~DB_SchemaLoaded;
   }
 }
 

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 97fb2d46e465fec5f353b2c70090fbca33278566..ed9f44584df15611c7ecb994a38b42fdd6f65e1a 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -876,7 +876,7 @@ struct Schema {
   Table *pSeqTab;      /* The sqlite_sequence table used by AUTOINCREMENT */
   u8 file_format;      /* Schema format version for this file */
   u8 enc;              /* Text encoding used by this database */
-  u16 flags;           /* Flags associated with this schema */
+  u16 schemaFlags;     /* Flags associated with this schema */
   int cache_size;      /* Number of pages to use in the cache */
 };
 
@@ -884,10 +884,10 @@ struct Schema {
 ** These macros can be used to test, set, or clear bits in the 
 ** Db.pSchema->flags field.
 */
-#define DbHasProperty(D,I,P)     (((D)->aDb[I].pSchema->flags&(P))==(P))
-#define DbHasAnyProperty(D,I,P)  (((D)->aDb[I].pSchema->flags&(P))!=0)
-#define DbSetProperty(D,I,P)     (D)->aDb[I].pSchema->flags|=(P)
-#define DbClearProperty(D,I,P)   (D)->aDb[I].pSchema->flags&=~(P)
+#define DbHasProperty(D,I,P)     (((D)->aDb[I].pSchema->schemaFlags&(P))==(P))
+#define DbHasAnyProperty(D,I,P)  (((D)->aDb[I].pSchema->schemaFlags&(P))!=0)
+#define DbSetProperty(D,I,P)     (D)->aDb[I].pSchema->schemaFlags|=(P)
+#define DbClearProperty(D,I,P)   (D)->aDb[I].pSchema->schemaFlags&=~(P)
 
 /*
 ** Allowed values for the DB.pSchema->flags field.