summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-10-07 19:18:14 +0000
committeralecpl <alec@alec.pl>2008-10-07 19:18:14 +0000
commitaf7a23d9d9fb983c4cacb7e4696eba904ecc537e (patch)
tree23f1f22c919dcf0f91aa40ae2662888927ea45f9
parent06c3d10556726e1d822e5993ce8aaa74ce689f58 (diff)
- better postgresql sequence names handling
-rw-r--r--program/include/main.inc10
-rw-r--r--program/include/rcube_mdb2.php2
2 files changed, 2 insertions, 10 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index ee847470b..0214d32f1 100644
--- a/program/include/main.inc
+++ b/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/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php
index 0588256e7..2deaa416d 100644
--- a/program/include/rcube_mdb2.php
+++ b/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))