chore(migrate): align naming and types as well as references

Adjusted existing migration scripts to reference which migration any of the workarounds for missing tables and indices mitigate.

Ensured compatibility and alignment with names that would be autogenerated by EclipseLink for better consistency and maintainability.

Author: poikilotherm

modules/dataverse-migrate-db/extra-migrations/V5.1.1.0__prepare-table-exttooltype.sql

@@ -2,20 +2,9 @@
 
 CREATE TABLE IF NOT EXISTS externaltooltype
 (
-    id              BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
-    type            VARCHAR(255)                            NOT NULL,
-    externalTool_id BIGINT                                  NOT NULL,
-    CONSTRAINT pk_externaltooltype PRIMARY KEY (id)
+    id              SERIAL PRIMARY KEY,
+    type            VARCHAR(255) NOT NULL,
+    externalTool_id BIGINT NOT NULL CONSTRAINT fk_externaltooltype_externaltool_id REFERENCES externaltool (id)
 );
 
-ALTER TABLE externaltooltype
-    ADD CONSTRAINT fk_externaltooltype_externaltool_id FOREIGN KEY (externalTool_id) REFERENCES externaltool (id);
-
-CREATE INDEX IF NOT EXISTS index_actionlogrecord_actiontype
-    ON externaltooltype (id);
-
-CREATE INDEX IF NOT EXISTS index_actionlogrecord_useridentifier
-    ON externaltooltype (externaltool_id);
-
-CREATE INDEX IF NOT EXISTS index_externaltooltype_externaltool_id
-    ON externaltooltype (externaltool_id);
+CREATE INDEX IF NOT EXISTS index_externaltooltype_externaltool_id ON externaltooltype (externaltool_id);

modules/dataverse-migrate-db/extra-migrations/V5.4.1.0__prepare-table-auxfile.sql

