Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

Add missing NOT NULL restrictions

Browse Source
This commit is contained in:
Christophe Romain 2017-02-22 11:09:15 +01:00
parent c0b346e0b8
commit 56df6e7ba8
4 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sql/lite.sql
View File

@ -41,7 +41,7 @@ CREATE TABLE rosterusers (
ask character(1) NOT NULL, ask character(1) NOT NULL,
askmessage text NOT NULL, askmessage text NOT NULL,
server character(1) NOT NULL, server character(1) NOT NULL,
subscribe text, subscribe text NOT NULL,
type text, type text,
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
); );
@ -206,10 +206,10 @@ CREATE TABLE roster_version (
); );
CREATE TABLE pubsub_node ( CREATE TABLE pubsub_node (
host text, host text NOT NULL,
node text, node text NOT NULL,
parent text, parent text NOT NULL DEFAULT '',
type text, type text NOT NULL,
nodeid INTEGER PRIMARY KEY AUTOINCREMENT nodeid INTEGER PRIMARY KEY AUTOINCREMENT
); );
CREATE INDEX i_pubsub_node_parent ON pubsub_node (parent); CREATE INDEX i_pubsub_node_parent ON pubsub_node (parent);
@ -217,22 +217,22 @@ CREATE UNIQUE INDEX i_pubsub_node_tuple ON pubsub_node (host, node);
CREATE TABLE pubsub_node_option ( CREATE TABLE pubsub_node_option (
nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE, nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE,
name text, name text NOT NULL,
val text val text NOT NULL
); );
CREATE INDEX i_pubsub_node_option_nodeid ON pubsub_node_option (nodeid); CREATE INDEX i_pubsub_node_option_nodeid ON pubsub_node_option (nodeid);
CREATE TABLE pubsub_node_owner ( CREATE TABLE pubsub_node_owner (
nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE, nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE,
owner text owner text NOT NULL
); );
CREATE INDEX i_pubsub_node_owner_nodeid ON pubsub_node_owner (nodeid); CREATE INDEX i_pubsub_node_owner_nodeid ON pubsub_node_owner (nodeid);
CREATE TABLE pubsub_state ( CREATE TABLE pubsub_state (
nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE, nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE,
jid text, jid text NOT NULL,
affiliation character(1), affiliation character(1),
subscriptions text, subscriptions text NOT NULL DEFAULT '',
stateid INTEGER PRIMARY KEY AUTOINCREMENT stateid INTEGER PRIMARY KEY AUTOINCREMENT
); );
CREATE INDEX i_pubsub_state_jid ON pubsub_state (jid); CREATE INDEX i_pubsub_state_jid ON pubsub_state (jid);
@ -240,19 +240,19 @@ CREATE UNIQUE INDEX i_pubsub_state_tuple ON pubsub_state (nodeid, jid);
CREATE TABLE pubsub_item ( CREATE TABLE pubsub_item (
nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE, nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE,
itemid text, itemid text NOT NULL,
publisher text, publisher text NOT NULL,
creation text, creation text NOT NULL,
modification text, modification text NOT NULL,
payload text payload text NOT NULL DEFAULT ''
); );
CREATE INDEX i_pubsub_item_itemid ON pubsub_item (itemid); CREATE INDEX i_pubsub_item_itemid ON pubsub_item (itemid);
CREATE UNIQUE INDEX i_pubsub_item_tuple ON pubsub_item (nodeid, itemid); CREATE UNIQUE INDEX i_pubsub_item_tuple ON pubsub_item (nodeid, itemid);
CREATE TABLE pubsub_subscription_opt ( CREATE TABLE pubsub_subscription_opt (
subid text, subid text NOT NULL,
opt_name varchar(32), opt_name varchar(32),
opt_value text opt_value text NOT NULL
); );
CREATE UNIQUE INDEX i_pubsub_subscription_opt ON pubsub_subscription_opt (subid, opt_name); CREATE UNIQUE INDEX i_pubsub_subscription_opt ON pubsub_subscription_opt (subid, opt_name);

36
sql/mssql.sql
View File

