Remove sequenceKey() since we now use Managed_DataObject

diff --git a/classes/Confirm_address.php b/classes/Confirm_address.php
index 7f59cab430d9cd392c06e768eecf34a5948f20c0..056df836fc96586b45370af22753a183f835d087 100644 (file)
--- a/classes/Confirm_address.php
+++ b/classes/Confirm_address.php
@@ -26,9 +26,6 @@ class Confirm_address extends Managed_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
-    { return array(false, false); }
-
     public static function schemaDef()
     {
         return array(

diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index 56afdde19724c280cf41e26c40b0578f8c93cdd2..ae46e61bd489a248b091959e0de71a3275ea8073 100644 (file)
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -79,11 +79,6 @@ class File_oembed extends Managed_DataObject
         );
     }
 
-    function sequenceKey()
-    {
-        return array(false, false, false);
-    }
-
     function _getOembed($url) {
         $parameters = array(
             'maxwidth' => common_config('attachments', 'thumb_width'),

diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 1adcd91987fefcdca81b0ce2e6801704fa2c477a..064b454e2dd2a314d390d01b30883b858b6ee72c 100644 (file)
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -63,11 +63,6 @@ class File_thumbnail extends Managed_DataObject
         );
     }
 
-    function sequenceKey()
-    {
-        return array(false, false, false);
-    }
-
     /**
      * Save oEmbed-provided thumbnail data
      *

diff --git a/classes/Inbox.php b/classes/Inbox.php
index 6ba40df224f91f7c0e9a6ba4e3f78c5e86440f42..c618ff7acad0583b6c1e92b440926ed3099ee00b 100644 (file)
--- a/classes/Inbox.php
+++ b/classes/Inbox.php
@@ -61,11 +61,6 @@ class Inbox extends Managed_DataObject
         );
     }
 
-    function sequenceKey()
-    {
-        return array(false, false, false);
-    }
-
     /**
      * Create a new inbox from existing Notice_inbox stuff
      */

diff --git a/classes/Login_token.php b/classes/Login_token.php
index 3733af66cf6baafe56bb13f6ffe4797cc50a78f5..7049c7c7fee651c94e510711d284aac325ca9e5d 100644 (file)
--- a/classes/Login_token.php
+++ b/classes/Login_token.php
@@ -58,19 +58,6 @@ class Login_token extends Managed_DataObject
 
     const TIMEOUT = 120; // seconds after which to timeout the token
 
-    /*
-    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()
-    {
-        return array(false,false);
-    }
-
     function makeNew($user)
     {
         $login_token = Login_token::staticGet('user_id', $user->id);

diff --git a/classes/Remember_me.php b/classes/Remember_me.php
index ceac1553471f1d3d8ecee8ca5e3cb3fb242eca5b..6523ad81747531f2deb9bb5096ecf661030df487 100644 (file)
--- a/classes/Remember_me.php
+++ b/classes/Remember_me.php
@@ -23,11 +23,6 @@ class Remember_me extends Managed_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
-    {
-        return array(false, false);
-    }
-
     public static function schemaDef()
     {
         return array(

diff --git a/classes/User_im_prefs.php b/classes/User_im_prefs.php
index 00b4e65c15cab3eb86a8fa51359de8b027d363ea..cc9dea608db7ebd4e479ff91006140f10bd5761f 100644 (file)
--- a/classes/User_im_prefs.php
+++ b/classes/User_im_prefs.php
@@ -80,19 +80,6 @@ class User_im_prefs extends Managed_DataObject
         );
     }
 
-    /*
-    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()
-    {
-        return array(false,false);
-    }
-
     /**
      * We have two compound keys with unique constraints:
      * (transport, user_id) which is our primary key, and