Skip to content

Fix warning: 'inTransaction' is deprecated, use isInTransaction property instead #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kjuly wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix warning: 'inTransaction' is deprecated, use isInTransaction property instead #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions FCModel/FCModel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,7 @@ - (BOOL)saveWithoutChangeNotifications:(void (^)(void))modificiationsBlock
+ (BOOL)isInTransaction
{
__block BOOL inTransaction = NO;
[self inDatabaseSync:^(FMDatabase *db) { inTransaction = db.inTransaction; }];
[self inDatabaseSync:^(FMDatabase *db) { inTransaction = db.isInTransaction; }];
return inTransaction;
}

Expand All @@ -1122,7 +1122,7 @@ + (void)performTransaction:(BOOL (^)(void))block
__block NSDictionary *changedFieldsToNotify = nil;

[self inDatabaseSync:^(FMDatabase *db) {
if (db.inTransaction) [[NSException exceptionWithName:FCModelException reason:@"Cannot nest FCModel transactions" userInfo:nil] raise];
if (db.isInTransaction) [[NSException exceptionWithName:FCModelException reason:@"Cannot nest FCModel transactions" userInfo:nil] raise];
[db beginTransaction];
g_database.isQueuingNotifications = YES;

Expand Down Expand Up @@ -1150,7 +1150,7 @@ + (BOOL)vacuumIfPossible

__block BOOL success = NO;
[self inDatabaseSync:^(FMDatabase *db) {
if (db.inTransaction) return;
if (db.isInTransaction) return;
queryProfileStart(@"VACUUM");
[db executeUpdate:@"VACUUM"];
queryProfileEnd();
Expand Down