Probably a bad merge I'll regret
This commit is contained in:
parent
912d417cb6
commit
d53c633527
|
@ -5,7 +5,7 @@
|
|||
--
|
||||
-- auto-generated by [Application Description Language framework]
|
||||
--
|
||||
-- (https://github.com/simon-brooke/adl) at 20180718T215811.044Z
|
||||
-- (https://github.com/simon-brooke/adl) at 20180721T111020.637Z
|
||||
--
|
||||
-- A web-app intended to be used by canvassers
|
||||
-- campaigning for a 'Yes' vote in the second independence
|
||||
|
@ -72,7 +72,7 @@ CREATE TABLE addresses
|
|||
(
|
||||
id SERIAL NOT NULL PRIMARY KEY,
|
||||
address VARCHAR(256) NOT NULL,
|
||||
postcode VARCHAR(16) CONSTRAINT pattern_14 CHECK (postcode ~* '^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([AZa-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))[0-9][A-Za-z]{2})$'),
|
||||
postcode VARCHAR(16) CONSTRAINT pattern_7470 CHECK (postcode ~* '^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([AZa-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))[0-9][A-Za-z]{2})$'),
|
||||
phone VARCHAR(16),
|
||||
district_id INTEGER,
|
||||
latitude DOUBLE PRECISION,
|
||||
|
@ -985,33 +985,31 @@ ALTER TABLE ln_roles_canvassers_roles ADD CONSTRAINT ri_ln_roles_canvassers_role
|
|||
ON DELETE NO ACTION ;
|
||||
|
||||
------------------------------------------------------------------------
|
||||
-- link table joining events with teams
|
||||
-- link table joining roles with canvassers
|
||||
------------------------------------------------------------------------
|
||||
CREATE TABLE ln_teams_events_teams
|
||||
CREATE TABLE ln_members_roles_canvassers
|
||||
(
|
||||
event_id INTEGER,
|
||||
team_id INTEGER
|
||||
role_id INTEGER,
|
||||
canvasser_id INTEGER
|
||||
);
|
||||
GRANT SELECT ON ln_teams_events_teams TO admin,
|
||||
GRANT SELECT ON ln_members_roles_canvassers TO admin,
|
||||
analysts,
|
||||
canvassers,
|
||||
issueeditors,
|
||||
issueexperts,
|
||||
teamorganisers ;
|
||||
GRANT INSERT ON ln_teams_events_teams TO admin,
|
||||
teamorganisers ;
|
||||
GRANT UPDATE ON ln_teams_events_teams TO admin,
|
||||
teamorganisers ;
|
||||
GRANT DELETE ON ln_teams_events_teams TO admin ;
|
||||
GRANT INSERT ON ln_members_roles_canvassers TO admin ;
|
||||
GRANT UPDATE ON ln_members_roles_canvassers TO admin ;
|
||||
GRANT DELETE ON ln_members_roles_canvassers TO admin ;
|
||||
|
||||
ALTER TABLE ln_teams_events_teams ADD CONSTRAINT ri_ln_teams_events_teams_events_event_id
|
||||
FOREIGN KEY( event_id )
|
||||
REFERENCES events(id)
|
||||
ALTER TABLE ln_members_roles_canvassers ADD CONSTRAINT ri_ln_members_roles_canvassers_canvassers_canvasser_id
|
||||
FOREIGN KEY( canvasser_id )
|
||||
REFERENCES canvassers(id)
|
||||
ON DELETE NO ACTION ;
|
||||
|
||||
ALTER TABLE ln_teams_events_teams ADD CONSTRAINT ri_ln_teams_events_teams_teams_team_id
|
||||
FOREIGN KEY( team_id )
|
||||
REFERENCES teams(id)
|
||||
ALTER TABLE ln_members_roles_canvassers ADD CONSTRAINT ri_ln_members_roles_canvassers_roles_role_id
|
||||
FOREIGN KEY( role_id )
|
||||
REFERENCES roles(id)
|
||||
ON DELETE NO ACTION ;
|
||||
|
||||
------------------------------------------------------------------------
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- DOCTYPE application PUBLIC "-//JOURNEYMAN//DTD ADL 1.4.1//EN"
|
||||
"http://www.journeyman.cc/adl/stable/adl/schemas/adl-1.4.1.dtd" -->
|
||||
<application xmlns="http://bowyer.journeyman.cc/adl/1.4.1/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:adl="http://bowyer.journeyman.cc/adl/1.4.1/" name="youyesyet" version="0.1.1">
|
||||
<!--
|
||||
"http://www.journeyman.cc/adl/stable/adl/schemas/adl-1.4.1.dtd" --><application xmlns="http://bowyer.journeyman.cc/adl/1.4.1/"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns:adl="http://bowyer.journeyman.cc/adl/1.4.1/"
|
||||
name="youyesyet"
|
||||
version="0.1.1"><!--
|
||||
***************************************************************************
|
||||
*
|
||||
* Application Description Language Framework
|
||||
|
|
Loading…
Reference in a new issue