From 4faf0cd6df8f67b260a02e0f28b6d59df5979d6d Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 26 Jul 2005 21:37:39 +0000 Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/trunk@914 d1b88da0-ebda-0310-925b-ed51d893ca5b --- OGoContentStore/ChangeLog | 4 ++++ OGoContentStore/Version | 2 +- OGoContentStore/sql/folderinfo-create.sqlite | 2 +- OGoContentStore/sql/foldertablecreate-helge-privcal.sqlite | 1 + .../sql/generate-folderinfo-sql-for-users-sqlite.sh | 1 + .../sql/generate-folderinfo-sql-for-users-sqlite1table.sh | 1 + SoObjects/Mailer/SOGoMailFolder.m | 3 ++- 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog index bbc10df0..40fb3495 100644 --- a/OGoContentStore/ChangeLog +++ b/OGoContentStore/ChangeLog @@ -1,3 +1,7 @@ +2005-07-26 Helge Hess + + * sql: added missing priority quickfield to SQLite tables (v0.9.31) + 2005-07-13 Helge Hess * OCSContactFieldExtractor.m: do not crash if the content is not a diff --git a/OGoContentStore/Version b/OGoContentStore/Version index ae2cbb06..b33046f8 100644 --- a/OGoContentStore/Version +++ b/OGoContentStore/Version @@ -2,7 +2,7 @@ MAJOR_VERSION=0 MINOR_VERSION=9 -SUBMINOR_VERSION:=30 +SUBMINOR_VERSION:=31 # v0.9.30 requires libNGiCal v4.5.48 # v0.9.26 requires libGDLContentStore v4.5.26 diff --git a/OGoContentStore/sql/folderinfo-create.sqlite b/OGoContentStore/sql/folderinfo-create.sqlite index c96e09ae..cb5e5854 100644 --- a/OGoContentStore/sql/folderinfo-create.sqlite +++ b/OGoContentStore/sql/folderinfo-create.sqlite @@ -4,7 +4,7 @@ -- TODO: -- add a unique constraints on path -DROP TABLE SOGo_folder_info; +-- DROP TABLE SOGo_folder_info; CREATE TABLE SOGo_folder_info ( c_folder_id INTEGER PRIMARY KEY, diff --git a/OGoContentStore/sql/foldertablecreate-helge-privcal.sqlite b/OGoContentStore/sql/foldertablecreate-helge-privcal.sqlite index ed208274..4b324bbe 100644 --- a/OGoContentStore/sql/foldertablecreate-helge-privcal.sqlite +++ b/OGoContentStore/sql/foldertablecreate-helge-privcal.sqlite @@ -19,6 +19,7 @@ CREATE TABLE SOGo_helge_privcal_quick ( ispublic INT NOT NULL, status INT NOT NULL, isopaque INT NULL, + priority INT NOT NULL, -- for marking high prio apts location VARCHAR(256) NULL, orgmail VARCHAR(256) NULL, partmails VARCHAR(100000) NOT NULL, /* the emails of the participants */ diff --git a/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite.sh b/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite.sh index 00b49f5a..19b702c3 100755 --- a/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite.sh +++ b/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite.sh @@ -70,6 +70,7 @@ CREATE TABLE SOGo_${USER_TABLE}_privcal_quick ( ispublic INT NOT NULL, status INT NOT NULL, isopaque INT NULL, + priority INT NOT NULL, -- for marking high prio apts location VARCHAR(256) NULL, orgmail VARCHAR(256) NULL, partmails VARCHAR(100000) NOT NULL, /* the emails of the participants */ diff --git a/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite1table.sh b/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite1table.sh index e56568b1..3b1a7a96 100755 --- a/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite1table.sh +++ b/OGoContentStore/sql/generate-folderinfo-sql-for-users-sqlite1table.sh @@ -75,6 +75,7 @@ CREATE TABLE SOGo_${USER_TABLE}_privcal ( iscycle INT NULL, /* client needs to fetch to resolve */ ispublic INT NOT NULL, status INT NOT NULL, + priority INT NOT NULL, -- for marking high prio apts isopaque INT NULL, location VARCHAR(256) NULL, orgmail VARCHAR(256) NULL, diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index 429554a8..4222e951 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -285,13 +285,14 @@ static BOOL useAltNamespace = NO; - (id)lookupName:(NSString *)_key inContext:(id)_ctx acquire:(BOOL)_acquire { id obj; - if ([self isMessageKey:_key inContext:_ctx]) + if ([self isMessageKey:_key inContext:_ctx]) { /* We assume here that _key is a number and methods are not and this is moved above the super lookup since the super checks the -toOneRelationshipKeys which in turn loads the message ids. */ return [self lookupImap4Message:_key inContext:_ctx]; + } /* check attributes directly bound to the app */ if ((obj = [super lookupName:_key inContext:_ctx acquire:NO])) -- 2.39.5