- fixed problem with postgresql sequences (after MDB2 drivers update)

git-svn-id: https://svn.roundcube.net/trunk@1378 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 13 insertions, 4 deletions

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index b436f8295..596079124 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -69,14 +69,23 @@ function get_table_name($table)
  */
 function get_sequence_name($sequence)
   {
-  global $CONFIG;
-
   // return table name if configured
   $config_key = 'db_sequence_'.$sequence;
+  $opt = rcmail::get_instance()->config->get($config_key);
 
-  if (strlen($CONFIG[$config_key]))
-    return $CONFIG[$config_key];
+  if (!empty($opt))
+    {
+    $db = &rcmail::get_instance()->db;
 
+    if($db->db_provider=='pgsql') // just for sure
+      {
+      $db->db_handle->setOption('disable_smart_seqname', true);
+      $db->db_handle->setOption('seqname_format', '%s');
+      }	      
+  
+    return $CONFIG[$opt];
+    }
+    
   return $sequence;
   }