@ -182,11 +182,11 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW
CREATE TABLE [dbo].[pubsub_item] ( CREATE TABLE [dbo].[pubsub_item] (
[nodeid] [bigint] NULL, [nodeid] [bigint] NULL,
[itemid] [varchar] (255) NULL, [itemid] [varchar] (255) NOT NULL,
[publisher] [text] NULL, [publisher] [text] NOT NULL,
[creation] [text] NULL, [creation] [text] NOT NULL,
[modification] [varchar] (255) NULL, [modification] [varchar] (255) NOT NULL,
[payload] [text] NULL [payload] [text] NOT NULL DEFAULT ''
) TEXTIMAGE_ON [PRIMARY]; ) TEXTIMAGE_ON [PRIMARY];
CREATE INDEX [pubsub_item_itemid] ON [pubsub_item] (itemid) CREATE INDEX [pubsub_item_itemid] ON [pubsub_item] (itemid)
@ -197,8 +197,8 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW
CREATE TABLE [dbo].[pubsub_node_option] ( CREATE TABLE [dbo].[pubsub_node_option] (
[nodeid] [bigint] NULL, [nodeid] [bigint] NULL,
[name] [text] NULL, [name] [text] NOT NULL,
[val] [text] NULL [val] [text] NOT NULL
) TEXTIMAGE_ON [PRIMARY]; ) TEXTIMAGE_ON [PRIMARY];
CREATE CLUSTERED INDEX [pubsub_node_option_nodeid] ON [pubsub_node_option] (nodeid) CREATE CLUSTERED INDEX [pubsub_node_option_nodeid] ON [pubsub_node_option] (nodeid)
@ -206,7 +206,7 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW
CREATE TABLE [dbo].[pubsub_node_owner] ( CREATE TABLE [dbo].[pubsub_node_owner] (
[nodeid] [bigint] NULL, [nodeid] [bigint] NULL,
[owner] [text] NULL [owner] [text] NOT NULL
) TEXTIMAGE_ON [PRIMARY]; ) TEXTIMAGE_ON [PRIMARY];
CREATE CLUSTERED INDEX [pubsub_node_owner_nodeid] ON [pubsub_node_owner] (nodeid) CREATE CLUSTERED INDEX [pubsub_node_owner_nodeid] ON [pubsub_node_owner] (nodeid)
@ -214,9 +214,9 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW
CREATE TABLE [dbo].[pubsub_state] ( CREATE TABLE [dbo].[pubsub_state] (
[nodeid] [bigint] NULL, [nodeid] [bigint] NULL,
[jid] [varchar] (255) NULL, [jid] [varchar] (255) NOT NULL,
[affiliation] [char] (1) NULL, [affiliation] [char] (1) NOT NULL,
[subscriptions] [text] NULL, [subscriptions] [text] NOT NULL DEFAULT '',
[stateid] [bigint] IDENTITY(1,1) NOT NULL, [stateid] [bigint] IDENTITY(1,1) NOT NULL,
CONSTRAINT [pubsub_state_PRIMARY] PRIMARY KEY CLUSTERED CONSTRAINT [pubsub_state_PRIMARY] PRIMARY KEY CLUSTERED
( (
@ -231,19 +231,19 @@ CREATE UNIQUE INDEX [pubsub_state_nodeid_jid] ON [pubsub_state] (nodeid, jid)
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON); WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON);
CREATE TABLE [dbo].[pubsub_subscription_opt] ( CREATE TABLE [dbo].[pubsub_subscription_opt] (
[subid] [varchar] (255) NULL, [subid] [varchar] (255) NOT NULL,
[opt_name] [varchar] (32) NULL, [opt_name] [varchar] (32) NOT NULL,
[opt_value] [text] NULL [opt_value] [text] NOT NULL
) TEXTIMAGE_ON [PRIMARY]; ) TEXTIMAGE_ON [PRIMARY];
CREATE UNIQUE CLUSTERED INDEX [pubsub_subscription_opt_subid_opt_name] ON [pubsub_subscription_opt] (subid, opt_name) CREATE UNIQUE CLUSTERED INDEX [pubsub_subscription_opt_subid_opt_name] ON [pubsub_subscription_opt] (subid, opt_name)
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON); WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON);
CREATE TABLE [dbo].[pubsub_node] ( CREATE TABLE [dbo].[pubsub_node] (
[host] [varchar] (255) NULL, [host] [varchar] (255) NOT NULL,
[node] [varchar] (255) NULL, [node] [varchar] (255) NOT NULL,
[parent] [varchar] (255) NULL, [parent] [varchar] (255) NOT NULL DEFAULT '',
[type] [text] NULL, [type] [text] NOT NULL,
[nodeid] [bigint] IDENTITY(1,1) NOT NULL, [nodeid] [bigint] IDENTITY(1,1) NOT NULL,
CONSTRAINT [pubsub_node_PRIMARY] PRIMARY KEY CLUSTERED CONSTRAINT [pubsub_node_PRIMARY] PRIMARY KEY CLUSTERED
( (

32
sql/mysql.sql
View File

@ -218,10 +218,10 @@ CREATE TABLE roster_version (
-- ALTER TABLE rosterusers ALTER COLUMN askmessage SET NOT NULL; -- ALTER TABLE rosterusers ALTER COLUMN askmessage SET NOT NULL;
CREATE TABLE pubsub_node ( CREATE TABLE pubsub_node (
host text, host text NOT NULL,
node text, node text NOT NULL,
parent text, parent text NOT NULL DEFAULT '',
type text, type text NOT NULL,
nodeid bigint auto_increment primary key nodeid bigint auto_increment primary key
) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE INDEX i_pubsub_node_parent ON pubsub_node(parent(120)); CREATE INDEX i_pubsub_node_parent ON pubsub_node(parent(120));
@ -229,24 +229,24 @@ CREATE UNIQUE INDEX i_pubsub_node_tuple ON pubsub_node(host(20), node(120));
CREATE TABLE pubsub_node_option ( CREATE TABLE pubsub_node_option (
nodeid bigint, nodeid bigint,
name text, name text NOT NULL,
val text val text NOT NULL
) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE INDEX i_pubsub_node_option_nodeid ON pubsub_node_option(nodeid); CREATE INDEX i_pubsub_node_option_nodeid ON pubsub_node_option(nodeid);
ALTER TABLE `pubsub_node_option` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE; ALTER TABLE `pubsub_node_option` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE;
CREATE TABLE pubsub_node_owner ( CREATE TABLE pubsub_node_owner (
nodeid bigint, nodeid bigint,
owner text owner text NOT NULL
) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE INDEX i_pubsub_node_owner_nodeid ON pubsub_node_owner(nodeid); CREATE INDEX i_pubsub_node_owner_nodeid ON pubsub_node_owner(nodeid);
ALTER TABLE `pubsub_node_owner` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE; ALTER TABLE `pubsub_node_owner` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE;
CREATE TABLE pubsub_state ( CREATE TABLE pubsub_state (
nodeid bigint, nodeid bigint,
jid text, jid text NOT NULL,
affiliation character(1), affiliation character(1),
subscriptions text, subscriptions text NOT NULL DEFAULT '',
stateid bigint auto_increment primary key stateid bigint auto_increment primary key
) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE INDEX i_pubsub_state_jid ON pubsub_state(jid(60)); CREATE INDEX i_pubsub_state_jid ON pubsub_state(jid(60));
@ -255,20 +255,20 @@ ALTER TABLE `pubsub_state` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (
CREATE TABLE pubsub_item ( CREATE TABLE pubsub_item (
nodeid bigint, nodeid bigint,
itemid text, itemid text NOT NULL,
publisher text, publisher text NOT NULL,
creation text, creation text NOT NULL,
modification text, modification text NOT NULL,
payload text payload text NOT NULL DEFAULT ''
) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE INDEX i_pubsub_item_itemid ON pubsub_item(itemid(36)); CREATE INDEX i_pubsub_item_itemid ON pubsub_item(itemid(36));
CREATE UNIQUE INDEX i_pubsub_item_tuple ON pubsub_item(nodeid, itemid(36)); CREATE UNIQUE INDEX i_pubsub_item_tuple ON pubsub_item(nodeid, itemid(36));
ALTER TABLE `pubsub_item` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE; ALTER TABLE `pubsub_item` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE;
CREATE TABLE pubsub_subscription_opt ( CREATE TABLE pubsub_subscription_opt (
subid text, subid text NOT NULL,
opt_name varchar(32), opt_name varchar(32),
opt_value text opt_value text NOT NULL
) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE UNIQUE INDEX i_pubsub_subscription_opt ON pubsub_subscription_opt(subid(32), opt_name(32)); CREATE UNIQUE INDEX i_pubsub_subscription_opt ON pubsub_subscription_opt(subid(32), opt_name(32));

34
sql/pg.sql
View File

@ -45,7 +45,7 @@ CREATE TABLE rosterusers (
ask character(1) NOT NULL, ask character(1) NOT NULL,
askmessage text NOT NULL, askmessage text NOT NULL,
server character(1) NOT NULL, server character(1) NOT NULL,
subscribe text, subscribe text NOT NULL,
"type" text, "type" text,
created_at TIMESTAMP NOT NULL DEFAULT now() created_at TIMESTAMP NOT NULL DEFAULT now()
); );
@ -224,10 +224,10 @@ CREATE TABLE roster_version (
-- ALTER TABLE rosterusers ALTER COLUMN askmessage SET NOT NULL; -- ALTER TABLE rosterusers ALTER COLUMN askmessage SET NOT NULL;
CREATE TABLE pubsub_node ( CREATE TABLE pubsub_node (
host text, host text NOT NULL,
node text, node text NOT NULL,
parent text, parent text NOT NULL DEFAULT '',
"type" text, "type" text NOT NULL,
nodeid SERIAL UNIQUE nodeid SERIAL UNIQUE
); );
CREATE INDEX i_pubsub_node_parent ON pubsub_node USING btree (parent); CREATE INDEX i_pubsub_node_parent ON pubsub_node USING btree (parent);
@ -235,22 +235,22 @@ CREATE UNIQUE INDEX i_pubsub_node_tuple ON pubsub_node USING btree (host, node);
CREATE TABLE pubsub_node_option ( CREATE TABLE pubsub_node_option (
nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE, nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE,
name text, name text NOT NULL,
val text val text NOT NULL
); );
CREATE INDEX i_pubsub_node_option_nodeid ON pubsub_node_option USING btree (nodeid); CREATE INDEX i_pubsub_node_option_nodeid ON pubsub_node_option USING btree (nodeid);
CREATE TABLE pubsub_node_owner ( CREATE TABLE pubsub_node_owner (
nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE, nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE,
owner text owner text NOT NULL
); );
CREATE INDEX i_pubsub_node_owner_nodeid ON pubsub_node_owner USING btree (nodeid); CREATE INDEX i_pubsub_node_owner_nodeid ON pubsub_node_owner USING btree (nodeid);
CREATE TABLE pubsub_state ( CREATE TABLE pubsub_state (
nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE, nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE,
jid text, jid text NOT NULL,
affiliation character(1), affiliation character(1),
subscriptions text, subscriptions text NOT NULL DEFAULT '',
stateid SERIAL UNIQUE stateid SERIAL UNIQUE
); );
CREATE INDEX i_pubsub_state_jid ON pubsub_state USING btree (jid); CREATE INDEX i_pubsub_state_jid ON pubsub_state USING btree (jid);
@ -258,19 +258,19 @@ CREATE UNIQUE INDEX i_pubsub_state_tuple ON pubsub_state USING btree (nodeid, ji
CREATE TABLE pubsub_item ( CREATE TABLE pubsub_item (
nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE, nodeid bigint REFERENCES pubsub_node(nodeid) ON DELETE CASCADE,
itemid text, itemid text NOT NULL,
publisher text, publisher text NOT NULL,
creation text, creation text NOT NULL,
modification text, modification text NOT NULL,
payload text payload text NOT NULL DEFAULT ''
); );
CREATE INDEX i_pubsub_item_itemid ON pubsub_item USING btree (itemid); CREATE INDEX i_pubsub_item_itemid ON pubsub_item USING btree (itemid);
CREATE UNIQUE INDEX i_pubsub_item_tuple ON pubsub_item USING btree (nodeid, itemid); CREATE UNIQUE INDEX i_pubsub_item_tuple ON pubsub_item USING btree (nodeid, itemid);
CREATE TABLE pubsub_subscription_opt ( CREATE TABLE pubsub_subscription_opt (
subid text, subid text NOT NULL,
opt_name varchar(32), opt_name varchar(32),
opt_value text opt_value text NOT NULL
); );
CREATE UNIQUE INDEX i_pubsub_subscription_opt ON pubsub_subscription_opt USING btree (subid, opt_name); CREATE UNIQUE INDEX i_pubsub_subscription_opt ON pubsub_subscription_opt USING btree (subid, opt_name);