- better postgresql sequence names handling

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

2 files changed, 2 insertions, 10 deletions

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index ee847470b..0214d32f1 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -74,17 +74,7 @@ function get_sequence_name($sequence)
   $opt = rcmail::get_instance()->config->get($config_key);
 
   if (!empty($opt))
-    {
-    $db = &rcmail::get_instance()->db;
-    
-    if ($db->db_provider=='pgsql')
-      {
-      $db->db_handle->setOption('disable_smart_seqname', true);
-      $db->db_handle->setOption('seqname_format', '%s');
-      }
-  
     return $opt;
-    }
     
   return $sequence;
   }
diff --git a/roundcubemail/program/include/rcube_mdb2.php b/roundcubemail/program/include/rcube_mdb2.php
index 0588256e7..2deaa416d 100644
--- a/roundcubemail/program/include/rcube_mdb2.php
+++ b/roundcubemail/program/include/rcube_mdb2.php
@@ -83,6 +83,8 @@ class rcube_mdb2
         'emulate_prepared' => $this->debug_mode,
         'debug' => $this->debug_mode,
         'debug_handler' => 'mdb2_debug_handler',
+	'disable_smart_seqname' => true, 	// for postgresql
+	'seqname_format' => '%s',		// for postgresql
         'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL));
 
     if (MDB2::isError($dbh))