From: Jan Schneider Date: Thu, 22 Oct 2009 16:38:33 +0000 (+0200) Subject: Fix contraints. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0738296f420c0f181efc5d8ba11e75730ac7793a;p=horde.git Fix contraints. --- diff --git a/kronolith/scripts/sql/kronolith.mssql.sql b/kronolith/scripts/sql/kronolith.mssql.sql index 4c9c5228c..deef4fdc8 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) DEFAULT NULL, - vfb_email VARCHAR(255) DEFAULT '' NOT NULL, + vfb_owner VARCHAR(255), + vfb_email VARCHAR(255) NOT NULL, vfb_serialized VARCHAR(MAX) NOT NULL ); @@ -85,8 +85,8 @@ CREATE TABLE kronolith_resources ( resource_name VARCHAR(255), resource_calendar VARCHAR(255), resource_description VARCHAR(MAX), - resource_category VARCHAR(255) DEFAULT '', - resource_response_type INT DEFAULT 0, + resource_category VARCHAR(255), + resource_response_type INT, resource_type VARCHAR(255) NOT NULL, resource_members BLOB, diff --git a/kronolith/scripts/sql/kronolith.mysql.sql b/kronolith/scripts/sql/kronolith.mysql.sql index 2b7e0c340..d67532616 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) DEFAULT NULL, - vfb_email VARCHAR(255) DEFAULT '' NOT NULL, + vfb_owner VARCHAR(255), + vfb_email VARCHAR(255) NOT NULL, vfb_serialized TEXT NOT NULL ); diff --git a/kronolith/scripts/sql/kronolith.oci8.sql b/kronolith/scripts/sql/kronolith.oci8.sql index a04ff285e..8f0e33256 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) DEFAULT NULL, - vfb_email VARCHAR2(255) DEFAULT '' NOT NULL, + vfb_owner VARCHAR2(255), + vfb_email VARCHAR2(255) 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) DEFAULT '', - resource_response_type NUMBER(16) DEFAULT 0, + resource_category VARCHAR2(255), + resource_response_type NUMBER(16), 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 121e131e7..7181e5927 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) DEFAULT NULL, - vfb_email VARCHAR(255) DEFAULT '' NOT NULL, + vfb_owner VARCHAR(255), + vfb_email VARCHAR(255) 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) DEFAULT '', - resource_response_type INT DEFAULT 0, + resource_category VARCHAR(255), + resource_response_type INT, resource_type VARCHAR(255) NOT NULL, resource_members TEXT, diff --git a/kronolith/scripts/sql/kronolith.sql b/kronolith/scripts/sql/kronolith.sql index a823d27ef..18453a2e7 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) DEFAULT NULL, - vfb_email VARCHAR(255) DEFAULT '' NOT NULL, + vfb_owner VARCHAR(255), + vfb_email VARCHAR(255) NOT NULL, vfb_serialized TEXT NOT NULL ); @@ -85,11 +85,10 @@ CREATE TABLE kronolith_resources ( resource_name VARCHAR(255), resource_calendar VARCHAR(255), resource_description TEXT, - resource_category VARCHAR(255) DEFAULT '', - resource_response_type INT DEFAULT 0, + resource_category VARCHAR(255), + resource_response_type INT, resource_type VARCHAR(255) NOT NULL, 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 ed72063db..e615a9154 100644 --- a/kronolith/scripts/sql/kronolith.xml +++ b/kronolith/scripts/sql/kronolith.xml @@ -483,7 +483,6 @@ resource_id integer - true 4 @@ -491,16 +490,12 @@ resource_name text - - false 255 resource_calendar text - - false 255 @@ -512,23 +507,18 @@ resource_category text - - false 255 resource_response_type integer - 0 - true 4 resource_type text - true 255 diff --git a/kronolith/scripts/upgrades/1.1_to_2.0.mysql.sql b/kronolith/scripts/upgrades/1.1_to_2.0.mysql.sql index 54fe2bd5d..caa31e170 100644 --- a/kronolith/scripts/upgrades/1.1_to_2.0.mysql.sql +++ b/kronolith/scripts/upgrades/1.1_to_2.0.mysql.sql @@ -16,8 +16,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid); CREATE TABLE kronolith_storage ( - vfb_owner VARCHAR(255) DEFAULT NULL, - vfb_email VARCHAR(255) DEFAULT '' NOT NULL, + vfb_owner VARCHAR(255), + vfb_email VARCHAR(255) NOT NULL, vfb_serialized TEXT NOT NULL ); diff --git a/kronolith/scripts/upgrades/1.1_to_2.0.oci8.sql b/kronolith/scripts/upgrades/1.1_to_2.0.oci8.sql index 25b6f4e1c..a21ec76f5 100644 --- a/kronolith/scripts/upgrades/1.1_to_2.0.oci8.sql +++ b/kronolith/scripts/upgrades/1.1_to_2.0.oci8.sql @@ -14,8 +14,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid); CREATE TABLE kronolith_storage ( - vfb_owner VARCHAR2(255) DEFAULT NULL, - vfb_email VARCHAR2(255) DEFAULT '' NOT NULL, + vfb_owner VARCHAR2(255), + vfb_email VARCHAR2(255) NOT NULL, vfb_serialized VARCHAR2(4000) NOT NULL ); diff --git a/kronolith/scripts/upgrades/1.1_to_2.0.pgsql.sql b/kronolith/scripts/upgrades/1.1_to_2.0.pgsql.sql index 5f16a8fcc..23d44c8b5 100644 --- a/kronolith/scripts/upgrades/1.1_to_2.0.pgsql.sql +++ b/kronolith/scripts/upgrades/1.1_to_2.0.pgsql.sql @@ -45,8 +45,8 @@ ALTER TABLE kronolith_events ADD COLUMN event_attendees TEXT; CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid); CREATE TABLE kronolith_storage ( - vfb_owner VARCHAR(255) DEFAULT NULL, - vfb_email VARCHAR(255) DEFAULT '' NOT NULL, + vfb_owner VARCHAR(255), + vfb_email VARCHAR(255) NOT NULL, vfb_serialized TEXT NOT NULL ); diff --git a/kronolith/scripts/upgrades/2009-08-17_add_resources.sql b/kronolith/scripts/upgrades/2009-08-17_add_resources.sql index a83cfcb19..f89b7f1cf 100644 --- a/kronolith/scripts/upgrades/2009-08-17_add_resources.sql +++ b/kronolith/scripts/upgrades/2009-08-17_add_resources.sql @@ -5,8 +5,8 @@ CREATE TABLE kronolith_resources ( resource_name VARCHAR(255), resource_calendar VARCHAR(255), resource_description TEXT, - resource_category VARCHAR(255) DEFAULT '', - resource_response_type INT DEFAULT 0, + resource_category VARCHAR(255), + resource_response_type INT, resource_type VARCHAR(255) NOT NULL, resource_members BLOB,