motion-yapper 0.0.1 → 0.0.2

data/vendor/Pods/YapDatabase/YapDatabase/YapDatabaseConnection.h

@@ -29,12 +29,14 @@
  * But for conncurrent access between multiple threads you must use multiple connections.
 **/
 
-typedef enum  {
-	YapDatabaseConnectionFlushMemoryLevelNone     = 0,
-	YapDatabaseConnectionFlushMemoryLevelMild     = 1,
-	YapDatabaseConnectionFlushMemoryLevelModerate = 2,
-	YapDatabaseConnectionFlushMemoryLevelFull     = 3,
-} YapDatabaseConnectionFlushMemoryLevel;
+enum  {
+	YapDatabaseConnectionFlushMemoryFlags_None       = 0,
+	YapDatabaseConnectionFlushMemoryFlags_Caches     = 1 << 0,
+	YapDatabaseConnectionFlushMemoryFlags_Statements = 1 << 1,
+	YapDatabaseConnectionFlushMemoryFlags_All        = (YapDatabaseConnectionFlushMemoryFlags_Caches |
+	                                                    YapDatabaseConnectionFlushMemoryFlags_Statements),
+};
+typedef int YapDatabaseConnectionFlushMemoryFlags;
 
 typedef enum {
 	YapDatabasePolicyContainment = 0,
@@ -418,30 +420,30 @@ typedef enum {
  * Depending upon how often you use the database connection,
  * you may want to be more or less aggressive on how much stuff you flush.
  *
- * YapDatabaseConnectionFlushMemoryLevelNone (0):
- *     No-op. Doesn't flush any caches or anything from internal memory.
+ * YapDatabaseConnectionFlushMemoryFlags_None:
+ *     No-op. Doesn't flush anything.
  * 
- * YapDatabaseConnectionFlushMemoryLevelMild (1):
- *     Flushes the object cache and metadata cache.
+ * YapDatabaseConnectionFlushMemoryFlags_Caches:
+ *     Flushes all caches, including the object cache and metadata cache.
  * 
- * YapDatabaseConnectionFlushMemoryLevelModerate (2):
- *     Mild plus drops less common pre-compiled sqlite statements.
+ * YapDatabaseConnectionFlushMemoryFlags_Statements:
+ *     Flushes all pre-compiled sqlite statements.
  * 
- * YapDatabaseConnectionFlushMemoryLevelFull (3):
- *     Full flush of all caches and removes all pre-compiled sqlite statements.
+ * YapDatabaseConnectionFlushMemoryFlags_All:
+ *     Full flush of all caches and  pre-compiled sqlite statements.
 **/
-- (void)flushMemoryWithLevel:(int)level;
+- (void)flushMemoryWithFlags:(YapDatabaseConnectionFlushMemoryFlags)flags;
 
 #if TARGET_OS_IPHONE
 /**
  * When a UIApplicationDidReceiveMemoryWarningNotification is received,
- * the code automatically invokes flushMemoryWithLevel and passes this set level.
+ * the code automatically invokes flushMemoryWithFlags and passes the set flags.
  * 
- * The default value is YapDatabaseConnectionFlushMemoryLevelMild.
+ * The default value is YapDatabaseConnectionFlushMemoryFlags_All.
  * 
- * @see flushMemoryWithLevel:
+ * @see flushMemoryWithFlags:
 **/
-@property (atomic, assign, readwrite) int autoFlushMemoryLevel;
+@property (atomic, assign, readwrite) YapDatabaseConnectionFlushMemoryFlags autoFlushMemoryFlags;
 #endif
 
 @end

data/vendor/Pods/YapDatabase/YapDatabase/YapDatabaseConnection.m

@@ -29,6 +29,8 @@
   static const int ydbLogLevel = YDB_LOG_LEVEL_WARN;
 #endif
 
+#define UNLIMITED_CACHE_LIMIT          0
+#define MIN_KEY_CACHE_LIMIT          500
 #define DEFAULT_OBJECT_CACHE_LIMIT   250
 #define DEFAULT_METADATA_CACHE_LIMIT 500
 
@@ -42,6 +44,7 @@
 	
 	sqlite3_stmt *yapGetDataForKeyStatement;   // Against "yap" database, for internal use
 	sqlite3_stmt *yapSetDataForKeyStatement;   // Against "yap" database, for internal use
+	sqlite3_stmt *yapRemoveForKeyStatement;    // Against "yap" database, for internal use
 	sqlite3_stmt *yapRemoveExtensionStatement; // Against "yap" database, for internal use
 	
 	sqlite3_stmt *getCollectionCountStatement;
@@ -50,15 +53,15 @@
 	sqlite3_stmt *getCountForRowidStatement;
 	sqlite3_stmt *getRowidForKeyStatement;
 	sqlite3_stmt *getKeyForRowidStatement;
-	sqlite3_stmt *getKeyDataForRowidStatement;
-	sqlite3_stmt *getKeyMetadataForRowidStatement;
 	sqlite3_stmt *getDataForRowidStatement;
+	sqlite3_stmt *getMetadataForRowidStatement;
 	sqlite3_stmt *getAllForRowidStatement;
 	sqlite3_stmt *getDataForKeyStatement;
 	sqlite3_stmt *getMetadataForKeyStatement;
 	sqlite3_stmt *getAllForKeyStatement;
 	sqlite3_stmt *insertForRowidStatement;
 	sqlite3_stmt *updateAllForRowidStatement;
+	sqlite3_stmt *updateObjectForRowidStatement;
 	sqlite3_stmt *updateMetadataForRowidStatement;
 	sqlite3_stmt *removeForRowidStatement;
 	sqlite3_stmt *removeCollectionStatement;
@@ -123,21 +126,41 @@
 		
 		YapDatabaseDefaults *defaults = [database defaults];
 		
+		NSUInteger keyCacheLimit = MIN_KEY_CACHE_LIMIT;
+		
 		if (defaults.objectCacheEnabled)
 		{
 			objectCacheLimit = defaults.objectCacheLimit;
 			objectCache = [[YapCache alloc] initWithKeyClass:[YapCollectionKey class]];
 			objectCache.countLimit = objectCacheLimit;
+			
+			if (keyCacheLimit != UNLIMITED_CACHE_LIMIT)
+			{
+				if (objectCacheLimit == UNLIMITED_CACHE_LIMIT)
+					keyCacheLimit = UNLIMITED_CACHE_LIMIT;
+				else
+					keyCacheLimit = MAX(keyCacheLimit, objectCacheLimit);
+			}
 		}
 		if (defaults.metadataCacheEnabled)
 		{
 			metadataCacheLimit = defaults.metadataCacheLimit;
 			metadataCache = [[YapCache alloc] initWithKeyClass:[YapCollectionKey class]];
 			metadataCache.countLimit = metadataCacheLimit;
+			
+			if (keyCacheLimit != UNLIMITED_CACHE_LIMIT)
+			{
+				if (metadataCacheLimit == UNLIMITED_CACHE_LIMIT)
+					keyCacheLimit = UNLIMITED_CACHE_LIMIT;
+				else
+					keyCacheLimit = MAX(keyCacheLimit, objectCacheLimit);
+			}
 		}
 		
+		keyCache = [[YapCache alloc] initWithKeyClass:[NSNumber class] countLimit:keyCacheLimit];
+		
 		#if TARGET_OS_IPHONE
-		self.autoFlushMemoryLevel = defaults.autoFlushMemoryLevel;
+		self.autoFlushMemoryFlags = defaults.autoFlushMemoryFlags;
 		#endif
 		
 		lock = OS_SPINLOCK_INIT;
@@ -214,6 +237,7 @@
 	registeredExtensions = [database registeredExtensions];
 	registeredTables = [database registeredTables];
 	extensionsOrder = [database extensionsOrder];
+	extensionDependencies = [database extensionDependencies];
 	
 	extensionsReady = ([registeredExtensions count] == 0);
 }
@@ -240,12 +264,43 @@
 	
 	[extensions removeAllObjects];
 	
+	[self _flushStatements];
+	
+	if (db)
+	{
+		if (![database connectionPoolEnqueue:db])
+		{
+			int status = sqlite3_close(db);
+			if (status != SQLITE_OK)
+			{
+				YDBLogError(@"Error in sqlite_close: %d %s", status, sqlite3_errmsg(db));
+			}
+		}
+		
+		db = NULL;
+	}
+	
+	[database removeConnection:self];
+	
+#if !OS_OBJECT_USE_OBJC
+	if (connectionQueue)
+		dispatch_release(connectionQueue);
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark Memory
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+- (void)_flushStatements
+{
 	sqlite_finalize_null(&beginTransactionStatement);
 	sqlite_finalize_null(&commitTransactionStatement);
 	sqlite_finalize_null(&rollbackTransactionStatement);
 	
 	sqlite_finalize_null(&yapGetDataForKeyStatement);
 	sqlite_finalize_null(&yapSetDataForKeyStatement);
+	sqlite_finalize_null(&yapRemoveForKeyStatement);
 	sqlite_finalize_null(&yapRemoveExtensionStatement);
 	
 	sqlite_finalize_null(&getCollectionCountStatement);
@@ -254,13 +309,15 @@
 	sqlite_finalize_null(&getCountForRowidStatement);
 	sqlite_finalize_null(&getRowidForKeyStatement);
 	sqlite_finalize_null(&getKeyForRowidStatement);
-	sqlite_finalize_null(&getKeyDataForRowidStatement);
-	sqlite_finalize_null(&getKeyMetadataForRowidStatement);
 	sqlite_finalize_null(&getDataForRowidStatement);
+	sqlite_finalize_null(&getMetadataForRowidStatement);
 	sqlite_finalize_null(&getAllForRowidStatement);
 	sqlite_finalize_null(&getDataForKeyStatement);
+	sqlite_finalize_null(&getMetadataForKeyStatement);
+	sqlite_finalize_null(&getAllForKeyStatement);
 	sqlite_finalize_null(&insertForRowidStatement);
 	sqlite_finalize_null(&updateAllForRowidStatement);
+	sqlite_finalize_null(&updateObjectForRowidStatement);
 	sqlite_finalize_null(&updateMetadataForRowidStatement);
 	sqlite_finalize_null(&removeForRowidStatement);
 	sqlite_finalize_null(&removeCollectionStatement);
@@ -275,91 +332,25 @@
 	sqlite_finalize_null(&enumerateKeysAndObjectsInAllCollectionsStatement);
 	sqlite_finalize_null(&enumerateRowsInCollectionStatement);
 	sqlite_finalize_null(&enumerateRowsInAllCollectionsStatement);
-	
-	if (db)
-	{
-		if (![database connectionPoolEnqueue:db])
-		{
-			int status = sqlite3_close(db);
-			if (status != SQLITE_OK)
-			{
-				YDBLogError(@"Error in sqlite_close: %d %s", status, sqlite3_errmsg(db));
-			}
-		}
-		
-		db = NULL;
-	}
-	
-	[database removeConnection:self];
-	
-#if !OS_OBJECT_USE_OBJC
-	if (connectionQueue)
-		dispatch_release(connectionQueue);
-#endif
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma mark Memory
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * Optional override hook.
- * Don't forget to invoke [super _flushMemoryWithLevel:level].
-**/
-- (void)_flushMemoryWithLevel:(int)level
+- (void)_flushMemoryWithFlags:(YapDatabaseConnectionFlushMemoryFlags)flags
 {
-	if (level >= YapDatabaseConnectionFlushMemoryLevelMild)
+	if (flags & YapDatabaseConnectionFlushMemoryFlags_Caches)
 	{
+		[keyCache removeAllObjects];
 		[objectCache removeAllObjects];
 		[metadataCache removeAllObjects];
 	}
 	
-	if (level >= YapDatabaseConnectionFlushMemoryLevelModerate)
-	{
-		sqlite_finalize_null(&yapRemoveExtensionStatement);
-		sqlite_finalize_null(&rollbackTransactionStatement);
-		
-		sqlite_finalize_null(&getCollectionCountStatement);
-		sqlite_finalize_null(&getKeyCountForCollectionStatement);
-		sqlite_finalize_null(&getKeyCountForAllStatement);
-		sqlite_finalize_null(&getCountForRowidStatement);
-		sqlite_finalize_null(&getKeyForRowidStatement);
-		sqlite_finalize_null(&getKeyDataForRowidStatement);
-		sqlite_finalize_null(&getKeyMetadataForRowidStatement);
-		sqlite_finalize_null(&getDataForRowidStatement);
-		sqlite_finalize_null(&getAllForRowidStatement);
-		sqlite_finalize_null(&updateMetadataForRowidStatement);
-		sqlite_finalize_null(&removeForRowidStatement);
-		sqlite_finalize_null(&removeCollectionStatement);
-		sqlite_finalize_null(&removeAllStatement);
-		sqlite_finalize_null(&enumerateCollectionsStatement);
-		sqlite_finalize_null(&enumerateCollectionsForKeyStatement);
-		sqlite_finalize_null(&enumerateKeysInCollectionStatement);
-		sqlite_finalize_null(&enumerateKeysInAllCollectionsStatement);
-		sqlite_finalize_null(&enumerateKeysAndMetadataInCollectionStatement);
-		sqlite_finalize_null(&enumerateKeysAndMetadataInAllCollectionsStatement);
-		sqlite_finalize_null(&enumerateKeysAndObjectsInCollectionStatement);
-		sqlite_finalize_null(&enumerateKeysAndObjectsInAllCollectionsStatement);
-		sqlite_finalize_null(&enumerateRowsInCollectionStatement);
-		sqlite_finalize_null(&enumerateRowsInAllCollectionsStatement);
-	}
-	
-	if (level >= YapDatabaseConnectionFlushMemoryLevelFull)
-	{
-		sqlite_finalize_null(&yapGetDataForKeyStatement);
-		sqlite_finalize_null(&yapSetDataForKeyStatement);
-		sqlite_finalize_null(&beginTransactionStatement);
-		sqlite_finalize_null(&commitTransactionStatement);
-		
-		sqlite_finalize_null(&getRowidForKeyStatement);
-		sqlite_finalize_null(&getDataForKeyStatement);
-		sqlite_finalize_null(&insertForRowidStatement);
-		sqlite_finalize_null(&updateAllForRowidStatement);
+	if (flags & YapDatabaseConnectionFlushMemoryFlags_Statements)
+	{
+		[self _flushStatements];
 	}
 	
 	[extensions enumerateKeysAndObjectsUsingBlock:^(id extNameObj, id extConnectionObj, BOOL *stop) {
 		
-		[(YapDatabaseExtensionConnection *)extConnectionObj _flushMemoryWithLevel:level];
+		[(YapDatabaseExtensionConnection *)extConnectionObj _flushMemoryWithFlags:flags];
 	}];
 }
 
@@ -381,11 +372,11 @@
  * YapDatabaseConnectionFlushMemoryLevelFull (3):
  *     Full flush of all caches and removes all pre-compiled sqlite statements.
 **/
-- (void)flushMemoryWithLevel:(int)level
+- (void)flushMemoryWithFlags:(YapDatabaseConnectionFlushMemoryFlags)flags
 {
 	dispatch_block_t block = ^{
 		
-		[self _flushMemoryWithLevel:level];
+		[self _flushMemoryWithFlags:flags];
 	};
 	
 	if (dispatch_get_specific(IsOnConnectionQueueKey))
@@ -397,7 +388,7 @@
 #if TARGET_OS_IPHONE
 - (void)didReceiveMemoryWarning:(NSNotification *)notification
 {
-	[self flushMemoryWithLevel:[self autoFlushMemoryLevel]];
+	[self flushMemoryWithFlags:[self autoFlushMemoryFlags]];
 }
 #endif
 
@@ -408,10 +399,8 @@
 @synthesize database = database;
 @synthesize name = _name;
 
-//@synthesize connectionQueue = connectionQueue;
-
 #if TARGET_OS_IPHONE
-@synthesize autoFlushMemoryLevel;
+@synthesize autoFlushMemoryFlags;
 #endif
 
 - (BOOL)objectCacheEnabled
@@ -446,6 +435,8 @@
 		{
 			objectCache = nil;
 		}
+		
+		[self updateKeyCacheLimit];
 	};
 	
 	if (dispatch_get_specific(IsOnConnectionQueueKey))
@@ -480,11 +471,12 @@
 			
 			if (objectCache == nil)
 			{
-				return; // Limit changed, but objectCache is still disabled
+				// Limit changed, but objectCache is still disabled
 			}
 			else
 			{
 				objectCache.countLimit = objectCacheLimit;
+				[self updateKeyCacheLimit];
 			}
 		}
 	};
@@ -527,6 +519,8 @@
 		{
 			metadataCache = nil;
 		}
+		
+		[self updateKeyCacheLimit];
 	};
 	
 	if (dispatch_get_specific(IsOnConnectionQueueKey))
