Removed FMDB transitive dependency

CoreZen.xcodeproj/project.pbxproj

@@ -7,6 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		AA0000020000000000000001 /* Database.h in Headers */ = {isa = PBXBuildFile; fileRef = AA0000010000000000000001 /* Database.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		AA0000020000000000000002 /* Database.m in Sources */ = {isa = PBXBuildFile; fileRef = AA0000010000000000000002 /* Database.m */; };
+		AA0000020000000000000003 /* Database+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = AA0000010000000000000003 /* Database+Private.h */; };
+		AA0000020000000000000004 /* ResultSet.h in Headers */ = {isa = PBXBuildFile; fileRef = AA0000010000000000000004 /* ResultSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		AA0000020000000000000005 /* ResultSet.m in Sources */ = {isa = PBXBuildFile; fileRef = AA0000010000000000000005 /* ResultSet.m */; };
+		AA0000020000000000000006 /* ResultSet+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = AA0000010000000000000006 /* ResultSet+Private.h */; };
 		5309C3AE2885A1DC00BC0AAE /* CoreZen.docc in Sources */ = {isa = PBXBuildFile; fileRef = 5309C3AD2885A1DC00BC0AAE /* CoreZen.docc */; };
 		5309C3B42885A1DC00BC0AAE /* CoreZen.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5309C3A92885A1DC00BC0AAE /* CoreZen.framework */; };
 		5309C3B92885A1DC00BC0AAE /* CoreZenTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5309C3B82885A1DC00BC0AAE /* CoreZenTests.m */; };
