Merge branch 'fix-openid' into 0.9.x

3 files changed, 59 insertions, 39 deletions

diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 6dd8a3f5a..9b0a4cd45 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -281,8 +281,24 @@ class OpenIDPlugin extends Plugin
 
     function onCheckSchema() {
         $schema = Schema::get();
-        $schema->ensureDataObject('User_openid');
-        $schema->ensureDataObject('User_openid_trustroot');
+        $schema->ensureTable('user_openid',
+                             array(new ColumnDef('canonical', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('display', 'varchar',
+                                                 '255', false),
+                                   new ColumnDef('user_id', 'integer',
+                                                 null, false, 'MUL'),
+                                   new ColumnDef('created', 'datetime',
+                                                 null, false),
+                                   new ColumnDef('modified', 'timestamp')));
+        $schema->ensureTable('user_openid_trustroot',
+                             array(new ColumnDef('trustroot', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('user_id', 'integer',
+                                                 null, false, 'PRI'),
+                                   new ColumnDef('created', 'datetime',
+                                                 null, false),
+                                   new ColumnDef('modified', 'timestamp')));
         return true;
     }
 
diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index c3624118e..c24a1ee9a 100644
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -2,9 +2,9 @@
 /**
  * Table Definition for user_openid
  */
-require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class User_openid extends Plugin_DataObject
+class User_openid extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -23,6 +23,25 @@ class User_openid extends Plugin_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    function table() {
+
+        global $_DB_DATAOBJECT;
+        $dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype'];
+
+        return array('canonical' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'display'   => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'user_id'   => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'created'   => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+                     'modified'  => ($dbtype == 'mysql') ?
+                     DB_DATAOBJECT_MYSQLTIMESTAMP :
+                     DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
+                     );
+    }
+
+    function keys() {
+        return array('canonical' => 'K', 'display' => 'U');
+    }
+
     static function hasOpenID($user_id)
     {
         $oid = new User_openid();
@@ -33,22 +52,4 @@ class User_openid extends Plugin_DataObject
 
         return ($cnt > 0);
     }
-
-    /**
-    * Get the TableDef object that represents the table backing this class
-    * @return TableDef TableDef instance
-    */
-    function tableDef()
-    {
-        return new TableDef($this->__table,
-                             array(new ColumnDef('canonical', 'varchar',
-                                                 '255', false, 'PRI'),
-                                   new ColumnDef('display', 'varchar',
-                                                 '255', false),
-                                   new ColumnDef('user_id', 'integer',
-                                                 null, false, 'MUL'),
-                                   new ColumnDef('created', 'datetime',
-                                                 null, false),
-                                   new ColumnDef('modified', 'timestamp')));
-    }
 }
diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php
index b208dddfd..ecf625ab4 100644
--- a/plugins/OpenID/User_openid_trustroot.php
+++ b/plugins/OpenID/User_openid_trustroot.php
@@ -2,9 +2,9 @@
 /**
  * Table Definition for user_openid_trustroot
  */
-require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class User_openid_trustroot extends Plugin_DataObject
+class User_openid_trustroot extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -21,25 +21,28 @@ class User_openid_trustroot extends Plugin_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-    
+
     function &pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv);
     }
 
-    /**
-    * Get the TableDef object that represents the table backing this class
-    * @return TableDef TableDef instance
-    */
-    function tableDef()
-    {
-        return new TableDef($this->__table,
-                             array(new ColumnDef('trustroot', 'varchar',
-                                                 '255', false, 'PRI'),
-                                   new ColumnDef('user_id', 'integer',
-                                                 null, false, 'PRI'),
-                                   new ColumnDef('created', 'datetime',
-                                                 null, false),
-                                   new ColumnDef('modified', 'timestamp')));
+    function table() {
+
+        global $_DB_DATAOBJECT;
+        $dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype'];
+
+        return array('trustroot' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'user_id'   => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'created'   => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+                     'modified'  => ($dbtype == 'mysql') ?
+                     DB_DATAOBJECT_MYSQLTIMESTAMP :
+                     DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
+                     );
     }
+
+    function keys() {
+        return array('trustroot' => 'K', 'user_id' => 'K');
+    }
+
 }