@@ -561,11 +555,12 @@
 			
 			if (metadataCache == nil)
 			{
-				return; // Limit changed but metadataCache still disabled
+				// Limit changed but metadataCache still disabled
 			}
 			else
 			{
 				metadataCache.countLimit = metadataCacheLimit;
+				[self updateKeyCacheLimit];
 			}
 		}
 	};
@@ -664,6 +659,39 @@
 	return result;
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark Utilities
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+- (void)updateKeyCacheLimit
+{
+	NSUInteger keyCacheLimit = MIN_KEY_CACHE_LIMIT;
+	
+	if (keyCacheLimit != UNLIMITED_CACHE_LIMIT)
+	{
+		if (objectCache)
+		{
+			if (objectCacheLimit == UNLIMITED_CACHE_LIMIT)
+				keyCacheLimit = UNLIMITED_CACHE_LIMIT;
+			else
+				keyCacheLimit = MAX(keyCacheLimit, objectCacheLimit);
+		}
+	}
+	
+	if (keyCacheLimit != UNLIMITED_CACHE_LIMIT)
+	{
+		if (metadataCache)
+		{
+			if (objectCacheLimit == UNLIMITED_CACHE_LIMIT)
+				keyCacheLimit = UNLIMITED_CACHE_LIMIT;
+			else
+				keyCacheLimit = MAX(keyCacheLimit, objectCacheLimit);
+		}
+	}
+	
+	keyCache.countLimit = keyCacheLimit;
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Statements
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -678,7 +706,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &beginTransactionStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -695,7 +723,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &commitTransactionStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -712,7 +740,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &rollbackTransactionStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -729,7 +757,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &yapGetDataForKeyStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -746,13 +774,30 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &yapSetDataForKeyStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
 	return yapSetDataForKeyStatement;
 }
 
