From 1a9a8ea73032b0ded09a8ea9a4c0511401507090 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 12 Aug 2013 19:46:44 +0200
Subject: [PATCH] staticGet for sub-Managed_DataObject classes now calls parent

The parent class for our database objects, Managed_DataObject, has a
dynamically assigned class in staticGet which objects get put into,
leaving us with less code to do the same thing.

We will probably have to move away from the DB_DataObject 'staticGet'
call as it is nowadays deprecated.
---
 classes/Avatar.php                   | 4 ----
 classes/Config.php                   | 3 ---
 classes/Confirm_address.php          | 4 ----
 classes/Consumer.php                 | 4 ----
 classes/Conversation.php             | 3 ---
 classes/Deleted_notice.php           | 3 ---
 classes/Fave.php                     | 4 ----
 classes/File.php                     | 3 ---
 classes/File_oembed.php              | 3 ---
 classes/File_redirection.php         | 3 ---
 classes/File_thumbnail.php           | 3 ---
 classes/File_to_post.php             | 3 ---
 classes/Foreign_link.php             | 4 ----
 classes/Foreign_service.php          | 4 ----
 classes/Foreign_subscription.php     | 4 ----
 classes/Foreign_user.php             | 3 ---
 classes/Group_alias.php              | 3 ---
 classes/Group_block.php              | 3 ---
 classes/Group_inbox.php              | 4 ----
 classes/Group_join_queue.php         | 4 ----
 classes/Group_member.php             | 3 ---
 classes/Inbox.php                    | 3 ---
 classes/Invitation.php               | 4 ----
 classes/Local_group.php              | 3 ---
 classes/Location_namespace.php       | 5 -----
 classes/Login_token.php              | 3 ---
 classes/Message.php                  | 3 ---
 classes/Nonce.php                    | 3 ---
 classes/Notice.php                   | 6 ------
 classes/Notice_inbox.php             | 4 ----
 classes/Notice_source.php            | 4 ----
 classes/Notice_tag.php               | 4 ----
 classes/Oauth_application.php        | 4 ----
 classes/Oauth_application_user.php   | 4 ----
 classes/Oauth_token_association.php  | 4 ----
 classes/Profile.php                  | 5 -----
 classes/Profile_block.php            | 4 ----
 classes/Profile_list.php             | 3 ---
 classes/Profile_role.php             | 3 ---
 classes/Profile_tag.php              | 4 ----
 classes/Profile_tag_subscription.php | 4 ----
 classes/Queue_item.php               | 4 ----
 classes/Related_group.php            | 3 ---
 classes/Remember_me.php              | 6 ------
 classes/Remote_profile.php           | 4 ----
 classes/Reply.php                    | 4 ----
 classes/Schema_version.php           | 4 ----
 classes/Session.php                  | 3 ---
 classes/Sms_carrier.php              | 4 ----
 classes/Subscription.php             | 4 ----
 classes/Subscription_queue.php       | 4 ----
 classes/Token.php                    | 4 ----
 classes/User.php                     | 3 ---
 classes/User_group.php               | 5 -----
 classes/User_im_prefs.php            | 3 ---
 classes/User_location_prefs.php      | 3 ---
 classes/User_urlshortener_prefs.php  | 3 ---
 classes/User_username.php            | 6 ------
 58 files changed, 216 deletions(-)

