diff options
| -rw-r--r-- | program/include/rcube_db.php | 23 | ||||
| -rw-r--r-- | program/include/rcube_db_pgsql.php | 24 |
2 files changed, 22 insertions, 25 deletions
diff --git a/program/include/rcube_db.php b/program/include/rcube_db.php index f24e95913..31385d860 100644 --- a/program/include/rcube_db.php +++ b/program/include/rcube_db.php @@ -416,7 +416,6 @@ class rcube_db /** * Get last inserted record ID - * For Postgres databases, a sequence name is required * * @param string $table Table name (to find the incremented sequence) * @@ -808,28 +807,6 @@ class rcube_db } /** - * Return correct name for a specific database sequence - * (used for Postgres only) - * - * @param string $sequence Secuence name - * - * @return string Translated sequence name - */ - public function sequence_name($sequence) - { - $rcube = rcube::get_instance(); - - // return sequence name if configured - $config_key = 'db_sequence_'.$sequence; - - if ($name = $rcube->config->get($config_key)) { - return $name; - } - - return $sequence; - } - - /** * MDB2 DSN string parser * * @param string $sequence Secuence name diff --git a/program/include/rcube_db_pgsql.php b/program/include/rcube_db_pgsql.php index 782fc0ebb..285b8e2d4 100644 --- a/program/include/rcube_db_pgsql.php +++ b/program/include/rcube_db_pgsql.php @@ -33,13 +33,12 @@ class rcube_db_pgsql extends rcube_db { /** * Get last inserted record ID - * For Postgres databases, a table name is required * * @param string $table Table name (to find the incremented sequence) * * @return mixed ID or false on failure */ - public function insert_id($table = '') + public function insert_id($table = null) { if (!$this->db_connected || $this->db_mode == 'r') { return false; @@ -55,6 +54,27 @@ class rcube_db_pgsql extends rcube_db } /** + * Return correct name for a specific database sequence + * + * @param string $sequence Secuence name + * + * @return string Translated sequence name + */ + protected function sequence_name($sequence) + { + $rcube = rcube::get_instance(); + + // return sequence name if configured + $config_key = 'db_sequence_'.$sequence; + + if ($name = $rcube->config->get($config_key)) { + return $name; + } + + return $sequence; + } + + /** * Return SQL statement to convert a field value into a unix timestamp * * This method is deprecated and should not be used anymore due to limitations |