diff options
| -rw-r--r-- | classes/Notice.php | 2 | ||||
| -rw-r--r-- | classes/Notice_source.php | 2 | ||||
| -rw-r--r-- | classes/Notice_tag.php | 2 | ||||
| -rw-r--r-- | classes/User.php | 22 | ||||
| -rw-r--r-- | classes/stoica.ini | 18 | ||||
| -rw-r--r-- | db/laconica.sql | 4 |
6 files changed, 25 insertions, 25 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 6655befb1..c9127bac4 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -40,7 +40,7 @@ class Notice extends DB_DataObject public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $reply_to; // int(4) public $is_local; // tinyint(1) - public $source; // varchar(8) + public $source; // varchar(32) /* Static get */ function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Notice',$k,$v); } diff --git a/classes/Notice_source.php b/classes/Notice_source.php index cef2883b0..fe6d3d4f1 100644 --- a/classes/Notice_source.php +++ b/classes/Notice_source.php @@ -10,7 +10,7 @@ class Notice_source extends DB_DataObject /* the code below is auto generated do not remove the above tag */ public $__table = 'notice_source'; // table name - public $code; // varchar(8) primary_key not_null + public $code; // varchar(32) primary_key not_null public $name; // varchar(255) not_null public $url; // varchar(255) not_null public $created; // datetime() not_null diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php index 0dc862bf3..3731d8414 100644 --- a/classes/Notice_tag.php +++ b/classes/Notice_tag.php @@ -4,7 +4,7 @@ */ require_once 'DB/DataObject.php'; -class Notice_tag extends DB_DataObject +class Notice_tag extends DB_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ diff --git a/classes/User.php b/classes/User.php index a6c860588..f2ca13530 100644 --- a/classes/User.php +++ b/classes/User.php @@ -32,26 +32,26 @@ class User extends DB_DataObject public $__table = 'user'; // table name public $id; // int(4) primary_key not_null public $nickname; // varchar(64) unique_key - public $password; // varchar(255) + public $password; // varchar(255) public $email; // varchar(255) unique_key public $incomingemail; // varchar(255) unique_key public $emailnotifysub; // tinyint(1) default_1 public $emailmicroid; // tinyint(1) default_1 - public $language; // varchar(50) - public $timezone; // varchar(50) + public $language; // varchar(50) + public $timezone; // varchar(50) public $emailpost; // tinyint(1) default_1 public $jabber; // varchar(255) unique_key - public $jabbernotify; // tinyint(1) - public $jabberreplies; // tinyint(1) + public $jabbernotify; // tinyint(1) + public $jabberreplies; // tinyint(1) public $jabbermicroid; // tinyint(1) default_1 - public $updatefrompresence; // tinyint(1) + public $updatefrompresence; // tinyint(1) public $sms; // varchar(64) unique_key - public $carrier; // int(4) - public $smsnotify; // tinyint(1) - public $smsreplies; // tinyint(1) - public $smsemail; // varchar(255) + public $carrier; // int(4) + public $smsnotify; // tinyint(1) + public $smsreplies; // tinyint(1) + public $smsemail; // varchar(255) public $uri; // varchar(255) unique_key - public $autosubscribe; // tinyint(1) + public $autosubscribe; // tinyint(1) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP diff --git a/classes/stoica.ini b/classes/stoica.ini index dd72fc388..3f75f369e 100644 --- a/classes/stoica.ini +++ b/classes/stoica.ini @@ -67,15 +67,6 @@ source = 2 [notice__keys] id = N -[notice_tag] -tag = 130 -notice_id = 129 -created = 142 - -[notice_tag__keys] -tag = K -notice_id = K - [notice_source] code = 130 name = 130 @@ -86,6 +77,15 @@ modified = 384 [notice_source__keys] code = K +[notice_tag] +tag = 130 +notice_id = 129 +created = 142 + +[notice_tag__keys] +tag = K +notice_id = K + [profile] id = 129 nickname = 130 diff --git a/db/laconica.sql b/db/laconica.sql index 5869297cc..69dd4644f 100644 --- a/db/laconica.sql +++ b/db/laconica.sql @@ -105,7 +105,7 @@ create table notice ( modified timestamp comment 'date this record was modified', reply_to integer comment 'notice replied to (usually a guess)' references notice (id), is_local tinyint default 0 comment 'notice was generated by a user', - source varchar(8) comment 'source of comment, like "web", "im", or "clientname"', + source varchar(32) comment 'source of comment, like "web", "im", or "clientname"', index notice_profile_id_idx (profile_id), index notice_created_idx (created), @@ -113,7 +113,7 @@ create table notice ( ) ENGINE=MyISAM; create table notice_source ( - code varchar(8) primary key not null comment 'source code', + code varchar(32) primary key not null comment 'source code', name varchar(255) not null comment 'name of the source', url varchar(255) not null comment 'url to link to', created datetime not null comment 'date this record was created', |