+- (sqlite3_stmt *)yapRemoveForKeyStatement
+{
+	if (yapRemoveForKeyStatement == NULL)
+	{
+		char *stmt = "DELETE FROM \"yap2\" WHERE \"extension\" = ? AND \"key\" = ?;";
+		int stmtLen = (int)strlen(stmt);
+		
+		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &yapRemoveForKeyStatement, NULL);
+		if (status != SQLITE_OK)
+		{
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
+		}
+	}
+	
+	return yapRemoveForKeyStatement;
+}
+
 - (sqlite3_stmt *)yapRemoveExtensionStatement
 {
 	if (yapRemoveExtensionStatement == NULL)
@@ -763,7 +808,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &yapRemoveExtensionStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -780,7 +825,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getCollectionCountStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -797,7 +842,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getKeyCountForCollectionStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -814,7 +859,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getKeyCountForAllStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -831,7 +876,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getCountForRowidStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -848,7 +893,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getRowidForKeyStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -865,75 +910,58 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getKeyForRowidStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
 	return getKeyForRowidStatement;
 }
 
-- (sqlite3_stmt *)getKeyDataForRowidStatement
-{
-	if (getKeyDataForRowidStatement == NULL)
-	{
-		char *stmt = "SELECT \"collection\", \"key\", \"data\" FROM \"database2\" WHERE \"rowid\" = ?;";
-		int stmtLen = (int)strlen(stmt);
-		
-		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getKeyDataForRowidStatement, NULL);
-		if (status != SQLITE_OK)
-		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
-		}
-	}
-	
-	return getKeyDataForRowidStatement;
-}
-
-- (sqlite3_stmt *)getKeyMetadataForRowidStatement
+- (sqlite3_stmt *)getDataForRowidStatement
 {
-	if (getKeyMetadataForRowidStatement == NULL)
+	if (getDataForRowidStatement == NULL)
 	{
-		char *stmt = "SELECT \"collection\", \"key\", \"metadata\" FROM \"database2\" WHERE \"rowid\" = ?;";
+		char *stmt = "SELECT \"data\" FROM \"database2\" WHERE \"rowid\" = ?;";
 		int stmtLen = (int)strlen(stmt);
 		
-		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getKeyMetadataForRowidStatement, NULL);
+		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getDataForRowidStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
-	return getKeyMetadataForRowidStatement;
+	return getDataForRowidStatement;
 }
 