@@ -1,4 +1,4 @@
--- This is a workaround for the missing auxiliaryfile table
+-- This is a workaround for the missing auxiliaryfile table in migration V5.4.1.1
 
 create table if not exists auxiliaryfile
 (

modules/dataverse-migrate-db/extra-migrations/V5.9.0.0__prepare-table-license.sql

@@ -1,4 +1,4 @@
--- This is a workaround for the missing license table
+-- This is a workaround for the missing license table in migration V5.9.0.1
 
 create table if not exists license
 (
@@ -13,9 +13,3 @@ create table if not exists license
 );
 
 create index if not exists license_sortorder_id on license (sortorder, id);
-
--- Save information about CCBY license to temporary table (to be used in a migration after the main license migration)
-CREATE TEMPORARY TABLE ccby(
-   id serial  primary key
-);
-INSERT INTO ccby (id) SELECT id FROM termsofuseandaccess WHERE license = 'CCBY';

modules/dataverse-migrate-db/extra-migrations/V6.0.0.0__prepare-tables-embargo-storageuse.sql

@@ -1,12 +1,12 @@
--- This is a workaround for the missing embargo table
+-- This is a workaround for the missing embargo table in migration V6.0.0.2
 create table if not exists embargo
 (
     id            serial primary key,
     dateavailable date not null,
     reason        text
 );
 
--- This is a workaround for the missing storageuse table
+-- This is a workaround for the missing storageuse table in migration V6.0.0.5
 create table if not exists storageuse
 (
     id                   serial primary key,

modules/dataverse-migrate-db/extra-migrations/V6.1.0.0__prepare-table-extvocab.sql

@@ -1,4 +1,4 @@
--- This is a workaround for the missing externalvocabularyvalue table
+-- This is a workaround for the missing externalvocabularyvalue table in migration V6.1.0.3
 create table if not exists externalvocabularyvalue
 (
     id             serial primary key,

modules/dataverse-migrate-db/extra-migrations/V6.3.0.0__prepare-table-datasettype.sql

@@ -1,33 +1,29 @@
-CREATE TABLE IF NOT EXISTS DatasetType
-(
-    id   BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
-    name VARCHAR(255)                            NOT NULL,
-    CONSTRAINT pk_datasettype PRIMARY KEY (id)
-);
+-- This is a workaround for the missing dataset type tables in migration V6.3.0.3
 
-CREATE TABLE IF NOT EXISTS DatasetType_licenses
+create table if not exists datasettype
 (
-    DatasetType_id BIGINT NOT NULL,
-    licenses_id    BIGINT NOT NULL
+    id   serial primary key,
+    name varchar(255) not null constraint unq_datasettype_0 unique
 );
 
-CREATE TABLE IF NOT EXISTS DatasetType_metadataBlocks
+create table if not exists datasettype_licenses
 (
-    DatasetType_id    BIGINT NOT NULL,
-    metadataBlocks_id BIGINT NOT NULL
+    datasettype_id bigint not null
+        constraint fk_datasettype_license_datasettype_id
+            references datasettype,
+    licenses_id    bigint not null
+        constraint fk_datasettype_license_licenses_id
+            references license,
+    primary key (datasettype_id, licenses_id)
 );
 
-ALTER TABLE DatasetType
-    ADD CONSTRAINT uc_828171b214f7369ee92a28781 UNIQUE (name);
-
-ALTER TABLE DatasetType_licenses
-    ADD CONSTRAINT fk_datlic_on_dataset_type FOREIGN KEY (DatasetType_id) REFERENCES DatasetType (id);
-
-ALTER TABLE DatasetType_licenses
-    ADD CONSTRAINT fk_datlic_on_license FOREIGN KEY (licenses_id) REFERENCES License (id);
-
-ALTER TABLE DatasetType_metadataBlocks
-    ADD CONSTRAINT fk_datmet_on_dataset_type FOREIGN KEY (DatasetType_id) REFERENCES DatasetType (id);
-
-ALTER TABLE DatasetType_metadataBlocks
-    ADD CONSTRAINT fk_datmet_on_metadata_block FOREIGN KEY (metadataBlocks_id) REFERENCES MetadataBlock (id);
+create table if not exists datasettype_metadatablocks
+(
+    datasettype_id    bigint not null
+        constraint fk_datasettype_metadatablock_datasettype_id
+            references datasettype,
+    metadatablocks_id bigint not null
+        constraint fk_datasettype_metadatablock_metadatablocks_id
+            references public.metadatablock,
+    primary key (datasettype_id, metadatablocks_id)
+);

modules/dataverse-migrate-db/extra-migrations/V6.5.0.0__prepare-table-mdc-proc-state.sql

@@ -1,11 +1,12 @@
+-- This is a workaround for the missing MakeDataCount tables in migration V6.5.0.10
+
 CREATE TABLE IF NOT EXISTS MakeDataCountProcessState
 (
-    id                   BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
-    yearMonth            VARCHAR(255)                            NOT NULL,
-    state                INTEGER                                 NOT NULL,
+    id                   SERIAL PRIMARY KEY,
+    yearMonth            VARCHAR(255) NOT NULL,
+    state                INTEGER NOT NULL,
     stateChangeTimestamp TIMESTAMP WITHOUT TIME ZONE,
-    server               VARCHAR(255),
-    CONSTRAINT pk_makedatacountprocessstate PRIMARY KEY (id)
+    server               VARCHAR(255)
 );
 
-CREATE INDEX IF NOT EXISTS idx_18d578c22760ad21e31cc873d ON MakeDataCountProcessState (yearMonth);
+CREATE INDEX IF NOT EXISTS index_makedatacountprocessstate_yearmonth ON MakeDataCountProcessState (yearMonth);

modules/dataverse-migrate-db/extra-migrations/V6.6.0.0__prepare-table-dataversefeatureditem.sql

@@ -0,0 +1,16 @@
+-- This is a workaround for the missing tables in migration V6.6.0.2
+
+create table if not exists dataversefeatureditem
+(
+    id            serial primary key,
+    content       text,
+    displayorder  integer not null,
+    imagefilename varchar(255),
+    type          text,
+    dataverse_id  bigint not null constraint fk_dataversefeatureditem_dataverse_id references dvobject,
+    dvobject_id   bigint constraint fk_dataversefeatureditem_dvobject_id references dvobject
+);
+
+create index if not exists index_dataversefeatureditem_displayorder on dataversefeatureditem (displayorder);
+-- It's unclear why EclipseLink generated this particular index and with this name... Just going along with it.
+create index if not exists index_harvestingclient_harvesttype on dataversefeatureditem (id);