From 720adfd573932a01fcfb47e4e0b684d9e78de62a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 26 Dec 2019 12:06:10 +0100 Subject: [PATCH] Bug 24289: Make sure sample_holidays will load after sample_libraries They are inserted depending on their alpha order, and sample_holidays will fail because of missing branchcode. This patch suggests a simple fix: rename sample_holidays to sample_libraries_holidays, to make sure it will be loaded after sample_libraries Test plan: Start a fresh installation and select all sample data --- .../de-DE/optional/{sample_holidays.sql => sample_libraries_holidays.sql} | 0 .../de-DE/optional/{sample_holidays.txt => sample_libraries_holidays.txt} | 0 .../en/optional/{sample_holidays.sql => sample_libraries_holidays.sql} | 0 .../en/optional/{sample_holidays.txt => sample_libraries_holidays.txt} | 0 .../es-ES/optional/{sample_holidays.sql => sample_libraries_holidays.sql} | 0 .../es-ES/optional/{sample_holidays.txt => sample_libraries_holidays.txt} | 0 .../facultatif/{sample_holidays.sql => sample_librairies_holidays.sql} | 0 .../facultatif/{sample_holidays.txt => sample_librairies_holidays.txt} | 0 .../it-IT/optional/{sample_holidays.sql => sample_libraries_holidays.sql} | 0 .../it-IT/optional/{sample_holidays.txt => sample_libraries_holidays.txt} | 0 .../2-Valgfritt/{sample_holidays.sql => sample_libraries_holidays.sql} | 0 .../2-Valgfritt/{sample_holidays.txt => sample_libraries_holidays.txt} | 0 .../pl-PL/optional/{sample_holidays.sql => sample_libraries_holidays.sql} | 0 .../pl-PL/optional/{sample_holidays.txt => sample_libraries_holidays.txt} | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename installer/data/mysql/de-DE/optional/{sample_holidays.sql => sample_libraries_holidays.sql} (100%) rename installer/data/mysql/de-DE/optional/{sample_holidays.txt => sample_libraries_holidays.txt} (100%) rename installer/data/mysql/en/optional/{sample_holidays.sql => sample_libraries_holidays.sql} (100%) rename installer/data/mysql/en/optional/{sample_holidays.txt => sample_libraries_holidays.txt} (100%) rename installer/data/mysql/es-ES/optional/{sample_holidays.sql => sample_libraries_holidays.sql} (100%) rename installer/data/mysql/es-ES/optional/{sample_holidays.txt => sample_libraries_holidays.txt} (100%) rename installer/data/mysql/fr-CA/facultatif/{sample_holidays.sql => sample_librairies_holidays.sql} (100%) rename installer/data/mysql/fr-CA/facultatif/{sample_holidays.txt => sample_librairies_holidays.txt} (100%) rename installer/data/mysql/it-IT/optional/{sample_holidays.sql => sample_libraries_holidays.sql} (100%) rename installer/data/mysql/it-IT/optional/{sample_holidays.txt => sample_libraries_holidays.txt} (100%) rename installer/data/mysql/nb-NO/2-Valgfritt/{sample_holidays.sql => sample_libraries_holidays.sql} (100%) rename installer/data/mysql/nb-NO/2-Valgfritt/{sample_holidays.txt => sample_libraries_holidays.txt} (100%) rename installer/data/mysql/pl-PL/optional/{sample_holidays.sql => sample_libraries_holidays.sql} (100%) rename installer/data/mysql/pl-PL/optional/{sample_holidays.txt => sample_libraries_holidays.txt} (100%) diff --git a/installer/data/mysql/de-DE/optional/sample_holidays.sql b/installer/data/mysql/de-DE/optional/sample_libraries_holidays.sql similarity index 100% rename from installer/data/mysql/de-DE/optional/sample_holidays.sql rename to installer/data/mysql/de-DE/optional/sample_libraries_holidays.sql diff --git a/installer/data/mysql/de-DE/optional/sample_holidays.txt b/installer/data/mysql/de-DE/optional/sample_libraries_holidays.txt similarity index 100% rename from installer/data/mysql/de-DE/optional/sample_holidays.txt rename to installer/data/mysql/de-DE/optional/sample_libraries_holidays.txt diff --git a/installer/data/mysql/en/optional/sample_holidays.sql b/installer/data/mysql/en/optional/sample_libraries_holidays.sql similarity index 100% rename from installer/data/mysql/en/optional/sample_holidays.sql rename to installer/data/mysql/en/optional/sample_libraries_holidays.sql diff --git a/installer/data/mysql/en/optional/sample_holidays.txt b/installer/data/mysql/en/optional/sample_libraries_holidays.txt similarity index 100% rename from installer/data/mysql/en/optional/sample_holidays.txt rename to installer/data/mysql/en/optional/sample_libraries_holidays.txt diff --git a/installer/data/mysql/es-ES/optional/sample_holidays.sql b/installer/data/mysql/es-ES/optional/sample_libraries_holidays.sql similarity index 100% rename from installer/data/mysql/es-ES/optional/sample_holidays.sql rename to installer/data/mysql/es-ES/optional/sample_libraries_holidays.sql diff --git a/installer/data/mysql/es-ES/optional/sample_holidays.txt b/installer/data/mysql/es-ES/optional/sample_libraries_holidays.txt similarity index 100% rename from installer/data/mysql/es-ES/optional/sample_holidays.txt rename to installer/data/mysql/es-ES/optional/sample_libraries_holidays.txt diff --git a/installer/data/mysql/fr-CA/facultatif/sample_holidays.sql b/installer/data/mysql/fr-CA/facultatif/sample_librairies_holidays.sql similarity index 100% rename from installer/data/mysql/fr-CA/facultatif/sample_holidays.sql rename to installer/data/mysql/fr-CA/facultatif/sample_librairies_holidays.sql diff --git a/installer/data/mysql/fr-CA/facultatif/sample_holidays.txt b/installer/data/mysql/fr-CA/facultatif/sample_librairies_holidays.txt similarity index 100% rename from installer/data/mysql/fr-CA/facultatif/sample_holidays.txt rename to installer/data/mysql/fr-CA/facultatif/sample_librairies_holidays.txt diff --git a/installer/data/mysql/it-IT/optional/sample_holidays.sql b/installer/data/mysql/it-IT/optional/sample_libraries_holidays.sql similarity index 100% rename from installer/data/mysql/it-IT/optional/sample_holidays.sql rename to installer/data/mysql/it-IT/optional/sample_libraries_holidays.sql diff --git a/installer/data/mysql/it-IT/optional/sample_holidays.txt b/installer/data/mysql/it-IT/optional/sample_libraries_holidays.txt similarity index 100% rename from installer/data/mysql/it-IT/optional/sample_holidays.txt rename to installer/data/mysql/it-IT/optional/sample_libraries_holidays.txt diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_holidays.sql b/installer/data/mysql/nb-NO/2-Valgfritt/sample_libraries_holidays.sql similarity index 100% rename from installer/data/mysql/nb-NO/2-Valgfritt/sample_holidays.sql rename to installer/data/mysql/nb-NO/2-Valgfritt/sample_libraries_holidays.sql diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_holidays.txt b/installer/data/mysql/nb-NO/2-Valgfritt/sample_libraries_holidays.txt similarity index 100% rename from installer/data/mysql/nb-NO/2-Valgfritt/sample_holidays.txt rename to installer/data/mysql/nb-NO/2-Valgfritt/sample_libraries_holidays.txt diff --git a/installer/data/mysql/pl-PL/optional/sample_holidays.sql b/installer/data/mysql/pl-PL/optional/sample_libraries_holidays.sql similarity index 100% rename from installer/data/mysql/pl-PL/optional/sample_holidays.sql rename to installer/data/mysql/pl-PL/optional/sample_libraries_holidays.sql diff --git a/installer/data/mysql/pl-PL/optional/sample_holidays.txt b/installer/data/mysql/pl-PL/optional/sample_libraries_holidays.txt similarity index 100% rename from installer/data/mysql/pl-PL/optional/sample_holidays.txt rename to installer/data/mysql/pl-PL/optional/sample_libraries_holidays.txt -- 2.11.0