From 399db1b647e14947e97a865c09215969f56a7efe Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 27 Apr 2013 12:31:40 -0400
Subject: [PATCH] Add db_prefix configuration option in place of db_table_*/db_sequence_* options Make possible to use db_prefix for schema initialization in Installer (#1489067) Fix updatedb.sh script so it recognizes also table prefix for external DDL files

---
 config/db.inc.php.dist |   47 ++++++++---------------------------------------
 1 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist
index 30502cc..17a273a 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-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
 
@@ -28,46 +31,12 @@
 // 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';
-
-
-// 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';
-
+// you can define specific table (and sequence) names prefix
+$rcmail_config['db_prefix'] = '';
 
 // end db config file
-?>

--
Gitblit v1.9.1