Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions APLSource/SQL.apln
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,16 @@
';'(≠⊆⊢)sql ⍝ Split on semicolons
}

∇ msg←SetupSchema dum;create_migrations;folder;schema_definitions;sequence;latest;migrations;migration;batch;sql
∇ msg←SetupSchema dum;batch;create_migrations;folder;latest;migration;migrations;order;schema_definitions;sequence;sql
create_migrations←⊃⎕NGET ##.GLOBAL.app_dir,'/sql/migrations.sql'
Do create_migrations

folder←##.GetEnv'SCHEMA_DEFS'
schema_definitions←(⊂∘⍋⌷⊢)'.*\d+-.*.sql'⎕S'&'⊃0(⎕NINFO⍠'Wildcard' 1)folder
schema_definitions←'.*\d+-.*.sql'⎕S'&'⊃0(⎕NINFO⍠'Wildcard' 1)folder
sequence←∊2⊃¨⎕VFI¨⊃¨'-'(≠⊆⊢)¨2⊃¨⎕NPARTS¨schema_definitions
order←⍋sequence
schema_definitions←schema_definitions[order]
sequence←sequence[order]

:If 0=⊃latest←SQA.Do db'select max(batch) from migrations'
(migrations sequence)←(schema_definitions sequence)↓⍨¨3 1⊃latest ⍝ Database exists, apply after most recent migration
Expand Down
2 changes: 1 addition & 1 deletion APLSource/Version.aplf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version←Version
version←'3.24.2'
version←'3.24.3'
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
r←Test_Fail_InsertDuplicatePresentationMedia url;dmx
⍝ Test that duplicate presentation media cannot be inserted
r←0

sql←'INSERT INTO presentation_media (`presentation_id`, `media_id`, `type`) VALUES (1, 1, "youtube_video")'

:Trap 500
#.DCMS.SQL.Do sql
:Else
dmx←⎕DMX ⍝ Save ⎕DMX for debugging
r←'Duplicate entry'(∨/⍷)dmx.EM
:EndTrap
4 changes: 2 additions & 2 deletions Admin/Tests/InsertDummyData.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
event.title←(vocab:thing_names ⋄ max:2)generator.Name⍣{∧/≠⍵}n
event.(start end)←generator.DateTime¨2⍴n
event.type←?n⍴n
event.url_slug←'-'@(' '∘=)¨¯1⎕C event.title
event.url_slug←'-'@(' '∘=)¨¯1 ⎕C event.title
event.⎕DF'event'

organisation←()
Expand Down Expand Up @@ -93,7 +93,7 @@
WrapBackticks←(2↓∊)'`'∘(', ',⊣,⊣,⍨⊢)¨
WrapColons←(1↓∊)(',:',':',⍨⊢)¨

:For table :In event_type event organisation person category presentation presentation_type presenter presentation_media youtube_video
:For table :In event_type event organisation person category presentation_type presentation presenter presentation_media youtube_video
⎕←name←⍕table
table.id←⍳n
tid←D.GLOBAL.tables⍳⊂name
Expand Down
2 changes: 2 additions & 0 deletions sql/10-presentation-event_id-foreign-key.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `presentation` ADD CONSTRAINT FOREIGN KEY (`event_id`) REFERENCES `event`(`id`)
ON DELETE CASCADE ON UPDATE RESTRICT
2 changes: 2 additions & 0 deletions sql/11-presentation-type_id-foreign-key.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `presentation` ADD CONSTRAINT FOREIGN KEY (`type_id`) REFERENCES `presentation_type`(`id`)
ON DELETE CASCADE ON UPDATE RESTRICT
2 changes: 2 additions & 0 deletions sql/12-presenter-presentation_id-foreign-key.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `presenter` ADD CONSTRAINT FOREIGN KEY (`presentation_id`) REFERENCES `presentation`(`id`)
ON DELETE CASCADE ON UPDATE RESTRICT
2 changes: 2 additions & 0 deletions sql/13-presenter-person_id-foreign-key.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `presenter` ADD CONSTRAINT FOREIGN KEY (`person_id`) REFERENCES `person`(`id`)
ON DELETE CASCADE ON UPDATE RESTRICT
2 changes: 2 additions & 0 deletions sql/14-presentation_media-foreign-key.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `presentation_media` ADD CONSTRAINT FOREIGN KEY (`presentation_id`) REFERENCES `presentation`(`id`)
ON DELETE CASCADE ON UPDATE RESTRICT
1 change: 1 addition & 0 deletions sql/6-presentation_media-unique.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE `presentation_media` ADD CONSTRAINT UNIQUE (`presentation_id`, `media_id`, `type`);
1 change: 1 addition & 0 deletions sql/7-event-foreign-key-type.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE `event` MODIFY `type` int(10) unsigned
1 change: 1 addition & 0 deletions sql/8-presentation-foreign-key-type.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE `presentation_media` MODIFY `presentation_id` int(10) unsigned NOT NULL
2 changes: 2 additions & 0 deletions sql/9-event-foreign-key.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `event` ADD CONSTRAINT FOREIGN KEY (`type`) REFERENCES `event_type`(`id`)
ON DELETE CASCADE ON UPDATE RESTRICT