fix sql script, add column etc #10517

Author: pdurbin

src/main/resources/db/migration/V6.3.0.2.sql

@@ -1,9 +1,16 @@
 -- Dataset types have been added. See #10517 and #10694
 --
--- First, insert some types (dataset is the default).
+-- Insert some types (dataset is the default).
 INSERT INTO datasettype (name) VALUES ('dataset');
 INSERT INTO datasettype (name) VALUES ('software');
 INSERT INTO datasettype (name) VALUES ('workflow');
 --
--- Then, give existing datasets a type of "dataset".
+-- Add the new column (if it doesn't exist) and foreign key.
+ALTER TABLE dataset ADD COLUMN IF NOT EXISTS datasettype_id bigint;
+ALTER TABLE dataset ADD CONSTRAINT fk_dataset_datasettype_id FOREIGN KEY (datasettype_id) REFERENCES datasettype(id);
+--
+-- Give existing datasets a type of "dataset".
 UPDATE dataset SET datasettype_id = (SELECT id FROM datasettype WHERE name = 'dataset');
+--
+-- Make the column non-null
+ALTER TABLE dataset ALTER COLUMN datasettype_id SET NOT NULL;