diff --git a/classes/Avatar.php b/classes/Avatar.php
index d871d360b6..6a5aaa3f8c 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -20,10 +20,6 @@ class Avatar extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Avatar',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Config.php b/classes/Config.php
index bd191486cb..48dd6f38d4 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -37,9 +37,6 @@ class Config extends Managed_DataObject
     public $setting;                         // varchar(32)  primary_key not_null
     public $value;                           // varchar(255)
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Config',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Confirm_address.php b/classes/Confirm_address.php
index 056df836fc..0ed7796ad4 100644
--- a/classes/Confirm_address.php
+++ b/classes/Confirm_address.php
@@ -19,10 +19,6 @@ class Confirm_address extends Managed_DataObject
     public $sent;                            // datetime()  
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Confirm_address',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Consumer.php b/classes/Consumer.php
index 1d32d853bd..01bde457e5 100644
--- a/classes/Consumer.php
+++ b/classes/Consumer.php
@@ -16,10 +16,6 @@ class Consumer extends Managed_DataObject
     public $created;                         // datetime   not_null
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Consumer',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Conversation.php b/classes/Conversation.php
index 4bad474c73..547a553d3b 100755
--- a/classes/Conversation.php
+++ b/classes/Conversation.php
@@ -40,9 +40,6 @@ class Conversation extends Managed_DataObject
     public $created;                         // datetime   not_null
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('conversation',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Deleted_notice.php b/classes/Deleted_notice.php
index d3f9c0bf7c..4c17be185a 100644
--- a/classes/Deleted_notice.php
+++ b/classes/Deleted_notice.php
@@ -38,9 +38,6 @@ class Deleted_notice extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $deleted;                         // datetime()   not_null
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Deleted_notice',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Fave.php b/classes/Fave.php
index 455e7b089c..9a14036cae 100644
--- a/classes/Fave.php
+++ b/classes/Fave.php
@@ -15,10 +15,6 @@ class Fave extends Managed_DataObject
     public $uri;                             // varchar(255)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Fave',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/File.php b/classes/File.php
index f3940346b3..0f65fdb0a6 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -45,9 +45,6 @@ class File extends Managed_DataObject
     public $filename;                        // varchar(255)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index 9f5691b9ca..7ef1b7cde6 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -47,9 +47,6 @@ class File_oembed extends Managed_DataObject
     public $url;                             // varchar(255)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File_oembed',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index a2b2bfad01..321a0b751f 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -39,9 +39,6 @@ class File_redirection extends Managed_DataObject
     public $httpcode;                        // int(4)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File_redirection',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 6b3c0b0255..7d62c405d2 100644
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -37,9 +37,6 @@ class File_thumbnail extends Managed_DataObject
     public $height;                          // int(4)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File_thumbnail',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/File_to_post.php b/classes/File_to_post.php
index 1a887a7c18..35d1a0dd54 100644
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -35,9 +35,6 @@ class File_to_post extends Managed_DataObject
     public $post_id;                         // int(4)  primary_key not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File_to_post',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Foreign_link.php b/classes/Foreign_link.php
index e3f0cf1ee6..44ccd63ae4 100644
--- a/classes/Foreign_link.php
+++ b/classes/Foreign_link.php
@@ -22,10 +22,6 @@ class Foreign_link extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Foreign_link',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Foreign_service.php b/classes/Foreign_service.php
index 8ba73521c1..df9fd5825d 100644
--- a/classes/Foreign_service.php
+++ b/classes/Foreign_service.php
@@ -16,10 +16,6 @@ class Foreign_service extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Foreign_service',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Foreign_subscription.php b/classes/Foreign_subscription.php
index 99bf3868b5..65f5d693a2 100644
--- a/classes/Foreign_subscription.php
+++ b/classes/Foreign_subscription.php
@@ -15,10 +15,6 @@ class Foreign_subscription extends Managed_DataObject
     public $subscribed;                      // int(4)  primary_key not_null
     public $created;                         // datetime()   not_null
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Foreign_subscription',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Foreign_user.php b/classes/Foreign_user.php
index 4a41e07f4d..ec36dc3423 100644
--- a/classes/Foreign_user.php
+++ b/classes/Foreign_user.php
@@ -17,9 +17,6 @@ class Foreign_user extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Foreign_user',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Group_alias.php b/classes/Group_alias.php
index fcf5405547..5a70c1c9ae 100644
--- a/classes/Group_alias.php
+++ b/classes/Group_alias.php
@@ -33,9 +33,6 @@ class Group_alias extends Managed_DataObject
     public $group_id;                        // int(4)   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Group_alias',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Group_block.php b/classes/Group_block.php
index dc439ba774..a3a232c80d 100644
--- a/classes/Group_block.php
+++ b/classes/Group_block.php
@@ -34,9 +34,6 @@ class Group_block extends Managed_DataObject
     public $blocker;                         // int(4)   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Group_block',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Group_inbox.php b/classes/Group_inbox.php
index fe600cbaf8..a2f0879a6d 100644
--- a/classes/Group_inbox.php
+++ b/classes/Group_inbox.php
@@ -13,10 +13,6 @@ class Group_inbox extends Managed_DataObject
     public $notice_id;                       // int(4)  primary_key not_null
     public $created;                         // datetime()   not_null
 
-    /* Static get */
-
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Group_inbox',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Group_join_queue.php b/classes/Group_join_queue.php
index 7df71ed042..66137523f1 100644
--- a/classes/Group_join_queue.php
+++ b/classes/Group_join_queue.php
@@ -14,10 +14,6 @@ class Group_join_queue extends Managed_DataObject
     public $group_id;
     public $created;
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Group_join_queue',$k,$v); }
-
     /* Pkey get */
     function pkeyGet($k)
     { return Memcached_DataObject::pkeyGet('Group_join_queue',$k); }
diff --git a/classes/Group_member.php b/classes/Group_member.php
index d51aa9ff9c..390651e901 100644
--- a/classes/Group_member.php
+++ b/classes/Group_member.php
@@ -16,9 +16,6 @@ class Group_member extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Group_member',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Inbox.php b/classes/Inbox.php
index c618ff7aca..630ed3ac41 100644
--- a/classes/Inbox.php
+++ b/classes/Inbox.php
@@ -41,9 +41,6 @@ class Inbox extends Managed_DataObject
     public $user_id;                         // int(4)  primary_key not_null
     public $notice_ids;                      // blob
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Inbox',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Invitation.php b/classes/Invitation.php
index ae34a31023..a40bd0f330 100644
--- a/classes/Invitation.php
+++ b/classes/Invitation.php
@@ -17,10 +17,6 @@ class Invitation extends Managed_DataObject
     public $registered_user_id;              // int(4)   not_null
     public $created;                         // datetime()   not_null
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Invitation',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Local_group.php b/classes/Local_group.php
index b895103d16..9136c461ba 100644
--- a/classes/Local_group.php
+++ b/classes/Local_group.php
@@ -14,9 +14,6 @@ class Local_group extends Managed_DataObject
     public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Local_group',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Location_namespace.php b/classes/Location_namespace.php
index 7e12447a41..3690ecc044 100644
--- a/classes/Location_namespace.php
+++ b/classes/Location_namespace.php
@@ -36,11 +36,6 @@ class Location_namespace extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) {
-        return Memcached_DataObject::staticGet('Location_namespace',$k,$v);
-    }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Login_token.php b/classes/Login_token.php
index 7049c7c7fe..77558c786c 100644
--- a/classes/Login_token.php
+++ b/classes/Login_token.php
@@ -34,9 +34,6 @@ class Login_token extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Login_token',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Message.php b/classes/Message.php
index 7fe626ec57..3986836836 100644
--- a/classes/Message.php
+++ b/classes/Message.php
@@ -21,9 +21,6 @@ class Message extends Managed_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
     public $source;                          // varchar(32)
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Message',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Nonce.php b/classes/Nonce.php
index 0cd9967a08..9d8dfece04 100644
--- a/classes/Nonce.php
+++ b/classes/Nonce.php
@@ -17,9 +17,6 @@ class Nonce extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Nonce',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Notice.php b/classes/Notice.php
index 462ce8b53c..0200601a9d 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -76,12 +76,6 @@ class Notice extends Managed_DataObject
     public $object_type;                     // varchar(255)
     public $scope;                           // int(4)
 
