Merge pull request #1851 from RCOSDP/fix/issue59065

Add the SQL required for initial setup.

Author: ivis-miyachi

install.sh

@@ -8,6 +8,8 @@ DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker compose -f docker-compose2.y
 
 # Initialize resources
 docker compose -f docker-compose2.yml run --rm web ./scripts/populate-instance.sh
+docker cp scripts/demo/fix_lang_code_column.sql $(docker compose -f docker-compose2.yml ps -q postgresql):/tmp/fix_lang_code_column.sql
+docker compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/fix_lang_code_column.sql
 docker cp scripts/demo/item_type.sql $(docker compose -f docker-compose2.yml ps -q postgresql):/tmp/item_type.sql
 docker compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/item_type.sql
 docker cp scripts/demo/indextree.sql $(docker compose -f docker-compose2.yml ps -q postgresql):/tmp/indextree.sql
@@ -19,6 +21,8 @@ docker cp scripts/demo/doi_identifier.sql $(docker compose -f docker-compose2.ym
 docker compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/doi_identifier.sql
 docker cp postgresql/ddl/W-OA-user_activity_log.sql $(docker compose -f docker-compose2.yml ps -q postgresql):/tmp/W-OA-user_activity_log.sql
 docker compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/W-OA-user_activity_log.sql
+docker cp scripts/demo/restricted_mail_template.sql $(docker compose -f docker-compose2.yml ps -q postgresql):/tmp/restricted_mail_template.sql
+docker compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/restricted_mail_template.sql
 # docker cp scripts/demo/resticted_access.sql $(docker compose -f docker-compose2.yml ps -q postgresql):/tmp/resticted_access.sql
 # docker compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/resticted_access.sql
 

install3.sh

@@ -6,6 +6,8 @@ DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose -f docker-compose2.y
 
 # Initialize resources
 docker-compose -f docker-compose2.yml run --rm web ./scripts/populate-instance.sh
+docker cp scripts/demo/fix_lang_code_column.sql $(docker compose -f docker-compose2.yml ps -q postgresql):/tmp/fix_lang_code_column.sql
+docker compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/fix_lang_code_column.sql
 docker cp scripts/demo/item_type5.sql $(docker-compose -f docker-compose2.yml ps -q postgresql):/tmp/item_type.sql
 docker-compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/item_type.sql
 docker cp scripts/demo/bioItemtype.sql $(docker-compose -f docker-compose2.yml ps -q postgresql):/tmp/bioItemtype.sql
@@ -17,6 +19,10 @@ docker cp scripts/demo/defaultworkflow.sql $(docker-compose -f docker-compose2.y
 docker-compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/defaultworkflow.sql
 docker cp scripts/demo/doi_identifier.sql $(docker-compose -f docker-compose2.yml ps -q postgresql):/tmp/doi_identifier.sql
 docker-compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/doi_identifier.sql
+docker cp postgresql/ddl/W-OA-user_activity_log.sql $(docker compose -f docker-compose2.yml ps -q postgresql):/tmp/W-OA-user_activity_log.sql
+docker compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/W-OA-user_activity_log.sql
+docker cp scripts/demo/restricted_mail_template.sql $(docker compose -f docker-compose2.yml ps -q postgresql):/tmp/restricted_mail_template.sql
+docker compose -f docker-compose2.yml exec postgresql psql -U invenio -d invenio -f /tmp/restricted_mail_template.sql
 
 docker-compose -f docker-compose2.yml run --rm web invenio assets build
 docker-compose -f docker-compose2.yml run --rm web invenio collect -v

scripts/demo/fix_lang_code_column.sql

@@ -1,12 +1,9 @@
-RAISE NOTICE 'Update admin_lang_settings';
+
 --VARCHAR型カラムの文字数を変更する
 ALTER TABLE admin_lang_settings ALTER COLUMN lang_code TYPE character varying(10);
 
 --「zh」、「zh-cn」を「zh-Hans」に変更する
 UPDATE admin_lang_settings SET lang_code = 'zh_Hans', lang_name = '中文 (簡体)' WHERE lang_code = 'zh' OR lang_code = 'zh-cn';
--- Get number of rows updated
-GET DIAGNOSTICS updated_cnt = ROW_COUNT;
-RAISE NOTICE 'Updated % rows in admin_lang_settings from zh to zh_Hans', updated_cnt;
 
 -- 「zh-tw」を「zh_Hant」に書き換える
 UPDATE admin_lang_settings SET lang_code = 'zh_Hant', lang_name = '中文 (繁体)' WHERE lang_code = 'zh-tw';

scripts/demo/restricted_mail_template.sql

@@ -734,4 +734,4 @@ WHERE EXCLUDED.id = 11;
 -- Name: mail_templates_id_seq; Type: SEQUENCE SET; Schema: public; Owner: invenio
 --
 
-PERFORM pg_catalog.setval('mail_templates_id_seq', 15, true);
+SELECT pg_catalog.setval('mail_templates_id_seq', 15, true);