diff options
| author | Matt N <github@matthew.noorenberghe.com> | 2016-09-16 05:40:39 -0700 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2016-09-16 13:40:39 +0100 |
| commit | 159e10030b59ae904cea586fd5da5f2e55ec96ad (patch) | |
| tree | baa147f33afedb2bfffacc8de5e45457a1303389 /app/Module | |
| parent | d0e75186449713360ecdf66ddf9c94888e8c219f (diff) | |
| download | webtrees-159e10030b59ae904cea586fd5da5f2e55ec96ad.tar.gz webtrees-159e10030b59ae904cea586fd5da5f2e55ec96ad.tar.bz2 webtrees-159e10030b59ae904cea586fd5da5f2e55ec96ad.zip | |
Include table prefix in foreign key names to avoid conflicts (#859)
Diffstat (limited to 'app/Module')
| -rw-r--r-- | app/Module/FamilyTreeFavorites/Schema/Migration2.php | 4 | ||||
| -rw-r--r-- | app/Module/FamilyTreeNews/Schema/Migration2.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/Module/FamilyTreeFavorites/Schema/Migration2.php b/app/Module/FamilyTreeFavorites/Schema/Migration2.php index cbaed3c483..2b152a2f5a 100644 --- a/app/Module/FamilyTreeFavorites/Schema/Migration2.php +++ b/app/Module/FamilyTreeFavorites/Schema/Migration2.php @@ -37,8 +37,8 @@ class Migration2 implements MigrationInterface { try { Database::exec( "ALTER TABLE `##favorite`" . - " ADD FOREIGN KEY favorite_fk1 (user_id ) REFERENCES `##user` (user_id) ON DELETE CASCADE," . - " ADD FOREIGN KEY favorite_fk2 (gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE" + " ADD FOREIGN KEY `##favorite_fk1` (user_id ) REFERENCES `##user` (user_id) ON DELETE CASCADE," . + " ADD FOREIGN KEY `##favorite_fk2` (gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE" ); } catch (PDOException $ex) { // Already updated? diff --git a/app/Module/FamilyTreeNews/Schema/Migration2.php b/app/Module/FamilyTreeNews/Schema/Migration2.php index 7e1a4efe93..d962c0feee 100644 --- a/app/Module/FamilyTreeNews/Schema/Migration2.php +++ b/app/Module/FamilyTreeNews/Schema/Migration2.php @@ -36,8 +36,8 @@ class Migration2 implements MigrationInterface { try { Database::exec( "ALTER TABLE `##news`" . - " ADD FOREIGN KEY news_fk1 (user_id ) REFERENCES `##user` (user_id) ON DELETE CASCADE," . - " ADD FOREIGN KEY news_fk2 (gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE" + " ADD FOREIGN KEY `##news_fk1` (user_id ) REFERENCES `##user` (user_id) ON DELETE CASCADE," . + " ADD FOREIGN KEY `##news_fk2` (gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE" ); } catch (PDOException $ex) { // Already updated? |