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 | 35 +++++++++++------------------------ 1 files changed, 11 insertions(+), 24 deletions(-) diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist index 12304cd..9bbf7d7 100644 --- a/config/db.inc.php.dist +++ b/config/db.inc.php.dist @@ -5,8 +5,11 @@ | Configuration file for database access | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2009, The Roundcube Dev Team | - | Licensed under the GNU GPL | + | 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. | | | +-----------------------------------------------------------------------+ @@ -28,48 +31,32 @@ // useful for database replication $rcmail_config['db_dsnr'] = ''; -// maximum length of a query in bytes -$rcmail_config['db_max_length'] = 512000; // 500K - // 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_messages'] = 'messages'; - +$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_cache'] = 'cache_ids'; - -$rcmail_config['db_sequence_messages'] = 'message_ids'; - $rcmail_config['db_sequence_searches'] = 'search_ids'; // end db config file - -- Gitblit v1.9.1