Woops, forgot auto_increment (comes with 'serial')

There are still some classes not ported (like Yammer import)

diff --git a/classes/Conversation.php b/classes/Conversation.php
index 547a553d3b090a0b3b849ae52972a6f90d8e3837..23f8dada0b316dfe0ef7c4b2c5a7eddc32d5a614 100755 (executable)
--- a/classes/Conversation.php
+++ b/classes/Conversation.php
@@ -36,7 +36,7 @@ class Conversation extends Managed_DataObject
 
     public $__table = 'conversation';                    // table name
     public $id;                              // int(4)  primary_key not_null
-    public $uri;                             // varchar(225)  unique_key
+    public $uri;                             // varchar(255)  unique_key
     public $created;                         // datetime   not_null
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
@@ -48,7 +48,7 @@ class Conversation extends Managed_DataObject
         return array(
             'fields' => array(
                 'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
-                'uri' => array('type' => 'varchar', 'length' => 225, 'description' => 'URI of the conversation'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'URI of the conversation'),
                 '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'),
             ),

diff --git a/plugins/GroupPrivateMessage/Group_message.php b/plugins/GroupPrivateMessage/Group_message.php
index 30b98adecd79dd60258159605276c239deb07c20..7e825d416deb1fb2c8a628317d63b09c8cdfe465 100644 (file)
--- a/plugins/GroupPrivateMessage/Group_message.php
+++ b/plugins/GroupPrivateMessage/Group_message.php
@@ -47,7 +47,7 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
 class Group_message extends Managed_DataObject
 {
     public $__table = 'group_message'; // table name
-    public $id;                        // varchar(36)  primary_key not_null
+    public $id;                        // char(36)  primary_key not_null
     public $uri;                       // varchar(255)
     public $from_profile;              // int
     public $to_group;                  // int
@@ -61,7 +61,7 @@ class Group_message extends Managed_DataObject
     {
         return array(
             'fields' => array(
-                'id' => array('type' => 'varchar', 'not null' => true, 'length' => 36, 'description' => 'message uuid'),
+                'id' => array('type' => 'char', 'not null' => true, 'length' => 36, 'description' => 'message uuid'),
                 'uri' => array('type' => 'varchar', 'not null' => true, 'length' => 255, 'description' => 'message uri'),
                 'url' => array('type' => 'varchar', 'not null' => true, 'length' => 255, 'description' => 'representation url'),
                 'from_profile' => array('type' => 'int', 'not null' => true, 'description' => 'sending profile ID'),

diff --git a/plugins/GroupPrivateMessage/Group_message_profile.php b/plugins/GroupPrivateMessage/Group_message_profile.php
index 5f16dc2eab2916cf6b58236b47fa81ebed82188f..ad465b96ea25c7d5e9c376f361e2ea83e5495b70 100644 (file)
--- a/plugins/GroupPrivateMessage/Group_message_profile.php
+++ b/plugins/GroupPrivateMessage/Group_message_profile.php
@@ -57,7 +57,7 @@ class Group_message_profile extends Managed_DataObject
         return array(
             'fields' => array(
                 'to_profile' => array('type' => 'int', 'not null' => true, 'description' => 'id of group direct message'),
-                'group_message_id' => array('type' => 'varchar', 'not null' => true, 'length' => 36, 'description' => 'group message uuid'),
+                'group_message_id' => array('type' => 'char', 'not null' => true, 'length' => 36, 'description' => 'related group message uuid'),
                 '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'),
             ),

diff --git a/plugins/Irc/Irc_waiting_message.php b/plugins/Irc/Irc_waiting_message.php
index df7db05b585e6f734a134f4c65315f9a10fec43a..eefd9049855df6cd3edca76be5ef2f745d1d04c0 100644 (file)
--- a/plugins/Irc/Irc_waiting_message.php
+++ b/plugins/Irc/Irc_waiting_message.php
@@ -20,7 +20,7 @@ class Irc_waiting_message extends Managed_DataObject {
     {\r
         return array(\r
             'fields' => array(\r
-                'id' => array('type' => 'int', 'not null' => true, 'description' => 'Unique ID for entry'),\r
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'Unique ID for entry'),\r
                 'data' => array('type' => 'blob', 'not null' => true, 'description' => 'data blob'),\r
                 'prioritise' => array('type' => 'int', 'size' => 'tiny', 'description' => 'tinyint priority value'),\r
                 'attempts' => array('type' => 'int', 'not null' => true, 'description' => 'attempts count'),\r

diff --git a/plugins/Msn/msn_waiting_message.php b/plugins/Msn/msn_waiting_message.php
index 770b1c7df3621cf595e4bf7632e7f82456927125..cfb69def004f0c9b8aac9eda129ba1fc1f652d29 100644 (file)
--- a/plugins/Msn/msn_waiting_message.php
+++ b/plugins/Msn/msn_waiting_message.php
@@ -18,7 +18,7 @@ class Msn_waiting_message extends Managed_DataObject {
     {\r
         return array(\r
             'fields' => array(\r
-                'id' => array('type' => 'int', 'not null' => true, 'description' => 'Unique ID for entry'),\r
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'Unique ID for entry'),\r
                 'screenname' => array('type' => 'varchar', 'length' => 255, 'description' => 'from screenname'),\r
                 'message' => array('type' => 'text', 'not null' => true, 'description' => 'MSN message text'),\r
                 'claimed' => array('type' => 'datetime', 'description' => 'date this irc message was claimed'),\r

diff --git a/plugins/OStatus/classes/FeedSub.php b/plugins/OStatus/classes/FeedSub.php
index b84a13115dfe4b738998b857ef84bfe8a81e22cd..096baff202d2b6fb81f3fb60f23ac3c2e901e9c0 100644 (file)
--- a/plugins/OStatus/classes/FeedSub.php
+++ b/plugins/OStatus/classes/FeedSub.php
@@ -82,7 +82,7 @@ class FeedSub extends Managed_DataObject
     {
         return array(
             'fields' => array(
-                'id' => array('type' => 'int', 'not null' => true, 'description' => 'FeedSub local unique id'),
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'FeedSub local unique id'),
                 'uri' => array('type' => 'varchar', 'not null' => true, 'length' => 255, 'description' => 'FeedSub uri'),
                 'huburi' => array('type' => 'text', 'description' => 'FeedSub hub-uri'),
                 'verify_token' => array('type' => 'text', 'description' => 'FeedSub verify-token'),