projects / horde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5d9d84d)
phpdoc
authorMichael J. Rubinsky <mrubinsk@horde.org>
Thu, 22 Oct 2009 18:10:50 +0000 (14:10 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Thu, 22 Oct 2009 18:10:50 +0000 (14:10 -0400)
kronolith/lib/Driver/Resource.php patch | blob | history
kronolith/scripts/sql/kronolith.mssql.sql patch | blob | history
kronolith/scripts/sql/kronolith.mysql.sql patch | blob | history
kronolith/scripts/sql/kronolith.oci8.sql patch | blob | history
kronolith/scripts/sql/kronolith.pgsql.sql patch | blob | history
kronolith/scripts/sql/kronolith.sql patch | blob | history
kronolith/scripts/sql/kronolith.xml patch | blob | history
kronolith/scripts/upgrades/2009-08-17_add_resources.sql patch | blob | history

diff --git a/kronolith/lib/Driver/Resource.php b/kronolith/lib/Driver/Resource.php
index 18968a8..7312cca 100644 (file)
--- 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 b800dc4..4c9c522 100644 (file)
--- 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 2a4f943..460f264 100644 (file)
--- 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 8f0e332..a04ff28 100644 (file)
--- 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 7181e59..121e131 100644 (file)
--- 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 d608f82..a823d27 100644 (file)
--- 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 e615a91..ed72063 100644 (file)
--- a/kronolith/scripts/sql/kronolith.xml
+++ b/kronolith/scripts/sql/kronolith.xml
@@ -483,6 +483,7 @@
    <field>
     <name>resource_id</name>
     <type>integer</type>
+    <default></default>
     <notnull>true</notnull>
     <length>4</length>
    </field>
@@ -490,12 +491,16 @@
    <field>
     <name>resource_name</name>
     <type>text</type>
+    <default></default>
+    <notnull>false</notnull>
     <length>255</length>
    </field>
     
    <field>
     <name>resource_calendar</name>
     <type>text</type>
+    <default></default>
+    <notnull>false</notnull>
     <length>255</length>
    </field>
    
@@ -507,18 +512,23 @@
    <field>
     <name>resource_category</name>
     <type>text</type>
+    <default></default>
+    <notnull>false</notnull>
     <length>255</length>
    </field>
    
    <field>
     <name>resource_response_type</name>
     <type>integer</type>
+    <default>0</default>
+    <notnull>true</notnull>
     <length>4</length>
    </field>
    
    <field>
     <name>resource_type</name>
     <type>text</type>
+    <default></default>
     <notnull>true</notnull>
     <length>255</length>
    </field>
diff --git a/kronolith/scripts/upgrades/2009-08-17_add_resources.sql b/kronolith/scripts/upgrades/2009-08-17_add_resources.sql
index f4c9c23..a83cfcb 100644 (file)
--- 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)
 );
Unnamed repository; edit this file to name it for gitweb.