From 3bfb94b0b402ff08e5888afb946384316f6d3e60 Mon Sep 17 00:00:00 2001 From: Greg Roach Date: Tue, 2 Jun 2015 23:51:34 +0100 Subject: Refactor database migrations to use autoloading and remove duplicates --- modules_v3/googlemap/db_schema/db_schema_0_1.php | 46 ------------------------ modules_v3/googlemap/db_schema/db_schema_1_2.php | 45 ----------------------- modules_v3/googlemap/db_schema/db_schema_2_3.php | 26 -------------- modules_v3/googlemap/db_schema/db_schema_3_4.php | 32 ----------------- modules_v3/googlemap/db_schema/db_schema_4_5.php | 29 --------------- modules_v3/googlemap/module.php | 1 - 6 files changed, 179 deletions(-) delete mode 100644 modules_v3/googlemap/db_schema/db_schema_0_1.php delete mode 100644 modules_v3/googlemap/db_schema/db_schema_1_2.php delete mode 100644 modules_v3/googlemap/db_schema/db_schema_2_3.php delete mode 100644 modules_v3/googlemap/db_schema/db_schema_3_4.php delete mode 100644 modules_v3/googlemap/db_schema/db_schema_4_5.php (limited to 'modules_v3/googlemap') diff --git a/modules_v3/googlemap/db_schema/db_schema_0_1.php b/modules_v3/googlemap/db_schema/db_schema_0_1.php deleted file mode 100644 index 7d17ca84c1..0000000000 --- a/modules_v3/googlemap/db_schema/db_schema_0_1.php +++ /dev/null @@ -1,46 +0,0 @@ -. - */ - -// Update the GM module database schema from version 0 to version 1 -// -// Version 0: empty database -// Version 1: create the tables, as per PhpGedView 4.2.1 - -// Create all of the tables needed for this module - -Database::exec( - "CREATE TABLE IF NOT EXISTS `##placelocation` (" . - " pl_id INTEGER NOT NULL," . - " pl_parent_id INTEGER NULL," . - " pl_level INTEGER NULL," . - " pl_place VARCHAR(255) NULL," . - " pl_long VARCHAR(30) NULL," . - " pl_lati VARCHAR(30) NULL," . - " pl_zoom INTEGER NULL," . - " pl_icon VARCHAR(255) NULL," . - " PRIMARY KEY (pl_id)," . - " KEY ix1 (pl_level)," . - " KEY ix2 (pl_long)," . - " KEY ix3 (pl_lati)," . - " KEY ix4 (pl_place)," . - " KEY ix5 (pl_parent_id)" . - ") COLLATE utf8_unicode_ci ENGINE=InnoDB" -); - -// Update the version to indicate success -Site::setPreference($schema_name, $next_version); diff --git a/modules_v3/googlemap/db_schema/db_schema_1_2.php b/modules_v3/googlemap/db_schema/db_schema_1_2.php deleted file mode 100644 index a2f3c3e631..0000000000 --- a/modules_v3/googlemap/db_schema/db_schema_1_2.php +++ /dev/null @@ -1,45 +0,0 @@ -. - */ - -use PDOException; - -// Update the GM module database schema from version 1 to version 2 -// -// Version 0: empty database -// Version 1: create the tables, as per PhpGedView 4.2.1 -// Version 2: update the tables to support streetview - -// Create all of the tables needed for this module - -try { - Database::exec( - "ALTER TABLE `##placelocation` ADD (" . - " pl_media VARCHAR(60) NULL," . - " sv_long FLOAT NOT NULL DEFAULT 0," . - " sv_lati FLOAT NOT NULL DEFAULT 0," . - " sv_bearing FLOAT NOT NULL DEFAULT 0," . - " sv_elevation FLOAT NOT NULL DEFAULT 0," . - " sv_zoom FLOAT NOT NULL DEFAULT 1" . - ")" - ); -} catch (PDOException $ex) { - // Already done this? -} - -// Update the version to indicate success -Site::setPreference($schema_name, $next_version); diff --git a/modules_v3/googlemap/db_schema/db_schema_2_3.php b/modules_v3/googlemap/db_schema/db_schema_2_3.php deleted file mode 100644 index b684f09b8f..0000000000 --- a/modules_v3/googlemap/db_schema/db_schema_2_3.php +++ /dev/null @@ -1,26 +0,0 @@ -. - */ - -// Update the GM module database schema from version 2 to version 3 -// -// Convert flag icons from .gif to .png - -Database::exec("UPDATE `##placelocation` SET pl_icon=REPLACE(pl_icon, '.gif', '.png')"); - -// Update the version to indicate success -Site::setPreference($schema_name, $next_version); diff --git a/modules_v3/googlemap/db_schema/db_schema_3_4.php b/modules_v3/googlemap/db_schema/db_schema_3_4.php deleted file mode 100644 index 78f5a225e5..0000000000 --- a/modules_v3/googlemap/db_schema/db_schema_3_4.php +++ /dev/null @@ -1,32 +0,0 @@ -. - */ - -// Update the GM module database schema from version 3 to version 4 -// -// Combine the two ways of enabling the GM module - -Database::exec( - "UPDATE `##module` m, `##module_setting` ms SET m.status=CASE WHEN (m.status=1 AND ms.setting_value=1) THEN 'enabled' ELSE 'disabled' END WHERE m.module_name=ms.module_name AND m.module_name='googlemap' AND ms.setting_name='GM_ENABLED'" -); - -Database::exec( - "DELETE FROM `##module_setting` WHERE module_name='googlemap' AND setting_name='GM_ENABLED'" -); - -// Update the version to indicate success -Site::setPreference($schema_name, $next_version); diff --git a/modules_v3/googlemap/db_schema/db_schema_4_5.php b/modules_v3/googlemap/db_schema/db_schema_4_5.php deleted file mode 100644 index b890f5f919..0000000000 --- a/modules_v3/googlemap/db_schema/db_schema_4_5.php +++ /dev/null @@ -1,29 +0,0 @@ -. - */ - -// Update the GM module database schema from version 4 to version 5 -// -// Delete some old/unused configuration settings - -Database::exec( - "DELETE FROM `##module_setting` WHERE module_name='googlemap' AND setting_name IN ( - 'GM_API_KEY', 'GM_DEFAULT_TOP_VALUE', 'GM_DISP_COUNT', 'GM_MAX_NOF_LEVELS', 'GM_PH_CONTROLS', 'GM_PH_WHEEL', 'GM_PRE_POST_MODE_1', 'GM_PRE_POST_MODE_2', 'GM_PRE_POST_MODE_3', 'GM_PRE_POST_MODE_4', 'GM_PRE_POST_MODE_5', 'GM_PRE_POST_MODE_6', 'GM_PRE_POST_MODE_7', 'GM_PRE_POST_MODE_8', 'GM_PRE_POST_MODE_9')" -); - -// Update the version to indicate success -Site::setPreference($schema_name, $next_version); diff --git a/modules_v3/googlemap/module.php b/modules_v3/googlemap/module.php index eb1348d3a2..834eba6e0e 100644 --- a/modules_v3/googlemap/module.php +++ b/modules_v3/googlemap/module.php @@ -15,7 +15,6 @@ namespace Fisharebest\Webtrees; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - use Fisharebest\Webtrees\Module\GoogleMapsModule; return new GoogleMapsModule(__DIR__); -- cgit v1.3