Merge branch '1.0.x' into activity

[quix0rs-gnu-social.git] / classes / User_im_prefs.php

diff --git a/classes/User_im_prefs.php b/classes/User_im_prefs.php
index 8ecdfe9fab74494d3e29ea1a7069066de872ebce..cc9dea608db7ebd4e479ff91006140f10bd5761f 100644 (file)
--- a/classes/User_im_prefs.php
+++ b/classes/User_im_prefs.php
@@ -29,7 +29,7 @@
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class User_im_prefs extends Memcached_DataObject
+class User_im_prefs extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -56,16 +56,50 @@ class User_im_prefs extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    /*
-    DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function.
-    In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but
-    DB_DataObject's sequenceKey() will incorrectly think it is. Then, since the sequenceKey() is a numeric
-    type, but is not set to autoincrement in the database, DB_DataObject will create a _seq table and
-    manage the sequence itself. This is not the correct behavior for the user_id in this class.
-    So we override that incorrect behavior, and simply say there is no sequence key.
-    */
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false,false);
+        return array(
+            'fields' => array(
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user'),
+                'screenname' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'screenname on this service'),
+                'transport' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'transport (ex xmpp, aim)'),
+                'notify' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
+                'replies' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
+                'microid' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
+                'updatefrompresence' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('user_id', 'transport'),
+            'unique keys' => array(
+                'transport_screenname_key' => array('transport', 'screenname'),
+            ),
+            'foreign keys' => array(
+                'user_im_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+        );
     }
+
+    /**
+     * We have two compound keys with unique constraints:
+     * (transport, user_id) which is our primary key, and
+     * (transport, screenname) which is an additional constraint.
+     * 
+     * Currently there's not a way to represent that second key
+     * in the general keys list, so we're adding it here to the
+     * list of keys to use for caching, ensuring that it gets
+     * cleared as well when we change.
+     * 
+     * @return array of cache keys
+     */
+    function _allCacheKeys()
+    {
+        $ukeys = 'transport,screenname';
+        $uvals = $this->transport . ',' . $this->screenname;
+
+        $ckeys = parent::_allCacheKeys();
+        $ckeys[] = $this->cacheKey($this->tableName(), $ukeys, $uvals);
+        return $ckeys;
+    }
+
 }