-    /* Static get */
-    function staticGet($k,$v=NULL)
-    {
-        return Memcached_DataObject::staticGet('Notice',$k,$v);
-    }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index dcaf2f33b1..68bea196f2 100644
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -42,10 +42,6 @@ class Notice_inbox extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $source;                          // tinyint(1)   default_1
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Notice_inbox',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Notice_source.php b/classes/Notice_source.php
index a6649f5fba..6f3d2e5634 100644
--- a/classes/Notice_source.php
+++ b/classes/Notice_source.php
@@ -16,10 +16,6 @@ class Notice_source extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Notice_source',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index b9cbcd1069..663efe7b80 100644
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -29,10 +29,6 @@ class Notice_tag extends Managed_DataObject
     public $notice_id;                       // int(4)  primary_key not_null
     public $created;                         // datetime()   not_null
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Notice_tag',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php
index 15faffe2fb..3bc66f0e28 100644
--- a/classes/Oauth_application.php
+++ b/classes/Oauth_application.php
@@ -25,10 +25,6 @@ class Oauth_application extends Managed_DataObject
     public $created;                         // datetime   not_null
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) {
-    return Memcached_DataObject::staticGet('Oauth_application',$k,$v);
-    }
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php
index 4d25672465..007e4d1db6 100644
--- a/classes/Oauth_application_user.php
+++ b/classes/Oauth_application_user.php
@@ -17,10 +17,6 @@ class Oauth_application_user extends Managed_DataObject
     public $created;                         // datetime   not_null
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) {
-        return Memcached_DataObject::staticGet('Oauth_application_user',$k,$v);
-    }
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Oauth_token_association.php b/classes/Oauth_token_association.php
index 17327d4b01..ec5eae3064 100644
--- a/classes/Oauth_token_association.php
+++ b/classes/Oauth_token_association.php
@@ -16,10 +16,6 @@ class Oauth_token_association extends Managed_DataObject
     public $created;                         // datetime   not_null
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k, $v = NULL) {
-        return Memcached_DataObject::staticGet('oauth_token_association', $k, $v);
-    }
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Profile.php b/classes/Profile.php
index 8a5be5f358..4f631acf40 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -44,11 +44,6 @@ class Profile extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) {
-        return Memcached_DataObject::staticGet('Profile',$k,$v);
-    }
-
     public static function schemaDef()
     {
         $def = array(
diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 8506283462..b2708d564c 100644
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -35,10 +35,6 @@ class Profile_block extends Managed_DataObject
     public $blocked;                         // int(4)  primary_key not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Profile_list.php b/classes/Profile_list.php
index 27001978b6..9bf66745c2 100644
--- a/classes/Profile_list.php
+++ b/classes/Profile_list.php
@@ -48,9 +48,6 @@ class Profile_list extends Managed_DataObject
     public $tagged_count;                    // smallint
     public $subscriber_count;                // smallint
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_list',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Profile_role.php b/classes/Profile_role.php
index 61ec9ba9df..c753d1aed4 100644
--- a/classes/Profile_role.php
+++ b/classes/Profile_role.php
@@ -37,9 +37,6 @@ class Profile_role extends Managed_DataObject
     public $role;                            // varchar(32)  primary_key not_null
     public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_role',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Profile_tag.php b/classes/Profile_tag.php
index 75cca8c22c..9970f14fc7 100644
--- a/classes/Profile_tag.php
+++ b/classes/Profile_tag.php
@@ -15,10 +15,6 @@ class Profile_tag extends Managed_DataObject
     public $tag;                             // varchar(64)  primary_key not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Profile_tag',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Profile_tag_subscription.php b/classes/Profile_tag_subscription.php
index ce4a57e870..ab2ceed73b 100644
--- a/classes/Profile_tag_subscription.php
+++ b/classes/Profile_tag_subscription.php
@@ -15,10 +15,6 @@ class Profile_tag_subscription extends Managed_DataObject
     public $created;                                // datetime   not_null default_0000-00-00%2000%3A00%3A00
     public $modified;                               // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Profile_tag_subscription',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index e34a89d2e3..c61c17deb5 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -15,10 +15,6 @@ class Queue_item extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $claimed;                         // datetime()
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Related_group.php b/classes/Related_group.php
index 67d6ce3fc7..186ee9754b 100644
--- a/classes/Related_group.php
+++ b/classes/Related_group.php
@@ -13,9 +13,6 @@ class Related_group extends Managed_DataObject
     public $related_group_id;                // int(4)  primary_key not_null
     public $created;                         // datetime()   not_null
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Related_group',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Remember_me.php b/classes/Remember_me.php
index 6523ad8174..ab74844abd 100644
--- a/classes/Remember_me.php
+++ b/classes/Remember_me.php
@@ -14,12 +14,6 @@ class Remember_me extends Managed_DataObject
     public $user_id;                         // int(4)   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    {
-        return Memcached_DataObject::staticGet('Remember_me',$k,$v);
-    }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index d59f97ada7..9e30d8b907 100644
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -37,10 +37,6 @@ class Remote_profile extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Remote_profile',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Reply.php b/classes/Reply.php
index f2c308fac4..1f3ed208d9 100644
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -15,10 +15,6 @@ class Reply extends Managed_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
     public $replied_id;                      // int(4)
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Reply',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Schema_version.php b/classes/Schema_version.php
index 4a3f939e93..6dc08dbfce 100644
--- a/classes/Schema_version.php
+++ b/classes/Schema_version.php
@@ -13,10 +13,6 @@ class Schema_version extends Managed_DataObject
     public $checksum;                        // varchar(64)  not_null
     public $modified;                        // datetime()   not_null
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Schema_version',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Session.php b/classes/Session.php
index 1a924b7964..8323ef89f5 100644
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -34,9 +34,6 @@ class Session extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Session',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Sms_carrier.php b/classes/Sms_carrier.php
index 08d83f08f2..7d3a5fc0ca 100644
--- a/classes/Sms_carrier.php
+++ b/classes/Sms_carrier.php
@@ -16,10 +16,6 @@ class Sms_carrier extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Sms_carrier',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Subscription.php b/classes/Subscription.php
index 70ccd724be..7ab0136fa7 100644
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -69,10 +69,6 @@ class Subscription extends Managed_DataObject
         );
     }
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Subscription',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/Subscription_queue.php b/classes/Subscription_queue.php
index 19cd71c6a8..8626f0674b 100644
--- a/classes/Subscription_queue.php
+++ b/classes/Subscription_queue.php
@@ -14,10 +14,6 @@ class Subscription_queue extends Managed_DataObject
     public $subscribed;
     public $created;
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Subscription_queue',$k,$v); }
-
     /* Pkey get */
     function pkeyGet($k)
     { return Memcached_DataObject::pkeyGet('Subscription_queue',$k); }
