amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-07 14:28:52 +00:00
Code Issues Projects Releases Wiki Activity

merge of '8e433a63a6503dd3c80bf9a1462fdf7fe56d4c09'

Browse Source 
and 'f66f0fe4d0c10d1b3986e47a08b0ce8c08736f3c'

Monotone-Parent: 8e433a63a6503dd3c80bf9a1462fdf7fe56d4c09
Monotone-Parent: f66f0fe4d0c10d1b3986e47a08b0ce8c08736f3c
Monotone-Revision: 05f7c7299403692e01480ce30ae2a612e6172f84

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-26T14:48:18
This commit is contained in:
Francis Lachapelle
2012-01-26 14:48:18 +00:00
parent 455cc7d692 222f0fe21e
commit aefadd691d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2012-01-25 Ludovic Marcotte <lmarcotte@inverse.ca>
* SOPE/GDLContentStore/GCSFolder.m - we now use the proper
method to determine column types, avoiding the generation
of broken UPDATE statements on MySQL when snoozing alarms.
2012-01-24 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxCalFolderActions.m (-importAction): failback to

4
SOPE/GDLContentStore/GCSFolder.m
View File

@@ -832,7 +832,7 @@ andAttribute: (EOAttribute *)_attribute
EOSQLQualifier *qualifier;
EOAttribute *attribute1, *attribute2;
attribute1 = [_entity attributeNamed: _colname];
attribute1 = [self _attributeForColumn: _colname];
if (_colname2 == nil)
{
qualifier = [[EOSQLQualifier alloc] initWithEntity: _entity
@@ -842,7 +842,7 @@ andAttribute: (EOAttribute *)_attribute
}
else
{
attribute2 = [_entity attributeNamed: _colname2];
attribute2 = [self _attributeForColumn: _colname2];
qualifier = [[EOSQLQualifier alloc] initWithEntity: _entity
qualifierFormat: @"%A = %@ AND %A = %@",
_colname,