-- (sqlite3_stmt *)getDataForRowidStatement
+- (sqlite3_stmt *)getMetadataForRowidStatement
 {
-	if (getDataForRowidStatement == NULL)
+	if (getMetadataForRowidStatement == NULL)
 	{
-		char *stmt = "SELECT \"data\" FROM \"database2\" WHERE \"rowid\" = ?;";
+		char *stmt = "SELECT \"metadata\" FROM \"database2\" WHERE \"rowid\" = ?;";
 		int stmtLen = (int)strlen(stmt);
 		
-		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getDataForRowidStatement, NULL);
+		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getMetadataForRowidStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
-	return getDataForRowidStatement;
+	return getMetadataForRowidStatement;
 }
 
 - (sqlite3_stmt *)getAllForRowidStatement
 {
 	if (getAllForRowidStatement == NULL)
 	{
-		char *stmt = "SELECT \"collection\", \"key\", \"data\", \"metadata\" FROM \"database2\" WHERE \"rowid\" = ?;";
+		char *stmt = "SELECT \"data\", \"metadata\" FROM \"database2\" WHERE \"rowid\" = ?;";
 		int stmtLen = (int)strlen(stmt);
 		
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getAllForRowidStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -950,7 +978,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getDataForKeyStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -967,7 +995,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getMetadataForKeyStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -984,7 +1012,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &getAllForKeyStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1002,7 +1030,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &insertForRowidStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1019,13 +1047,30 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &updateAllForRowidStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
 	return updateAllForRowidStatement;
 }
 
+- (sqlite3_stmt *)updateObjectForRowidStatement
+{
+	if (updateObjectForRowidStatement == NULL)
+	{
+		char *stmt = "UPDATE \"database2\" SET \"data\" = ? WHERE \"rowid\" = ?;";
+		int stmtLen = (int)strlen(stmt);
+		
+		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &updateObjectForRowidStatement, NULL);
+		if (status != SQLITE_OK)
+		{
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
+		}
+	}
+	
+	return updateObjectForRowidStatement;
+}
+
 - (sqlite3_stmt *)updateMetadataForRowidStatement
 {
 	if (updateMetadataForRowidStatement == NULL)
@@ -1036,7 +1081,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &updateMetadataForRowidStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1053,7 +1098,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &removeForRowidStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1070,7 +1115,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &removeCollectionStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1087,7 +1132,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &removeAllStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1104,7 +1149,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &enumerateCollectionsStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1121,7 +1166,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &enumerateCollectionsForKeyStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1138,7 +1183,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &enumerateKeysInCollectionStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1155,7 +1200,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &enumerateKeysInAllCollectionsStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1172,7 +1217,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &enumerateKeysAndMetadataInCollectionStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1190,7 +1235,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &enumerateKeysAndMetadataInAllCollectionsStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1207,7 +1252,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &enumerateKeysAndObjectsInCollectionStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1225,7 +1270,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &enumerateKeysAndObjectsInAllCollectionsStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1242,7 +1287,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &enumerateRowsInCollectionStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1261,7 +1306,7 @@
 		int status = sqlite3_prepare_v2(db, stmt, stmtLen+1, &enumerateRowsInAllCollectionsStatement, NULL);
 		if (status != SQLITE_OK)
 		{
-			YDBLogError(@"Error creating '%@': %d %s", NSStringFromSelector(_cmd), status, sqlite3_errmsg(db));
+			YDBLogError(@"Error creating '%@': %d %s", THIS_METHOD, status, sqlite3_errmsg(db));
 		}
 	}
 	
