From: Jan Schneider Date: Tue, 20 Oct 2009 21:23:37 +0000 (+0200) Subject: Fix order of constraints. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9335aea9d1c2ac42c65d4c7f42691e1545a416bf;p=horde.git Fix order of constraints. --- diff --git a/ansel/scripts/upgrades/2009-06-22_add_geolocation_fields.sql b/ansel/scripts/upgrades/2009-06-22_add_geolocation_fields.sql index b915239b6..5ab846ac1 100644 --- a/ansel/scripts/upgrades/2009-06-22_add_geolocation_fields.sql +++ b/ansel/scripts/upgrades/2009-06-22_add_geolocation_fields.sql @@ -1,3 +1,3 @@ -ALTER TABLE ansel_images ADD COLUMN image_latitude VARCHAR(32) NOT NULL DEFAULT ''; -ALTER TABLE ansel_images ADD COLUMN image_longitude VARCHAR(32) NOT NULL DEFAULT ''; -ALTER TABLE ansel_images ADD COLUMN image_location VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE ansel_images ADD COLUMN image_latitude VARCHAR(32) DEFAULT '' NOT NULL; +ALTER TABLE ansel_images ADD COLUMN image_longitude VARCHAR(32) DEFAULT '' NOT NULL; +ALTER TABLE ansel_images ADD COLUMN image_location VARCHAR(255) DEFAULT '' NOT NULL; diff --git a/ingo/scripts/sql/ingo.oci8.sql b/ingo/scripts/sql/ingo.oci8.sql index 3fd5a7ca4..82417b173 100644 --- a/ingo/scripts/sql/ingo.oci8.sql +++ b/ingo/scripts/sql/ingo.oci8.sql @@ -63,10 +63,10 @@ CREATE TABLE ingo_shares ( share_id NUMBER(16) NOT NULL, share_name VARCHAR2(255) NOT NULL, share_owner VARCHAR2(255) NOT NULL, - share_flags NUMBER(8) NOT NULL DEFAULT 0, - perm_creator NUMBER(8) NOT NULL DEFAULT 0, - perm_default NUMBER(8) NOT NULL DEFAULT 0, - perm_guest NUMBER(8) NOT NULL DEFAULT 0, + share_flags NUMBER(8) DEFAULT 0 NOT NULL, + perm_creator NUMBER(8) DEFAULT 0 NOT NULL, + perm_default NUMBER(8) DEFAULT 0 NOT NULL, + perm_guest NUMBER(8) DEFAULT 0 NOT NULL, attribute_name VARCHAR2(255) NOT NULL, attribute_desc VARCHAR2(255), PRIMARY KEY (share_id) diff --git a/ingo/scripts/sql/ingo.sql b/ingo/scripts/sql/ingo.sql index e0d69f25f..b95613588 100644 --- a/ingo/scripts/sql/ingo.sql +++ b/ingo/scripts/sql/ingo.sql @@ -63,10 +63,10 @@ CREATE TABLE ingo_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(255) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), PRIMARY KEY (share_id) diff --git a/kronolith/scripts/sql/kronolith.mssql.sql b/kronolith/scripts/sql/kronolith.mssql.sql index 662de9a62..4c9c5228c 100644 --- a/kronolith/scripts/sql/kronolith.mssql.sql +++ b/kronolith/scripts/sql/kronolith.mssql.sql @@ -44,10 +44,10 @@ CREATE TABLE kronolith_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(255) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), attribute_color VARCHAR(7), diff --git a/kronolith/scripts/sql/kronolith.mysql.sql b/kronolith/scripts/sql/kronolith.mysql.sql index e8ef3d708..460f2648f 100644 --- a/kronolith/scripts/sql/kronolith.mysql.sql +++ b/kronolith/scripts/sql/kronolith.mysql.sql @@ -44,10 +44,10 @@ CREATE TABLE kronolith_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(255) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), attribute_color VARCHAR(7), diff --git a/kronolith/scripts/sql/kronolith.oci8.sql b/kronolith/scripts/sql/kronolith.oci8.sql index 9830cc239..a04ff285e 100644 --- a/kronolith/scripts/sql/kronolith.oci8.sql +++ b/kronolith/scripts/sql/kronolith.oci8.sql @@ -44,10 +44,10 @@ CREATE TABLE kronolith_shares ( share_id NUMBER(16) NOT NULL, share_name VARCHAR2(255) NOT NULL, share_owner VARCHAR2(255) NOT NULL, - share_flags NUMBER(8) NOT NULL DEFAULT 0, - perm_creator NUMBER(8) NOT NULL DEFAULT 0, - perm_default NUMBER(8) NOT NULL DEFAULT 0, - perm_guest NUMBER(8) NOT NULL DEFAULT 0, + share_flags NUMBER(8) DEFAULT 0 NOT NULL, + perm_creator NUMBER(8) DEFAULT 0 NOT NULL, + perm_default NUMBER(8) DEFAULT 0 NOT NULL, + perm_guest NUMBER(8) DEFAULT 0 NOT NULL, attribute_name VARCHAR2(255) NOT NULL, attribute_desc VARCHAR2(255), attribute_color VARCHAR2(7), diff --git a/kronolith/scripts/sql/kronolith.pgsql.sql b/kronolith/scripts/sql/kronolith.pgsql.sql index 76c67e4f4..121e131e7 100644 --- a/kronolith/scripts/sql/kronolith.pgsql.sql +++ b/kronolith/scripts/sql/kronolith.pgsql.sql @@ -44,10 +44,10 @@ CREATE TABLE kronolith_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(255) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), attribute_color VARCHAR(7), diff --git a/kronolith/scripts/sql/kronolith.sql b/kronolith/scripts/sql/kronolith.sql index 94c064786..a823d27ef 100644 --- a/kronolith/scripts/sql/kronolith.sql +++ b/kronolith/scripts/sql/kronolith.sql @@ -44,10 +44,10 @@ CREATE TABLE kronolith_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(255) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), attribute_color VARCHAR(7), diff --git a/kronolith/scripts/upgrades/2.1_to_2.2.oci8.sql b/kronolith/scripts/upgrades/2.1_to_2.2.oci8.sql index 62479517b..3b101a9dd 100644 --- a/kronolith/scripts/upgrades/2.1_to_2.2.oci8.sql +++ b/kronolith/scripts/upgrades/2.1_to_2.2.oci8.sql @@ -5,10 +5,10 @@ CREATE TABLE kronolith_shares ( share_id NUMBER(16) NOT NULL, share_name VARCHAR2(255) NOT NULL, share_owner VARCHAR2(255) NOT NULL, - share_flags NUMBER(8) NOT NULL DEFAULT 0, - perm_creator NUMBER(8) NOT NULL DEFAULT 0, - perm_default NUMBER(8) NOT NULL DEFAULT 0, - perm_guest NUMBER(8) NOT NULL DEFAULT 0, + share_flags NUMBER(8) DEFAULT 0 NOT NULL, + perm_creator NUMBER(8) DEFAULT 0 NOT NULL, + perm_default NUMBER(8) DEFAULT 0 NOT NULL, + perm_guest NUMBER(8) DEFAULT 0 NOT NULL, attribute_name VARCHAR2(255) NOT NULL, attribute_desc VARCHAR2(255), PRIMARY KEY (share_id) diff --git a/kronolith/scripts/upgrades/2.1_to_2.2.pgsql.sql b/kronolith/scripts/upgrades/2.1_to_2.2.pgsql.sql index bd42b7aa7..d2879ff7a 100644 --- a/kronolith/scripts/upgrades/2.1_to_2.2.pgsql.sql +++ b/kronolith/scripts/upgrades/2.1_to_2.2.pgsql.sql @@ -10,10 +10,10 @@ CREATE TABLE kronolith_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(32) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), PRIMARY KEY (share_id) diff --git a/kronolith/scripts/upgrades/2.1_to_2.2.sql b/kronolith/scripts/upgrades/2.1_to_2.2.sql index 177ebd1f8..88341fde6 100644 --- a/kronolith/scripts/upgrades/2.1_to_2.2.sql +++ b/kronolith/scripts/upgrades/2.1_to_2.2.sql @@ -5,10 +5,10 @@ CREATE TABLE kronolith_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(32) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), PRIMARY KEY (share_id) diff --git a/nag/scripts/sql/nag.mssql.sql b/nag/scripts/sql/nag.mssql.sql index 15fe1a741..8165a76b9 100644 --- a/nag/scripts/sql/nag.mssql.sql +++ b/nag/scripts/sql/nag.mssql.sql @@ -29,10 +29,10 @@ CREATE TABLE nag_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(255) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), PRIMARY KEY (share_id) diff --git a/nag/scripts/sql/nag.oci8.sql b/nag/scripts/sql/nag.oci8.sql index 527eb27c4..facb58930 100644 --- a/nag/scripts/sql/nag.oci8.sql +++ b/nag/scripts/sql/nag.oci8.sql @@ -29,10 +29,10 @@ CREATE TABLE nag_shares ( share_id NUMBER(16) NOT NULL, share_name VARCHAR2(255) NOT NULL, share_owner VARCHAR2(25) NOT NULL, - share_flags NUMBER(8) NOT NULL DEFAULT 0, - perm_creator NUMBER(8) NOT NULL DEFAULT 0, - perm_default NUMBER(8) NOT NULL DEFAULT 0, - perm_guest NUMBER(8) NOT NULL DEFAULT 0, + share_flags NUMBER(8) DEFAULT 0 NOT NULL, + perm_creator NUMBER(8) DEFAULT 0 NOT NULL, + perm_default NUMBER(8) DEFAULT 0 NOT NULL, + perm_guest NUMBER(8) DEFAULT 0 NOT NULL, attribute_name VARCHAR2(255) NOT NULL, attribute_desc VARCHAR2(255), PRIMARY KEY (share_id) diff --git a/nag/scripts/sql/nag.sql b/nag/scripts/sql/nag.sql index df38b0ee3..6a12c4eea 100644 --- a/nag/scripts/sql/nag.sql +++ b/nag/scripts/sql/nag.sql @@ -29,10 +29,10 @@ CREATE TABLE nag_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(255) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), PRIMARY KEY (share_id) diff --git a/nag/scripts/upgrades/2.1_to_2.2.oci8.sql b/nag/scripts/upgrades/2.1_to_2.2.oci8.sql index 90ac1b61d..82ffc2693 100644 --- a/nag/scripts/upgrades/2.1_to_2.2.oci8.sql +++ b/nag/scripts/upgrades/2.1_to_2.2.oci8.sql @@ -11,10 +11,10 @@ CREATE TABLE nag_shares ( share_id NUMBER(16) NOT NULL, share_name VARCHAR2(255) NOT NULL, share_owner VARCHAR2(32) NOT NULL, - share_flags NUMBER(8) NOT NULL DEFAULT 0, - perm_creator NUMBER(8) NOT NULL DEFAULT 0, - perm_default NUMBER(8) NOT NULL DEFAULT 0, - perm_guest NUMBER(8) NOT NULL DEFAULT 0, + share_flags NUMBER(8) DEFAULT 0 NOT NULL, + perm_creator NUMBER(8) DEFAULT 0 NOT NULL, + perm_default NUMBER(8) DEFAULT 0 NOT NULL, + perm_guest NUMBER(8) DEFAULT 0 NOT NULL, attribute_name VARCHAR2(255) NOT NULL, attribute_desc VARCHAR2(255), PRIMARY KEY (share_id) diff --git a/nag/scripts/upgrades/2.1_to_2.2.sql b/nag/scripts/upgrades/2.1_to_2.2.sql index 96a0573d6..36daff527 100644 --- a/nag/scripts/upgrades/2.1_to_2.2.sql +++ b/nag/scripts/upgrades/2.1_to_2.2.sql @@ -9,10 +9,10 @@ CREATE TABLE nag_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(32) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), PRIMARY KEY (share_id) diff --git a/turba/scripts/sql/turba.mssql.sql b/turba/scripts/sql/turba.mssql.sql index 77cd3d678..604216471 100644 --- a/turba/scripts/sql/turba.mssql.sql +++ b/turba/scripts/sql/turba.mssql.sql @@ -57,10 +57,10 @@ CREATE TABLE turba_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(255) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), attribute_params VARCHAR(MAX), diff --git a/turba/scripts/sql/turba.oci8.sql b/turba/scripts/sql/turba.oci8.sql index 7a1515426..6322affa3 100644 --- a/turba/scripts/sql/turba.oci8.sql +++ b/turba/scripts/sql/turba.oci8.sql @@ -56,10 +56,10 @@ CREATE TABLE turba_shares ( share_id NUMBER(16) NOT NULL, share_name VARCHAR2(255) NOT NULL, share_owner VARCHAR2(255) NOT NULL, - share_flags NUMBER(8) NOT NULL DEFAULT 0, - perm_creator NUMBER(8) NOT NULL DEFAULT 0, - perm_default NUMBER(8) NOT NULL DEFAULT 0, - perm_guest NUMBER(8) NOT NULL DEFAULT 0, + share_flags NUMBER(8) DEFAULT 0 NOT NULL, + perm_creator NUMBER(8) DEFAULT 0 NOT NULL, + perm_default NUMBER(8) DEFAULT 0 NOT NULL, + perm_guest NUMBER(8) DEFAULT 0 NOT NULL, attribute_name VARCHAR2(255) NOT NULL, attribute_desc VARCHAR2(255), attribute_params VARCHAR2(4000), diff --git a/turba/scripts/sql/turba.pgsql.sql b/turba/scripts/sql/turba.pgsql.sql index 2dd382a35..f6bfd6b47 100644 --- a/turba/scripts/sql/turba.pgsql.sql +++ b/turba/scripts/sql/turba.pgsql.sql @@ -57,10 +57,10 @@ CREATE TABLE turba_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(255) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), attribute_params TEXT, diff --git a/turba/scripts/sql/turba.sql b/turba/scripts/sql/turba.sql index c3c49047b..baa7fcc0b 100644 --- a/turba/scripts/sql/turba.sql +++ b/turba/scripts/sql/turba.sql @@ -56,10 +56,10 @@ CREATE TABLE turba_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(255) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), attribute_params TEXT, diff --git a/turba/scripts/upgrades/1.1_to_1.2.sql b/turba/scripts/upgrades/1.1_to_1.2.sql index d921cc1dd..e9001b9be 100644 --- a/turba/scripts/upgrades/1.1_to_1.2.sql +++ b/turba/scripts/upgrades/1.1_to_1.2.sql @@ -15,7 +15,7 @@ ALTER TABLE turba_objects CHANGE object_workPhone object_workphone VARCHAR(25); ALTER TABLE turba_objects CHANGE object_cellPhone object_cellphone VARCHAR(25); ALTER TABLE turba_objects MODIFY object_title VARCHAR(255); ALTER TABLE turba_objects MODIFY object_company VARCHAR(255); -ALTER TABLE turba_objects ADD object_type VARCHAR(255) NOT NULL DEFAULT 'Object'; +ALTER TABLE turba_objects ADD object_type VARCHAR(255) DEFAULT 'Object' NOT NULL; ALTER TABLE turba_objects ADD object_members BLOB; CREATE INDEX turba_owner_idx ON turba_objects (owner_id); diff --git a/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.mssql.sql b/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.mssql.sql index 117e30c30..eadf4d006 100644 --- a/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.mssql.sql +++ b/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.mssql.sql @@ -2,10 +2,10 @@ CREATE TABLE turba_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(32) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), attribute_params VARCHAR(MAX), diff --git a/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql b/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql index e593edc17..f0eba9e82 100644 --- a/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql +++ b/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql @@ -2,10 +2,10 @@ CREATE TABLE turba_shares ( share_id NUMBER(16) NOT NULL, share_name VARCHAR2(255) NOT NULL, share_owner VARCHAR2(32) NOT NULL, - share_flags NUMBER(8) NOT NULL DEFAULT 0, - perm_creator NUMBER(8) NOT NULL DEFAULT 0, - perm_default NUMBER(8) NOT NULL DEFAULT 0, - perm_guest NUMBER(8) NOT NULL DEFAULT 0, + share_flags NUMBER(8) DEFAULT 0 NOT NULL, + perm_creator NUMBER(8) DEFAULT 0 NOT NULL, + perm_default NUMBER(8) DEFAULT 0 NOT NULL, + perm_guest NUMBER(8) DEFAULT 0 NOT NULL, attribute_name VARCHAR2(255) NOT NULL, attribute_desc VARCHAR2(255), attribute_params VARCHAR2(4000), diff --git a/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.pgsql.sql b/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.pgsql.sql index 44173e0aa..7ea262429 100644 --- a/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.pgsql.sql +++ b/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.pgsql.sql @@ -2,10 +2,10 @@ CREATE TABLE turba_shares ( share_id SMALLINT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(32) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), attribute_params TEXT, diff --git a/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.sql b/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.sql index e42cfbf04..42045f4b2 100644 --- a/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.sql +++ b/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.sql @@ -2,10 +2,10 @@ CREATE TABLE turba_shares ( share_id INT NOT NULL, share_name VARCHAR(255) NOT NULL, share_owner VARCHAR(32) NOT NULL, - share_flags SMALLINT NOT NULL DEFAULT 0, - perm_creator SMALLINT NOT NULL DEFAULT 0, - perm_default SMALLINT NOT NULL DEFAULT 0, - perm_guest SMALLINT NOT NULL DEFAULT 0, + share_flags SMALLINT DEFAULT 0 NOT NULL, + perm_creator SMALLINT DEFAULT 0 NOT NULL, + perm_default SMALLINT DEFAULT 0 NOT NULL, + perm_guest SMALLINT DEFAULT 0 NOT NULL, attribute_name VARCHAR(255) NOT NULL, attribute_desc VARCHAR(255), attribute_params TEXT,