updateWithKeys now understands multi-column keys

and automatically identifies _which_ columns are the right ones,
so for example 'uri' primary keys don't need to be explicitly set

classes/Managed_DataObject.php

@@ -420,12 +420,16 @@ abstract class Managed_DataObject extends Memcached_DataObject
      * @param DB_DataObject &$orig  Must be "instanceof" $this
      * @param string         $pid   Primary ID column (no escaping is done on column name!)
      */
-    public function updateWithKeys(Managed_DataObject $orig, $pid='id')
+    public function updateWithKeys(Managed_DataObject $orig, $pid=null)
     {
         if (!$orig instanceof $this) {
             throw new ServerException('Tried updating a DataObject with a different class than itself.');
         }
 
+        if ($this->N <1) {
+            throw new ServerException('DataObject must be the result of a query (N>=1) before updateWithKeys()');
+        }
+
         // do it in a transaction
         $this->query('BEGIN');
 
@@ -452,11 +456,23 @@ abstract class Managed_DataObject extends Memcached_DataObject
             return true;
         }
 
-        $qry = sprintf('UPDATE %1$s SET %2$s WHERE %3$s = %4$s',
+        if ($pid === null) {
+            $schema = static::schemaDef();
+            $pid = $schema['primary key'];
+            unset($schema);
+        }
+        $pidWhere = array();
+        foreach((array)$pid as $pidCol) { 
+            $pidWhere[] = sprintf('%1$s = %2$s', $pidCol, $this->_quote($orig->$pidCol));
+        }
+        if (empty($pidWhere)) {
+            throw new ServerException('No primary ID column(s) set for updateWithKeys');
+        }
+
+        $qry = sprintf('UPDATE %1$s SET %2$s WHERE %3$s',
                             common_database_tablename($this->tableName()),
                             implode(', ', $parts),
-                            $pid,
+                            implode(' AND ', $pidWhere));
-                            $this->_quote($orig->$pid));
 
         $result = $this->query($qry);
         if ($result === false) {

plugins/OStatus/classes/HubSub.php

@@ -323,7 +323,7 @@ class HubSub extends Managed_DataObject
                 $orig = clone($this);
                 $this->callback = $httpscallback;
                 $this->hashkey = self::hashkey($this->getTopic(), $this->callback);
-                $this->updateWithKeys($orig, 'hashkey');
+                $this->updateWithKeys($orig);
                 return true;
             }
         }

plugins/OStatus/classes/Ostatus_profile.php

@@ -1853,7 +1853,7 @@ class Ostatus_profile extends Managed_DataObject
         }
 
         common_debug('URIFIX Updating Ostatus_profile URI for '.$orig->uri.' to '.$this->uri);
-        $this->updateWithKeys($orig, 'uri');    // 'uri' is the primary key column
+        $this->updateWithKeys($orig);    // Will use the PID column(s) in the 'UPDATE ... WHERE [unique selector]'
 
         common_debug('URIFIX Subscribing/renewing feedsub for Ostatus_profile '.$this->uri);
         $this->subscribe();

plugins/Oembed/OembedPlugin.php

@@ -305,7 +305,7 @@ class OembedPlugin extends Plugin
         $thumbnail->width = $info[0];    // array indexes documented on php.net:
         $thumbnail->height = $info[1];   // https://php.net/manual/en/function.getimagesize.php
         // Throws exception on failure.
-        $thumbnail->updateWithKeys($orig, 'file_id');
+        $thumbnail->updateWithKeys($orig);
     }
 
     public function onPluginVersion(array &$versions)

plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php

@@ -108,7 +108,7 @@ class StoreRemoteMediaPlugin extends Plugin
             $file->width = $info[0];    // array indexes documented on php.net:
             $file->height = $info[1];   // https://php.net/manual/en/function.getimagesize.php
             // Throws exception on failure.
-            $file->updateWithKeys($orig, 'id');
+            $file->updateWithKeys($orig);
         }
         // Get rid of the file from memory
         unset($imgData);