From d49645882237af1dd1decd2f236129c07ac4fa8d Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 23 Apr 2007 15:05:45 +0000
Subject: [PATCH] Monotone-Parent: 321895620e6004eb8531368e2dcdf24c7b8313fe
 Monotone-Revision: 57460c0d603329bd97af00dc5d497ed44b731d76

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-04-23T15:05:45
Monotone-Branch: ca.inverse.sogo
---
 OGoContentStore/sql/generate-folderinfo-sql-for-users.sh | 7 +++----
 OGoContentStore/sql/profile-create.psql                  | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/OGoContentStore/sql/generate-folderinfo-sql-for-users.sh b/OGoContentStore/sql/generate-folderinfo-sql-for-users.sh
index 0868d1915..5190b2fa3 100755
--- a/OGoContentStore/sql/generate-folderinfo-sql-for-users.sh
+++ b/OGoContentStore/sql/generate-folderinfo-sql-for-users.sh
@@ -152,12 +152,11 @@ DELETE FROM SOGo_user_profile WHERE uid = '${USER_ID}';
 
 INSERT INTO SOGo_user_profile ( 
   uid,
-  allowinternet,
-  timezonename,
-  calendaruids
+  defaults,
+  settings
 )
 VALUES (
-    '${USER_ID}', 1, '${TIMEZONE}', '${USER_ID}'
+    '${USER_ID}', '{}', '{}'
 );
 
 EOF
diff --git a/OGoContentStore/sql/profile-create.psql b/OGoContentStore/sql/profile-create.psql
index b60cabbff..5bc853129 100644
--- a/OGoContentStore/sql/profile-create.psql
+++ b/OGoContentStore/sql/profile-create.psql
@@ -3,9 +3,7 @@
 --
 
 CREATE TABLE SOGo_user_profile (
-  uid           VARCHAR(255) NOT NULL PRIMARY KEY,
-  allowinternet SMALLINT     DEFAULT 0,
-  timezonename  VARCHAR(255) DEFAULT 'MET',
-  calendaruids  TEXT,
-  additionaladdressbooks  TEXT
+  uid      VARCHAR(255) NOT NULL PRIMARY KEY,
+  defaults TEXT,
+  settings TEXT
 );