@@ -1876,13 +1921,19 @@
 	
 	if (objectChanges == nil)
 		objectChanges = [[NSMutableDictionary alloc] init];
+	
 	if (metadataChanges == nil)
 		metadataChanges = [[NSMutableDictionary alloc] init];
+	
 	if (removedKeys == nil)
 		removedKeys = [[NSMutableSet alloc] init];
+	
 	if (removedCollections == nil)
 		removedCollections = [[NSMutableSet alloc] init];
 	
+	if (removedRowids == nil)
+		removedRowids = [[NSMutableSet alloc] init];
+	
 	allKeysRemoved = NO;
 	
 	// Pre-Write-Transaction: Step 5 of 5
@@ -2010,35 +2061,7 @@
 		{
 			if ([registeredExtensions objectForKey:prevExtensionName] == nil)
 			{
-				NSString *className = [transaction stringValueForKey:@"class" extension:prevExtensionName];
-				Class class = NSClassFromString(className);
-				
-				if (className == nil)
-				{
-					YDBLogWarn(@"Unable to auto-unregister extension(%@). Doesn't appear to be registered.",
-					           prevExtensionName);
-				}
-				else if (class == NULL)
-				{
-					YDBLogError(@"Unable to auto-unregister extension(%@) with unknown class(%@)",
-					            prevExtensionName, className);
-				}
-				if (![class isSubclassOfClass:[YapDatabaseExtension class]])
-				{
-					YDBLogError(@"Unable to auto-unregister extension(%@) with improper class(%@)",
-					            prevExtensionName, className);
-				}
-				else
-				{
-					YDBLogInfo(@"Auto-unregistering extension(%@) with class(%@)",
-					            prevExtensionName, className);
-					
-					// Drop tables
-					[class dropTablesForRegisteredName:prevExtensionName withTransaction:transaction];
-					
-					// Drop preferences (rows in yap2 table)
-					[transaction removeAllValuesForExtension:prevExtensionName];
-				}
+				[self _unregisterExtension:prevExtensionName withTransaction:transaction];
 			}
 		}
 		
