From 222f0fe21e072a70068f7e4ee31c73f36a8db6f6 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 25 Jan 2012 20:26:30 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: d56dcfcfa2ad9eaeb548182071e486328b8a3cce Monotone-Revision: f66f0fe4d0c10d1b3986e47a08b0ce8c08736f3c Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-01-25T20:26:30 --- ChangeLog | 6 ++++++ SOPE/GDLContentStore/GCSFolder.m | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 586fefd00..597d2403b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-25 Ludovic Marcotte + + * 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 * UI/Scheduler/UIxCalFolderActions.m (-importAction): failback to diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m index 51a931f7f..8361ca683 100644 --- a/SOPE/GDLContentStore/GCSFolder.m +++ b/SOPE/GDLContentStore/GCSFolder.m @@ -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,