diff --git a/classes/Token.php b/classes/Token.php
index 8a6b46bbbb..8d8a4d1c11 100644
--- a/classes/Token.php
+++ b/classes/Token.php
@@ -20,10 +20,6 @@ class Token extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Token',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     public static function schemaDef()
diff --git a/classes/User.php b/classes/User.php
index 75a600578a..2bc8c88b2e 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -65,9 +65,6 @@ class User extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/User_group.php b/classes/User_group.php
index 1ec2b09ae8..447dbded45 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -30,11 +30,6 @@ class User_group extends Managed_DataObject
     public $join_policy;                     // tinyint
     public $force_scope;                     // tinyint
 
-    /* Static get */
-    function staticGet($k,$v=NULL) {
-        return Memcached_DataObject::staticGet('User_group',$k,$v);
-    }
-    
     function multiGet($keyCol, $keyVals, $skipNulls=true)
     {
         return parent::multiGet('User_group', $keyCol, $keyVals, $skipNulls);
diff --git a/classes/User_im_prefs.php b/classes/User_im_prefs.php
index 90df216c54..027feff514 100644
--- a/classes/User_im_prefs.php
+++ b/classes/User_im_prefs.php
@@ -45,9 +45,6 @@ class User_im_prefs extends Managed_DataObject
     public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_im_prefs',$k,$v); }
-
     function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('User_im_prefs', $kv);
diff --git a/classes/User_location_prefs.php b/classes/User_location_prefs.php
index 060ef41e83..5058b270f7 100644
--- a/classes/User_location_prefs.php
+++ b/classes/User_location_prefs.php
@@ -40,9 +40,6 @@ class User_location_prefs extends Managed_DataObject
     public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_location_prefs',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/User_urlshortener_prefs.php b/classes/User_urlshortener_prefs.php
index f71adc9736..600e4e1ac2 100755
--- a/classes/User_urlshortener_prefs.php
+++ b/classes/User_urlshortener_prefs.php
@@ -34,9 +34,6 @@ class User_urlshortener_prefs extends Managed_DataObject
     public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_urlshortener_prefs',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/classes/User_username.php b/classes/User_username.php
index 652e7bd141..31dc66faea 100644
--- a/classes/User_username.php
+++ b/classes/User_username.php
@@ -16,12 +16,6 @@ class User_username extends Managed_DataObject
     public $created;                        // datetime()   not_null
     public $modified;                       // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    {
-        return Memcached_DataObject::staticGet('User_username',$k,$v);
-    }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE