Merge branch 'master' into social-master

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

diff --git a/classes/User_username.php b/classes/User_username.php
index 31dc66faeaf041f1b343b91d28a1e8716136bd0d..b252ee31565f58234859ca87ac1eaa23bdd7123e 100644 (file)
--- a/classes/User_username.php
+++ b/classes/User_username.php
@@ -19,6 +19,26 @@ class User_username extends Managed_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'provider_name' => array('type' => 'varchar', 'length' => 255, 'description' => 'provider name'),
+                'username' => array('type' => 'varchar', 'length' => 255, 'description' => 'username'),
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice id this title relates 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('provider_name', 'username'),
+            'indexes' => array(
+                'user_id_idx' => array('user_id')
+            ),
+            'foreign keys' => array(
+                'user_username_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+        );
+    }
+
     /**
     * Register a user with a username on a given provider
     * @param User User object
@@ -32,7 +52,7 @@ class User_username extends Managed_DataObject
         $user_username->user_id = $user->id;
         $user_username->provider_name = $provider_name;
         $user_username->username = $username;
-        $user_username->created = DB_DataObject_Cast::dateTime();
+        $user_username->created = common_sql_now();
 
         if($user_username->insert()){
             return $user_username;
@@ -40,18 +60,4 @@ class User_username extends Managed_DataObject
             return false;
         }
     }
-
-    function table() {
-        return array(
-            'user_id'     => DB_DATAOBJECT_INT,
-            'username'   => DB_DATAOBJECT_STR,
-            'provider_name'   => DB_DATAOBJECT_STR ,
-            'created'   => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
-        );
-    }
-
-    // now define the keys.
-    function keys() {
-        return array('provider_name' => 'K', 'username' => 'K');
-    }
 }