[Svn] r1956 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Tue Oct 7 21:18:14 CEST 2008


Author: alec
Date: 2008-10-07 14:18:14 -0500 (Tue, 07 Oct 2008)
New Revision: 1956

Modified:
   trunk/roundcubemail/program/include/main.inc
   trunk/roundcubemail/program/include/rcube_mdb2.php
Log:
- better postgresql sequence names handling


Modified: trunk/roundcubemail/program/include/main.inc
===================================================================
--- trunk/roundcubemail/program/include/main.inc	2008-10-07 19:11:06 UTC (rev 1955)
+++ trunk/roundcubemail/program/include/main.inc	2008-10-07 19:18:14 UTC (rev 1956)
@@ -74,17 +74,7 @@
   $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;
   }

Modified: trunk/roundcubemail/program/include/rcube_mdb2.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_mdb2.php	2008-10-07 19:11:06 UTC (rev 1955)
+++ trunk/roundcubemail/program/include/rcube_mdb2.php	2008-10-07 19:18:14 UTC (rev 1956)
@@ -83,6 +83,8 @@
         '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))

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list