From 276876ed7ee688062864ea6d5d525d53bad889ac Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Thu, 22 Oct 2009 14:10:50 -0400 Subject: [PATCH] phpdoc --- kronolith/lib/Driver/Resource.php | 8 ++++++-- kronolith/scripts/sql/kronolith.mssql.sql | 10 +++++----- kronolith/scripts/sql/kronolith.mysql.sql | 17 ++--------------- kronolith/scripts/sql/kronolith.oci8.sql | 8 ++++---- kronolith/scripts/sql/kronolith.pgsql.sql | 8 ++++---- kronolith/scripts/sql/kronolith.sql | 13 +++++++------ kronolith/scripts/sql/kronolith.xml | 10 ++++++++++ kronolith/scripts/upgrades/2009-08-17_add_resources.sql | 8 ++++---- 8 files changed, 42 insertions(+), 40 deletions(-) diff --git a/kronolith/lib/Driver/Resource.php b/kronolith/lib/Driver/Resource.php index 18968a895..7312cca33 100644 --- a/kronolith/lib/Driver/Resource.php +++ b/kronolith/lib/Driver/Resource.php @@ -179,6 +179,8 @@ class Kronolith_Driver_Resource extends Kronolith_Driver_Sql * * @param int $perms A PERMS_* constant. * @param array $filter A hash of field/values to filter on. + * + * @return an array of Kronolith_Resource objects. */ public function listResources($perms = PERMS_READ, $filter = array()) { @@ -234,9 +236,11 @@ class Kronolith_Driver_Resource extends Kronolith_Driver_Sql } /** + * Convert from driver keys and charset to Kronolith keys and charset. + * + * @param array $params The key/values to convert. * - * @param $params - * @return unknown_type + * @return An array of converted values. */ protected function _fromDriver($params) { diff --git a/kronolith/scripts/sql/kronolith.mssql.sql b/kronolith/scripts/sql/kronolith.mssql.sql index b800dc4f4..4c9c5228c 100644 --- a/kronolith/scripts/sql/kronolith.mssql.sql +++ b/kronolith/scripts/sql/kronolith.mssql.sql @@ -31,8 +31,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid); CREATE TABLE kronolith_storage ( - vfb_owner VARCHAR(255), - vfb_email VARCHAR(255) NOT NULL, + vfb_owner VARCHAR(255) DEFAULT NULL, + vfb_email VARCHAR(255) DEFAULT '' NOT NULL, vfb_serialized VARCHAR(MAX) NOT NULL ); @@ -85,10 +85,10 @@ CREATE TABLE kronolith_resources ( resource_name VARCHAR(255), resource_calendar VARCHAR(255), resource_description VARCHAR(MAX), - resource_category VARCHAR(255), - resource_response_type INT, + resource_category VARCHAR(255) DEFAULT '', + resource_response_type INT DEFAULT 0, resource_type VARCHAR(255) NOT NULL, - resource_members VARCHAR(MAX), + resource_members BLOB, PRIMARY KEY (resource_id) ); diff --git a/kronolith/scripts/sql/kronolith.mysql.sql b/kronolith/scripts/sql/kronolith.mysql.sql index 2a4f94373..460f2648f 100644 --- a/kronolith/scripts/sql/kronolith.mysql.sql +++ b/kronolith/scripts/sql/kronolith.mysql.sql @@ -31,8 +31,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid); CREATE TABLE kronolith_storage ( - vfb_owner VARCHAR(255), - vfb_email VARCHAR(255) NOT NULL, + vfb_owner VARCHAR(255) DEFAULT NULL, + vfb_email VARCHAR(255) DEFAULT '' NOT NULL, vfb_serialized TEXT NOT NULL ); @@ -79,16 +79,3 @@ CREATE TABLE kronolith_shares_users ( CREATE INDEX kronolith_shares_users_share_id_idx ON kronolith_shares_users (share_id); CREATE INDEX kronolith_shares_users_user_uid_idx ON kronolith_shares_users (user_uid); CREATE INDEX kronolith_shares_users_perm_idx ON kronolith_shares_users (perm); - -CREATE TABLE kronolith_resources ( - resource_id INT NOT NULL, - resource_name VARCHAR(255), - resource_calendar VARCHAR(255), - resource_description TEXT, - resource_category VARCHAR(255), - resource_response_type INT, - resource_type VARCHAR(255) NOT NULL, - resource_members TEXT, - - PRIMARY KEY (resource_id) -); diff --git a/kronolith/scripts/sql/kronolith.oci8.sql b/kronolith/scripts/sql/kronolith.oci8.sql index 8f0e33256..a04ff285e 100644 --- a/kronolith/scripts/sql/kronolith.oci8.sql +++ b/kronolith/scripts/sql/kronolith.oci8.sql @@ -31,8 +31,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid); CREATE TABLE kronolith_storage ( - vfb_owner VARCHAR2(255), - vfb_email VARCHAR2(255) NOT NULL, + vfb_owner VARCHAR2(255) DEFAULT NULL, + vfb_email VARCHAR2(255) DEFAULT '' NOT NULL, vfb_serialized VARCHAR2(4000) NOT NULL ); @@ -85,8 +85,8 @@ CREATE TABLE kronolith_resources ( resource_name VARCHAR2(255), resource_calendar VARCHAR2(255), resource_description CLOB, - resource_category VARCHAR2(255), - resource_response_type NUMBER(16), + resource_category VARCHAR2(255) DEFAULT '', + resource_response_type NUMBER(16) DEFAULT 0, resource_type VARCHAR2(255) NOT NULL, resource_members CLOB, diff --git a/kronolith/scripts/sql/kronolith.pgsql.sql b/kronolith/scripts/sql/kronolith.pgsql.sql index 7181e5927..121e131e7 100644 --- a/kronolith/scripts/sql/kronolith.pgsql.sql +++ b/kronolith/scripts/sql/kronolith.pgsql.sql @@ -31,8 +31,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid); CREATE TABLE kronolith_storage ( - vfb_owner VARCHAR(255), - vfb_email VARCHAR(255) NOT NULL, + vfb_owner VARCHAR(255) DEFAULT NULL, + vfb_email VARCHAR(255) DEFAULT '' NOT NULL, vfb_serialized TEXT NOT NULL ); @@ -85,8 +85,8 @@ CREATE TABLE kronolith_resources ( resource_name VARCHAR(255), resource_calendar VARCHAR(255), resource_description TEXT, - resource_category VARCHAR(255), - resource_response_type INT, + resource_category VARCHAR(255) DEFAULT '', + resource_response_type INT DEFAULT 0, resource_type VARCHAR(255) NOT NULL, resource_members TEXT, diff --git a/kronolith/scripts/sql/kronolith.sql b/kronolith/scripts/sql/kronolith.sql index d608f8264..a823d27ef 100644 --- a/kronolith/scripts/sql/kronolith.sql +++ b/kronolith/scripts/sql/kronolith.sql @@ -31,8 +31,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid); CREATE TABLE kronolith_storage ( - vfb_owner VARCHAR(255), - vfb_email VARCHAR(255) NOT NULL, + vfb_owner VARCHAR(255) DEFAULT NULL, + vfb_email VARCHAR(255) DEFAULT '' NOT NULL, vfb_serialized TEXT NOT NULL ); @@ -85,10 +85,11 @@ CREATE TABLE kronolith_resources ( resource_name VARCHAR(255), resource_calendar VARCHAR(255), resource_description TEXT, - resource_category VARCHAR(255), - resource_response_type INT, + resource_category VARCHAR(255) DEFAULT '', + resource_response_type INT DEFAULT 0, resource_type VARCHAR(255) NOT NULL, - resource_members TEXT, - + resource_members BLOB, + PRIMARY KEY (resource_id) ); + \ No newline at end of file diff --git a/kronolith/scripts/sql/kronolith.xml b/kronolith/scripts/sql/kronolith.xml index e615a9154..ed72063db 100644 --- a/kronolith/scripts/sql/kronolith.xml +++ b/kronolith/scripts/sql/kronolith.xml @@ -483,6 +483,7 @@ resource_id integer + true 4 @@ -490,12 +491,16 @@ resource_name text + + false 255 resource_calendar text + + false 255 @@ -507,18 +512,23 @@ resource_category text + + false 255 resource_response_type integer + 0 + true 4 resource_type text + true 255 diff --git a/kronolith/scripts/upgrades/2009-08-17_add_resources.sql b/kronolith/scripts/upgrades/2009-08-17_add_resources.sql index f4c9c23ec..a83cfcb19 100644 --- a/kronolith/scripts/upgrades/2009-08-17_add_resources.sql +++ b/kronolith/scripts/upgrades/2009-08-17_add_resources.sql @@ -5,10 +5,10 @@ CREATE TABLE kronolith_resources ( resource_name VARCHAR(255), resource_calendar VARCHAR(255), resource_description TEXT, - resource_category VARCHAR(255), - resource_response_type INT, + resource_category VARCHAR(255) DEFAULT '', + resource_response_type INT DEFAULT 0, resource_type VARCHAR(255) NOT NULL, - resource_members TEXT, --- + resource_members BLOB, + PRIMARY KEY (resource_id) ); -- 2.11.0