@@ -2224,13 +2247,19 @@
 	
 	if ([objectChanges count] > 0)
 		objectChanges = nil;
+	
 	if ([metadataChanges count] > 0)
 		metadataChanges = nil;
+	
 	if ([removedKeys count] > 0)
 		removedKeys = nil;
+	
 	if ([removedCollections count] > 0)
 		removedCollections = nil;
 	
+	if ([removedRowids count] > 0)
+		removedRowids = nil;
+	
 	// Post-Write-Transaction: Step 11 of 11
 	//
 	// Drop IsOnConnectionQueueKey flag from writeQueue since we're exiting writeQueue.
@@ -2386,12 +2415,18 @@
 	
 	if ([objectChanges count] > 0)
 		objectChanges = nil;
+	
 	if ([metadataChanges count] > 0)
 		metadataChanges = nil;
+	
 	if ([removedKeys count] > 0)
 		removedKeys = nil;
+	
 	if ([removedCollections count] > 0)
 		removedCollections = nil;
+	
+	if ([removedRowids count] > 0)
+		removedRowids = nil;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2541,11 +2576,13 @@
 	          YapDatabaseRegisteredExtensionsKey,
 	          YapDatabaseRegisteredTablesKey,
 			  YapDatabaseExtensionsOrderKey,
+			  YapDatabaseExtensionDependenciesKey,
 	          YapDatabaseNotificationKey,
 	          YapDatabaseObjectChangesKey,
 	          YapDatabaseMetadataChangesKey,
 	          YapDatabaseRemovedKeysKey,
 	          YapDatabaseRemovedCollectionsKey,
+	          YapDatabaseRemovedRowidsKey,
 	          YapDatabaseAllKeysRemovedKey ];
 }
 
@@ -2644,6 +2681,7 @@
 		
 		[internalChangeset setObject:registeredExtensions forKey:YapDatabaseRegisteredExtensionsKey];
 		[internalChangeset setObject:extensionsOrder forKey:YapDatabaseExtensionsOrderKey];
+		[internalChangeset setObject:extensionDependencies forKey:YapDatabaseExtensionDependenciesKey];
 	}
 	
 	if (registeredTablesChanged)
@@ -2662,7 +2700,8 @@
 	if ([objectChanges count]      > 0 ||
 		[metadataChanges count]    > 0 ||
 		[removedKeys count]        > 0 ||
-		[removedCollections count] > 0 || allKeysRemoved)
+		[removedCollections count] > 0 ||
+	    [removedRowids count]      > 0 || allKeysRemoved)
 	{
 		if (internalChangeset == nil)
 			internalChangeset = [NSMutableDictionary dictionaryWithSharedKeySet:sharedKeySetForInternalChangeset];
@@ -2703,6 +2742,11 @@
 			                      forKey:YapDatabaseRemovedCollectionsKey];
 		}
 		