@@ -220,6 +226,12 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		AA0000010000000000000001 /* Database.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Database.h; sourceTree = "<group>"; };
+		AA0000010000000000000002 /* Database.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Database.m; sourceTree = "<group>"; };
+		AA0000010000000000000003 /* Database+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Database+Private.h"; sourceTree = "<group>"; };
+		AA0000010000000000000004 /* ResultSet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ResultSet.h; sourceTree = "<group>"; };
+		AA0000010000000000000005 /* ResultSet.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ResultSet.m; sourceTree = "<group>"; };
+		AA0000010000000000000006 /* ResultSet+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ResultSet+Private.h"; sourceTree = "<group>"; };
 		5309C3A92885A1DC00BC0AAE /* CoreZen.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreZen.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5309C3AC2885A1DC00BC0AAE /* CoreZen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreZen.h; sourceTree = "<group>"; };
 		5309C3AD2885A1DC00BC0AAE /* CoreZen.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = CoreZen.docc; sourceTree = "<group>"; };
@@ -629,13 +641,19 @@
 		5309C4112885B66000BC0AAE /* Database */ = {
 			isa = PBXGroup;
 			children = (
+				AA0000010000000000000001 /* Database.h */,
+				AA0000010000000000000002 /* Database.m */,
+				AA0000010000000000000003 /* Database+Private.h */,
 				5309C4122885C86500BC0AAE /* DatabaseQueue.h */,
 				5309C4132885C86500BC0AAE /* DatabaseQueue.m */,
 				5309C4232885CDA500BC0AAE /* DatabaseSchema.h */,
 				5309C4242885CDA500BC0AAE /* DatabaseSchema.m */,
 				5309C4272885D19400BC0AAE /* DatabaseTable.h */,
 				5309C41F2885CB1400BC0AAE /* DataTransferObject.h */,
 				5309C4202885CB1400BC0AAE /* DataTransferObject.m */,
+				AA0000010000000000000004 /* ResultSet.h */,
+				AA0000010000000000000005 /* ResultSet.m */,
+				AA0000010000000000000006 /* ResultSet+Private.h */,
 			);
 			path = Database;
 			sourceTree = "<group>";
@@ -1081,8 +1099,12 @@
 				5309C3F92885A86000BC0AAE /* Identifiable.h in Headers */,
 				5309C3F12885A74A00BC0AAE /* ObjectIdentifier.h in Headers */,
 				5309C3EC2885A43100BC0AAE /* PreferenceViewController.h in Headers */,
+				AA0000020000000000000001 /* Database.h in Headers */,
+				AA0000020000000000000003 /* Database+Private.h in Headers */,
 				5309C4252885CDA500BC0AAE /* DatabaseSchema.h in Headers */,
 				5309C4292885D19400BC0AAE /* DatabaseTable.h in Headers */,
+				AA0000020000000000000004 /* ResultSet.h in Headers */,
+				AA0000020000000000000006 /* ResultSet+Private.h in Headers */,
 				5350F8C22886194200F8CA68 /* MediaFile.h in Headers */,
 				5309C3E82885A39C00BC0AAE /* PreferencesWindowController.h in Headers */,
 				538E05072885DD1D00CE9DE7 /* DomainCallbacks.h in Headers */,
@@ -1228,7 +1250,9 @@
 				532CA22B291B0CFB008FA673 /* LibAVInfoController.m in Sources */,
 				5396533A288F4DF9007B53EC /* MPVFunctions.m in Sources */,
 				532CA224291B090E008FA673 /* FrameRenderer.m in Sources */,
+				AA0000020000000000000002 /* Database.m in Sources */,
 				5309C4262885CDA500BC0AAE /* DatabaseSchema.m in Sources */,
+				AA0000020000000000000005 /* ResultSet.m in Sources */,
 				5309C3AE2885A1DC00BC0AAE /* CoreZen.docc in Sources */,
 				538E05142885ED2200CE9DE7 /* ObjectRepository.m in Sources */,
 				5350FB0728889E7400F8CA68 /* Node.m in Sources */,

CoreZen/CoreZen.h

@@ -25,11 +25,12 @@ FOUNDATION_EXPORT const unsigned char CoreZenVersionString[];
 #import <CoreZen/NSView+CoreZen.h>
 
 #pragma mark - Database
+#import <CoreZen/Database.h>
+#import <CoreZen/ResultSet.h>
 #import <CoreZen/DatabaseQueue.h>
 #import <CoreZen/DatabaseSchema.h>
 #import <CoreZen/DatabaseTable.h>
 #import <CoreZen/DataTransferObject.h>
-@import FMDB;
 
 #pragma mark - Domain
 #import <CoreZen/DomainCommon.h>

CoreZen/Database/Database+Private.h

@@ -0,0 +1,23 @@
+//
+//  Database+Private.h
+//  CoreZen
+//
+//  Created by Zach Nelson on 4/1/26.
+//
+
+#import "Database.h"
+
+@class FMDatabase;
+
+@interface ZENDatabase (Private)
+
++ (instancetype)databaseWithFMDatabase:(FMDatabase *)fmDatabase;
+
+- (void)beginTransaction;
+- (void)commit;
+- (void)rollback;
+
+- (void)setShouldCacheStatements:(BOOL)value;
+- (void)setTraceExecution:(BOOL)value;
+
+@end

CoreZen/Database/Database.h

@@ -0,0 +1,22 @@
+//
+//  Database.h
+//  CoreZen
+//
+//  Created by Zach Nelson on 4/1/26.
+//
+
+#import <Foundation/Foundation.h>
+
+@class ZENResultSet;
+
+@interface ZENDatabase : NSObject
+
+- (BOOL)executeUpdate:(NSString *)sql, ...;
+- (BOOL)executeUpdate:(NSString *)sql withArgumentsInArray:(NSArray *)arguments;
+
+- (ZENResultSet *)executeQuery:(NSString *)sql, ...;
+- (ZENResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray *)arguments;
+
+- (NSString *)lastErrorMessage;
+
+@end

CoreZen/Database/Database.m

@@ -0,0 +1,85 @@
+//
+//  Database.m
+//  CoreZen
+//
+//  Created by Zach Nelson on 4/1/26.
+//
+
+#import "Database.h"
+#import "Database+Private.h"
+#import "ResultSet+Private.h"
+
+@import FMDB;
+
+@interface ZENDatabase ()
+@property (nonatomic, strong, readonly) FMDatabase *fmDatabase;
+@end
+
+@implementation ZENDatabase
+
++ (instancetype)databaseWithFMDatabase:(FMDatabase *)fmDatabase {
+	ZENDatabase *db = [[ZENDatabase alloc] init];
+	if (db) {
+		db->_fmDatabase = fmDatabase;
+	}
+	return db;
+}
+
+#pragma mark - Updates
+
+- (BOOL)executeUpdate:(NSString *)sql, ... {
+	va_list args;
+	va_start(args, sql);
+	BOOL result = [self.fmDatabase executeUpdate:sql withVAList:args];
+	va_end(args);
+	return result;
+}
+
+- (BOOL)executeUpdate:(NSString *)sql withArgumentsInArray:(NSArray *)arguments {
+	return [self.fmDatabase executeUpdate:sql withArgumentsInArray:arguments];
+}
+
+#pragma mark - Queries
+
+- (ZENResultSet *)executeQuery:(NSString *)sql, ... {
+	va_list args;
+	va_start(args, sql);
+	FMResultSet *rs = [self.fmDatabase executeQuery:sql withVAList:args];
+	va_end(args);
+	return rs ? [ZENResultSet resultSetWithFMResultSet:rs] : nil;
+}
+
+- (ZENResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray *)arguments {
+	FMResultSet *rs = [self.fmDatabase executeQuery:sql withArgumentsInArray:arguments];
+	return rs ? [ZENResultSet resultSetWithFMResultSet:rs] : nil;
+}
+
+#pragma mark - Error
+
+- (NSString *)lastErrorMessage {
+	return [self.fmDatabase lastErrorMessage];
+}
+
+#pragma mark - Private
+
+- (void)beginTransaction {
+	[self.fmDatabase beginTransaction];
+}
+
+- (void)commit {
+	[self.fmDatabase commit];
+}
+
+- (void)rollback {
+	[self.fmDatabase rollback];
+}
+
+- (void)setShouldCacheStatements:(BOOL)value {
+	[self.fmDatabase setShouldCacheStatements:value];
+}
+
+- (void)setTraceExecution:(BOOL)value {
+	[self.fmDatabase setTraceExecution:value];
+}
+
+@end

CoreZen/Database/DatabaseQueue.h

@@ -7,9 +7,9 @@
 
 #import <Foundation/Foundation.h>
 
-@class FMDatabase;
+@class ZENDatabase;
 
-typedef void (^ZENDatabaseBlock)(FMDatabase *database);
+typedef void (^ZENDatabaseBlock)(ZENDatabase *database);
 
 @interface ZENDatabaseQueue : NSObject
 

CoreZen/Database/DatabaseQueue.m

@@ -6,6 +6,7 @@
 //
 
 #import "DatabaseQueue.h"
+#import "Database+Private.h"
 #import "WorkQueue.h"
 
 #import <stdatomic.h>
@@ -17,7 +18,7 @@ @interface ZENDatabaseQueue ()
 - (void)internalInit:(NSString *)queueLabel;
 - (instancetype)initInMemory;
 - (instancetype)initWithURL:(NSURL *)URL;
-- (FMDatabase *)threadDatabase;
+- (ZENDatabase *)threadDatabase;
 
 @property (nonatomic, strong, readonly) NSURL *databaseURL;
 @property (nonatomic, copy, readonly) NSString *databaseKey;
@@ -80,35 +81,38 @@ - (void)shutdown:(ZENDatabaseBlock)updateBlock {
 	[self.workQueue terminate:^{
 		if (updateBlock) {
 			@autoreleasepool {
-				FMDatabase *database = self.threadDatabase;
+				ZENDatabase *database = self.threadDatabase;
 				updateBlock(database);
 			}
 		}
 		NSLog(@"Finished terminating database queue");
 	}];
 }
 
-- (FMDatabase *)threadDatabase {
-	// Make an instance of FMDatabase for the thread, store it in the thread dictionary.
+- (ZENDatabase *)threadDatabase {
+	// Make an instance of ZENDatabase for the thread, store it in the thread dictionary.
 	// FMDB wants a different database instance per thread, and serial queue may run on different threads.
 	// (Serial queue is guaranteed to be serial, not necessary on a single thread.)
 
 	NSMutableDictionary *threadDictionary = NSThread.currentThread.threadDictionary;
-	FMDatabase *database = [threadDictionary objectForKey:self.databaseKey];
+	ZENDatabase *database = [threadDictionary objectForKey:self.databaseKey];
 
 	if (database == nil) {
 		NSLog(@"Creating database for thread %@ at %@", [NSThread currentThread], self.databaseURL);
 
+		FMDatabase *fmdb;
 		if (self.databaseURL) {
-			database = [FMDatabase databaseWithURL:self.databaseURL];
+			fmdb = [FMDatabase databaseWithURL:self.databaseURL];
 		} else {
-			database = [FMDatabase databaseWithPath:self.databaseKey];
+			fmdb = [FMDatabase databaseWithPath:self.databaseKey];
 		}
 
-		if (![database open]) {
+		if (![fmdb open]) {
 			NSLog(@"ERROR: Failed to open database at %@", self.databaseURL);
 			return nil;
 		}
+
+		database = [ZENDatabase databaseWithFMDatabase:fmdb];
 		[database executeUpdate:@"PRAGMA synchronous = 1;"];
 		[database setShouldCacheStatements:YES];
 
@@ -125,7 +129,7 @@ - (void)transactionAsync:(ZENDatabaseBlock)updateBlock {
 	[self.workQueue async:^(ZENWorkQueueToken *canceled) {
 		if (!canceled.canceled) {
 			@autoreleasepool {
-				FMDatabase *database = self.threadDatabase;
+				ZENDatabase *database = self.threadDatabase;
 				[database beginTransaction];
 				updateBlock(database);
 				[database commit];
@@ -137,7 +141,7 @@ - (void)transactionAsync:(ZENDatabaseBlock)updateBlock {
 - (void)transactionSync:(ZENDatabaseBlock)updateBlock {
 	[self.workQueue sync:^{
 		@autoreleasepool {
-			FMDatabase *database = self.threadDatabase;
+			ZENDatabase *database = self.threadDatabase;
 			[database beginTransaction];
 			updateBlock(database);
 			[database commit];
@@ -149,7 +153,7 @@ - (void)fetchAsync:(ZENDatabaseBlock)fetchBlock {
 	[self.workQueue async:^(ZENWorkQueueToken *canceled) {
 		if (!canceled.canceled) {
 			@autoreleasepool {
-				FMDatabase *database = self.threadDatabase;
+				ZENDatabase *database = self.threadDatabase;
 				fetchBlock(database);
 			}
 		}
@@ -159,7 +163,7 @@ - (void)fetchAsync:(ZENDatabaseBlock)fetchBlock {
 - (void)fetchSync:(ZENDatabaseBlock)fetchBlock {
 	[self.workQueue sync:^{
 		@autoreleasepool {
-			FMDatabase *database = self.threadDatabase;
+			ZENDatabase *database = self.threadDatabase;
 			fetchBlock(database);
 		}
 	}];
@@ -169,7 +173,7 @@ - (void)vacuumAsync {
 	[self.workQueue async:^(ZENWorkQueueToken *canceled) {
 		if (!canceled.canceled) {
 			@autoreleasepool {
-				FMDatabase *database = self.threadDatabase;
+				ZENDatabase *database = self.threadDatabase;
 				[database executeUpdate:@"VACUUM;"];
 			}
 		}

CoreZen/Database/DatabaseSchema.h

@@ -7,12 +7,12 @@
 
 #import <Foundation/Foundation.h>
 
-@class FMDatabase;
+@class ZENDatabase;
 
 @interface ZENDatabaseSchema : NSObject
 
 + (instancetype)schemaWithTableClasses:(NSArray *)tables;
 
-- (void)initializeDatabase:(FMDatabase *)database;
+- (void)initializeDatabase:(ZENDatabase *)database;
 
 @end