LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #197 from zentyal/jvalles/revert-content-as-blob-master

Browse source 
Revert "Store c_content in sogo_cache_folder as a BLOB"
This commit is contained in:
Jesús García Sáez 2015-10-16 12:43:14 +02:00
parent fb7e044bd3 498cec767b
commit a50758cc06
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SoObjects/SOGo/GCSSpecialQueries+SOGoCacheObject.m
View file

@ -57,7 +57,7 @@
@" c_lastmodified INT4 NOT NULL,"
@" c_version INT4 NOT NULL DEFAULT 0,"
@" c_deleted SMALLINT NOT NULL DEFAULT 0,"
@" c_content BYTEA)");
@" c_content TEXT)");
return [NSString stringWithFormat: sqlFolderFormat, tableName];
}
@ -77,7 +77,7 @@
@" c_lastmodified INT NOT NULL,"
@" c_version INT NOT NULL DEFAULT 0,"
@" c_deleted TINYINT NOT NULL DEFAULT 0,"
@" c_content BLOB)");
@" c_content LONGTEXT)");
return [NSString stringWithFormat: sqlFolderFormat, tableName];
}
@ -97,7 +97,7 @@
@" c_lastmodified INT4 NOT NULL,"
@" c_version INT4 NOT NULL DEFAULT 0,"
@" c_deleted SMALLINT NOT NULL DEFAULT 0,"
@" c_content BLOB)");
@" c_content CLOB)");
return [NSString stringWithFormat: sqlFolderFormat, tableName];
}

8
SoObjects/SOGo/SOGoCacheGCSObject.m
View file

@ -152,7 +152,7 @@ static EOAttribute *textColumn = nil;
- (void) setupFromRecord: (NSDictionary *) record
{
NSInteger intValue;
NSData *content;
NSString *propsValue;
NSDictionary *newValues;
objectType = [[record objectForKey: @"c_type"] intValue];
@ -166,10 +166,10 @@ static EOAttribute *textColumn = nil;
dateWithTimeIntervalSince1970: (NSTimeInterval) intValue]);
deleted = ([[record objectForKey: @"c_deleted"] intValue] > 0);
version = [[record objectForKey: @"c_version"] intValue];
content = [record objectForKey: @"c_content"];
if ([content isNotNull])
propsValue = [record objectForKey: @"c_content"];
if ([propsValue isNotNull])
{
newValues = [[content dataByDecodingBase64] BSONValue];
newValues = [[propsValue dataByDecodingBase64] BSONValue];
[properties addEntriesFromDictionary: newValues];
}
else