+		if ([removedRowids count] > 0)
+		{
+			[internalChangeset setObject:removedRowids forKey:YapDatabaseRemovedRowidsKey];
+		}
+		
 		if (allKeysRemoved)
 		{
 			[internalChangeset setObject:@(YES) forKey:YapDatabaseAllKeysRemovedKey];
@@ -2731,6 +2775,7 @@
 		
 		registeredExtensions = changeset_registeredExtensions;
 		extensionsOrder = [changeset objectForKey:YapDatabaseExtensionsOrderKey];
+		extensionDependencies = [changeset objectForKey:YapDatabaseExtensionDependenciesKey];
 		
 		// Remove any extensions that have been dropped
 		
@@ -2784,8 +2829,9 @@
 	NSDictionary *changeset_objectChanges   =  [changeset objectForKey:YapDatabaseObjectChangesKey];
 	NSDictionary *changeset_metadataChanges =  [changeset objectForKey:YapDatabaseMetadataChangesKey];
 	
-	NSSet *changeset_removedKeys        =  [changeset objectForKey:YapDatabaseRemovedKeysKey];
-	NSSet *changeset_removedCollections =  [changeset objectForKey:YapDatabaseRemovedCollectionsKey];
+	NSSet *changeset_removedRowids      = [changeset objectForKey:YapDatabaseRemovedRowidsKey];
+	NSSet *changeset_removedKeys        = [changeset objectForKey:YapDatabaseRemovedKeysKey];
+	NSSet *changeset_removedCollections = [changeset objectForKey:YapDatabaseRemovedCollectionsKey];
 	
 	BOOL changeset_allKeysRemoved = [[changeset objectForKey:YapDatabaseAllKeysRemovedKey] boolValue];
 	
@@ -2794,6 +2840,45 @@
 	BOOL hasRemovedKeys        = [changeset_removedKeys count] > 0;
 	BOOL hasRemovedCollections = [changeset_removedCollections count] > 0;
 	
+	// Update keyCache
+	
+	if (changeset_allKeysRemoved)
+	{
+		// Shortcut: Everything was removed from the database
+		
+		[keyCache removeAllObjects];
+	}
+	else
+	{
+		if (hasRemovedCollections)
+		{
+			__block NSMutableArray *toRemove = nil;
+			[keyCache enumerateKeysAndObjectsWithBlock:^(id key, id obj, BOOL *stop) {
+				
+				__unsafe_unretained NSNumber *rowidNumber = (NSNumber *)key;
+				__unsafe_unretained YapCollectionKey *collectionKey = (YapCollectionKey *)obj;
+				
+				if ([changeset_removedCollections containsObject:collectionKey.collection])
+				{
+					if (toRemove == nil)
+						toRemove = [NSMutableArray array];
+					
+					[toRemove addObject:rowidNumber];
+				}
+			}];
+			
+			[keyCache removeObjectsForKeys:toRemove];
+		}
+		
+		if (changeset_removedRowids)
+		{
+			[changeset_removedRowids enumerateObjectsUsingBlock:^(id obj, BOOL *stop) {
+				
+				[keyCache removeObjectForKey:obj];
+			}];
+		}
+	}
+	
 	// Update objectCache
 	
 	if (changeset_allKeysRemoved && !hasObjectChanges)
@@ -3203,6 +3288,7 @@
  includingObjectChanges:(BOOL)includeObjectChanges
         metadataChanges:(BOOL)includeMetadataChanges
 {
+	if (key == nil) return NO;
 	if (collection == nil)
 		collection = @"";
 	
@@ -3490,6 +3576,10 @@
 		YapDatabaseReadWriteTransaction *transaction = [self newReadWriteTransaction];
 		[self preReadWriteTransaction:transaction];
 		
+		// Set the registeredName now.
+		// The extension will need this in order to perform the registration tasks such as creating tables, etc.
+		extension.registeredName = extensionName;
+		
 		YapDatabaseExtensionConnection *extensionConnection;
 		YapDatabaseExtensionTransaction *extensionTransaction;
 		
@@ -3514,6 +3604,9 @@
 		}
 		else
 		{
+			// Registration failed.
+			
+			extension.registeredName = nil;
 			[transaction rollback];
 		}
 		
@@ -3533,40 +3626,103 @@
 		YapDatabaseReadWriteTransaction *transaction = [self newReadWriteTransaction];
 		[self preReadWriteTransaction:transaction];
 		
-		NSString *className = [transaction stringValueForKey:@"class" extension:extensionName];
-		Class class = NSClassFromString(className);
+		// Unregister the given extension
 		
-		if (className == nil)
-		{
-			YDBLogWarn(@"Unable to unregister extension(%@). Doesn't appear to be registered.", extensionName);
-		}
-		else if (class == NULL)
-		{
-			YDBLogError(@"Unable to unregister extension(%@) with unknown class(%@)", extensionName, className);
-		}
-		if (![class isSubclassOfClass:[YapDatabaseExtension class]])
-		{
-			YDBLogError(@"Unable to unregister extension(%@) with improper class(%@)", extensionName, className);
-		}
-		else
+		YapDatabaseExtension *extension = [registeredExtensions objectForKey:extensionName];
+		
+		[self _unregisterExtension:extensionName withTransaction:transaction];
+		extension.registeredName = nil;
+		
+		// Automatically unregister any extensions that were dependent upon this one.
+		
+		NSMutableArray *extensionNameStack = [NSMutableArray arrayWithCapacity:1];
+		[extensionNameStack addObject:extensionName];
+		
+		do
 		{
-			// Drop tables
-			[class dropTablesForRegisteredName:extensionName withTransaction:transaction];
+			NSString *currentExtensionName = [extensionNameStack lastObject];
 			
-			// Drop preferences (rows in yap2 table)
-			[transaction removeAllValuesForExtension:extensionName];
+			__block NSString *dependentExtName = nil;
+			[extensionDependencies enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop){
+				
+			//	__unsafe_unretained NSString *extName = (NSString *)key;
+				__unsafe_unretained NSSet *extDependencies = (NSSet *)obj;
+				
+				if ([extDependencies containsObject:currentExtensionName])
+				{
+					dependentExtName = (NSString *)key;
+					*stop = YES;
+				}
+			}];
 			
-			[self didUnregisterExtension:extensionName];
+			if (dependentExtName)
+			{
+				// We found an extension that was dependent upon the one we just unregistered.
+				// So we need to unregister it too.
+				
+				YapDatabaseExtension *dependentExt = [registeredExtensions objectForKey:dependentExtName];
+				
+				[self _unregisterExtension:dependentExtName withTransaction:transaction];
+				dependentExt.registeredName = nil;
+				
+				// And now we need to check and see if there were any extensions dependent upon this new one.
+				// So we add it to the top of the stack, and continue our search.
+				
+				[extensionNameStack addObject:dependentExtName];
+			}
+			else
+			{
+				[extensionNameStack removeLastObject];
+			}
 			
-			[self removeRegisteredExtensionConnection:extensionName];
-			[transaction removeRegisteredExtensionTransaction:extensionName];
-		}
+		} while ([extensionNameStack count] > 0);
+		
 		
