Changeset 6b7e8e7 in github

Timestamp:

Aug 4, 2009 4:22:41 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

30341c4

Parents:

dbfceb4

Message:

• Use sequence names only with PostgreSQL (#1486018)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_contacts.php (modified) (1 diff)
• program/include/rcube_mdb2.php (modified) (1 diff)
• program/include/rcube_user.php (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Use sequence names only with PostgreSQL (#1486018)
 - Re-designed User Preferences interface 
 - Fix MS SQL DDL (#1486020)

program/include/rcube_contacts.php

@@ -272 +272 @@
         );
         
-      $insert_id = $this->db->insert_id(get_sequence_name('contacts'));
+      $insert_id = $this->db->insert_id('contacts');
     }
 

program/include/rcube_mdb2.php

@@ -322 +322 @@
    * For Postgres databases, a sequence name is required
    *
-   * @param  string  Sequence name for increment
+   * @param  string  Table name (to find the incremented sequence)
    * @return mixed   ID or FALSE on failure
    * @access public
    */
-  function insert_id($sequence = '')
+  function insert_id($table = '')
     {
     if (!$this->db_handle || $this->db_mode=='r')
       return FALSE;
 
-    $id = $this->db_handle->lastInsertID($sequence);
+    // find sequence name
+    if ($table && $this->db_provider == 'pgsql')
+      $table = get_sequence_name($table);
+
+    $id = $this->db_handle->lastInsertID($table);
     
     return $this->db_handle->isError($id) ? null : $id;

program/include/rcube_user.php

@@ -232 +232 @@
                         array_merge(array($sql), $insert_values));
 
-    return $this->db->insert_id(get_sequence_name('identities'));
+    return $this->db->insert_id('identities');
   }
   
@@ -387 +387 @@
       $_SESSION['language']);
 
-    if ($user_id = $dbh->insert_id(get_sequence_name('users')))
+    if ($user_id = $dbh->insert_id('users'))
     {
       // create rcube_user instance to make plugin hooks work