From 393618dacb75c55fbf482e9ee5e368b852bfc6e7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 17 Jan 2013 02:35:35 -0500
Subject: [PATCH] Merge branch 'schema_upgrades'

---
 config/db.inc.php.dist |   56 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist
index fb6d2bb..9bbf7d7 100644
--- a/config/db.inc.php.dist
+++ b/config/db.inc.php.dist
@@ -4,9 +4,12 @@
  +-----------------------------------------------------------------------+
  | Configuration file for database access                                |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
- | All rights reserved.                                                  |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
 
@@ -14,33 +17,46 @@
 
 $rcmail_config = array();
 
-// database engine (currently supported: mysql)
-$rcmail_config['db_type'] = 'mysql';
+// PEAR database DSN for read/write operations
+// format is db_provider://user:password@host/database 
+// For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
+// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql or sqlsrv
 
-// database host
-$rcmail_config['db_host'] = 'localhost';
+$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
+// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail';
+// Warning: for SQLite use absolute path in DSN:
+// sqlite example: 'sqlite:////full/path/to/sqlite.db?mode=0646';
 
-// database user
-$rcmail_config['db_user'] = 'roundcube';
+// PEAR database DSN for read only operations (if empty write database will be used)
+// useful for database replication
+$rcmail_config['db_dsnr'] = '';
 
-// pwd
-$rcmail_config['db_pass'] = 'pass';
-
-// database name
-$rcmail_config['db_name'] = 'roundcubemail';
-
+// use persistent db-connections
+// beware this will not "always" work as expected
+// see: http://www.php.net/manual/en/features.persistent-connections.php
+$rcmail_config['db_persistent'] = FALSE;
 
 // you can define specific table names used to store webmail data
 $rcmail_config['db_table_users'] = 'users';
-
 $rcmail_config['db_table_identities'] = 'identities';
-
 $rcmail_config['db_table_contacts'] = 'contacts';
-
+$rcmail_config['db_table_contactgroups'] = 'contactgroups';
+$rcmail_config['db_table_contactgroupmembers'] = 'contactgroupmembers';
 $rcmail_config['db_table_session'] = 'session';
-
 $rcmail_config['db_table_cache'] = 'cache';
+$rcmail_config['db_table_cache_index'] = 'cache_index';
+$rcmail_config['db_table_cache_thread'] = 'cache_thread';
+$rcmail_config['db_table_cache_messages'] = 'cache_messages';
+$rcmail_config['db_table_dictionary'] = 'dictionary';
+$rcmail_config['db_table_searches'] = 'searches';
+$rcmail_config['db_table_system'] = 'system';
+
+// you can define specific sequence names used in PostgreSQL
+$rcmail_config['db_sequence_users'] = 'user_ids';
+$rcmail_config['db_sequence_identities'] = 'identity_ids';
+$rcmail_config['db_sequence_contacts'] = 'contact_ids';
+$rcmail_config['db_sequence_contactgroups'] = 'contactgroups_ids';
+$rcmail_config['db_sequence_searches'] = 'search_ids';
 
 
 // end db config file
-?>

--
Gitblit v1.9.1