+		// Complete the transaction
 		[self postReadWriteTransaction:transaction];
+		
+		// And reset the registeredExtensionsChanged ivar.
+		// The above method already processed it, and included the appropriate information in the changeset.
 		registeredExtensionsChanged = NO;
 	}});
 }
 
+- (void)_unregisterExtension:(NSString *)extensionName withTransaction:(YapDatabaseReadWriteTransaction *)transaction
+{
+	NSString *className = [transaction stringValueForKey:@"class" extension:extensionName];
+	Class class = NSClassFromString(className);
+	
+	if (className == nil)
+	{
+		YDBLogWarn(@"Unable to unregister extension(%@). Doesn't appear to be registered.", extensionName);
+	}
+	else if (class == NULL)
+	{
+		YDBLogError(@"Unable to unregister extension(%@) with unknown class(%@)", extensionName, className);
+	}
+	if (![class isSubclassOfClass:[YapDatabaseExtension class]])
+	{
+		YDBLogError(@"Unable to unregister extension(%@) with improper class(%@)", extensionName, className);
+	}
+	else
+	{
+		// Drop tables
+		[class dropTablesForRegisteredName:extensionName withTransaction:transaction];
+		
+		// Drop preferences (rows in yap2 table)
+		[transaction removeAllValuesForExtension:extensionName];
+		
+		// Remove from registeredExtensions, extensionsOrder & extensionDependencies (if needed)
+		[self didUnregisterExtension:extensionName];
+		
+		// Remove YapDatabaseExtensionConnection subclass instance (if needed)
+		[self removeRegisteredExtensionConnection:extensionName];
+		
+		// Remove YapDatabaseExtensionTransaction subclass instance (if needed)
+		[transaction removeRegisteredExtensionTransaction:extensionName];
+	}
+}
+
 - (void)willRegisterExtension:(YapDatabaseExtension *)extension
               withTransaction:(YapDatabaseReadWriteTransaction *)transaction
               needsClassValue:(BOOL *)needsClassValuePtr
@@ -3657,13 +3813,19 @@
 	NSMutableDictionary *newRegisteredExtensions = [registeredExtensions mutableCopy];
 	[newRegisteredExtensions setObject:extension forKey:extensionName];
 	
-	NSMutableArray *newExtensionsOrder = [extensionsOrder mutableCopy];
-	[newExtensionsOrder addObject:extensionName];
-	
 	registeredExtensions = [newRegisteredExtensions copy];
-	extensionsOrder = [newExtensionsOrder copy];
-	extensionsReady = NO;
+	extensionsOrder = [extensionsOrder arrayByAddingObject:extensionName];
+	
+	NSSet *dependencies = [extension dependencies];
+	if (dependencies == nil)
+		dependencies = [NSSet set];
+	
+	NSMutableDictionary *newExtensionDependencies = [extensionDependencies mutableCopy];
+	[newExtensionDependencies setObject:dependencies forKey:extensionName];
+	
+	extensionDependencies = [newExtensionDependencies copy];
 	
+	extensionsReady = NO;
 	sharedKeySetForExtensions = [NSDictionary sharedKeySetForKeys:[registeredExtensions allKeys]];
 	
 	// Set the registeredExtensionsChanged flag.
@@ -3684,8 +3846,18 @@
 		[newRegisteredExtensions removeObjectForKey:extensionName];
 		
 		registeredExtensions = [newRegisteredExtensions copy];
-		extensionsReady = NO;
 		
+		NSMutableArray *newExtensionsOrder = [extensionsOrder mutableCopy];
+		[newExtensionsOrder removeObject:extensionName];
+		
+		extensionsOrder = [newExtensionsOrder copy];
+		
+		NSMutableDictionary *newExtensionDependencies = [extensionDependencies mutableCopy];
+		[newExtensionDependencies removeObjectForKey:extensionName];
+		
+		extensionDependencies = [newExtensionDependencies copy];
+		
+		extensionsReady = NO;
 		sharedKeySetForExtensions = [NSDictionary sharedKeySetForKeys:[registeredExtensions allKeys]];
 		
 		// Set the registeredExtensionsChanged flag.