From 7979176e14444af7b88f6a7afeae571d6a644d17 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 22 May 2008 14:41:09 -0400 Subject: [PATCH] generate classes for db schema with URIs darcs-hash:20080522184109-84dde-0d13fc6890f85613554f5dd64b1baa67bbcaa8f6.gz --- classes/Avatar.php | 6 +++--- classes/Notice.php | 7 ++++--- classes/Profile.php | 12 ++++++------ classes/Remote_profile.php | 6 ++++-- classes/Subscription.php | 4 ++-- classes/User.php | 5 +++-- classes/stoica.ini | 9 +++++++-- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/classes/Avatar.php b/classes/Avatar.php index bf428edac0..2e0e1f3fb5 100644 --- a/classes/Avatar.php +++ b/classes/Avatar.php @@ -4,18 +4,18 @@ */ require_once 'DB/DataObject.php'; -class Avatar extends DB_DataObject +class Avatar extends DB_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ public $__table = 'avatar'; // table name public $profile_id; // int(4) primary_key not_null - public $original; // tinyint(1) + public $original; // tinyint(1) public $width; // int(4) primary_key not_null public $height; // int(4) primary_key not_null public $mediatype; // varchar(32) not_null - public $filename; // varchar(255) + public $filename; // varchar(255) public $url; // varchar(255) unique_key public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP diff --git a/classes/Notice.php b/classes/Notice.php index de3477c767..24a719104f 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); } */ require_once 'DB/DataObject.php'; -class Notice extends DB_DataObject +class Notice extends DB_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -32,8 +32,9 @@ class Notice extends DB_DataObject public $__table = 'notice'; // table name public $id; // int(4) primary_key not_null public $profile_id; // int(4) not_null - public $content; // varchar(140) - public $url; // varchar(255) + public $uri; // varchar(255) unique_key + public $content; // varchar(140) + public $url; // varchar(255) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP diff --git a/classes/Profile.php b/classes/Profile.php index 5a678eb542..eb29d63a27 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); } */ require_once 'DB/DataObject.php'; -class Profile extends DB_DataObject +class Profile extends DB_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -32,11 +32,11 @@ class Profile extends DB_DataObject public $__table = 'profile'; // table name public $id; // int(4) primary_key not_null public $nickname; // varchar(64) not_null - public $fullname; // varchar(255) - public $profileurl; // varchar(255) - public $homepage; // varchar(255) - public $bio; // varchar(140) - public $location; // varchar(255) + public $fullname; // varchar(255) + public $profileurl; // varchar(255) + public $homepage; // varchar(255) + public $bio; // varchar(140) + public $location; // varchar(255) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php index ea2f6d8598..e5613125dc 100644 --- a/classes/Remote_profile.php +++ b/classes/Remote_profile.php @@ -24,14 +24,16 @@ if (!defined('LACONICA')) { exit(1); } */ require_once 'DB/DataObject.php'; -class Remote_profile extends DB_DataObject +class Remote_profile extends DB_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ public $__table = 'remote_profile'; // table name public $id; // int(4) primary_key not_null - public $url; // varchar(255) unique_key + public $uri; // varchar(255) unique_key + public $postnoticeurl; // varchar(255) + public $updateprofileurl; // varchar(255) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP diff --git a/classes/Subscription.php b/classes/Subscription.php index db79c8f9d5..42a3916c4a 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); } */ require_once 'DB/DataObject.php'; -class Subscription extends DB_DataObject +class Subscription extends DB_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -32,7 +32,7 @@ class Subscription extends DB_DataObject public $__table = 'subscription'; // table name public $subscriber; // int(4) primary_key not_null public $subscribed; // int(4) primary_key not_null - public $token; // varchar(255) + public $token; // varchar(255) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP diff --git a/classes/User.php b/classes/User.php index 41441a21d9..d750c78472 100644 --- a/classes/User.php +++ b/classes/User.php @@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); } require_once 'DB/DataObject.php'; require_once 'Validate.php'; -class User extends DB_DataObject +class User extends DB_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -32,8 +32,9 @@ 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 $uri; // varchar(255) unique_key public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP diff --git a/classes/stoica.ini b/classes/stoica.ini index 4d15225709..1cb6f9e051 100644 --- a/classes/stoica.ini +++ b/classes/stoica.ini @@ -19,6 +19,7 @@ url = U [notice] id = 129 profile_id = 129 +uri = 2 content = 2 url = 2 created = 142 @@ -43,13 +44,15 @@ id = N [remote_profile] id = 129 -url = 2 +uri = 2 +postnoticeurl = 2 +updateprofileurl = 2 created = 142 modified = 384 [remote_profile__keys] id = K -url = U +uri = U [subscription] subscriber = 129 @@ -67,6 +70,7 @@ id = 129 nickname = 2 password = 2 email = 2 +uri = 2 created = 142 modified = 384 @@ -74,3 +78,4 @@ modified = 384 id = K nickname = U email = U +uri = U