diff --git a/db/SCHEMA.sql b/db/SCHEMA.sql index 5b02782e3f59b04cd01cf8882dc67249cd3ec4c6..352a24bfdc1b0a119c058322769abe44ed2e61f4 100755 --- a/db/SCHEMA.sql +++ b/db/SCHEMA.sql @@ -1048,7 +1048,7 @@ CREATE TABLE `passkeys` ( PRIMARY KEY (`id`), KEY `user_id` (`user_id`), CONSTRAINT `user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; # Dump of table nominatim @@ -1080,5 +1080,5 @@ CREATE TABLE `nominatim_cache` ( # Dump of table -- for autofix comment, leave as it is # ------------------------------------------------------------ -UPDATE `settings` SET `version` = "1.6"; -UPDATE `settings` SET `dbversion` = 40; +UPDATE `settings` SET `version` = "1.7"; +UPDATE `settings` SET `dbversion` = 41; diff --git a/functions/upgrade_queries.php b/functions/upgrade_queries.php index 5f7c5a133e7809acb30f6f63c2c11359c765836e..5b9c993c60769b4b631bc7f87f449b91c42c75f1 100644 --- a/functions/upgrade_queries.php +++ b/functions/upgrade_queries.php @@ -19,6 +19,7 @@ include('upgrade_queries/upgrade_queries_1.3.php'); include('upgrade_queries/upgrade_queries_1.4.php'); include('upgrade_queries/upgrade_queries_1.5.php'); include('upgrade_queries/upgrade_queries_1.6.php'); +include('upgrade_queries/upgrade_queries_1.7.php'); // output if required diff --git a/functions/upgrade_queries/upgrade_queries_1.6.php b/functions/upgrade_queries/upgrade_queries_1.6.php index 289feed5a8687a0508b6d2fc4b4189975531d87a..43e9971e038fe1ea919b8d4a2bdeeeace7e5f00e 100644 --- a/functions/upgrade_queries/upgrade_queries_1.6.php +++ b/functions/upgrade_queries/upgrade_queries_1.6.php @@ -28,4 +28,4 @@ $upgrade_queries["1.6.40"][] = "CREATE TABLE `passkeys` ( PRIMARY KEY (`id`), KEY `user_id` (`user_id`), CONSTRAINT `user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8;"; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;"; \ No newline at end of file diff --git a/functions/upgrade_queries/upgrade_queries_1.7.php b/functions/upgrade_queries/upgrade_queries_1.7.php new file mode 100644 index 0000000000000000000000000000000000000000..99c5b6a6864c313e39dc9e057810be9828e3a750 --- /dev/null +++ b/functions/upgrade_queries/upgrade_queries_1.7.php @@ -0,0 +1,10 @@ +<?php + +# +# Version 1.71 queries +# +$upgrade_queries["1.7.41"] = []; +$upgrade_queries["1.7.41"][] = "-- Version update"; +$upgrade_queries["1.7.41"][] = "UPDATE `settings` set `version` = '1.7';"; +$upgrade_queries["1.7.41"][] = "-- Database version bump"; +$upgrade_queries["1.7.41"][] = "UPDATE `settings` set `dbversion` = '41';"; \ No newline at end of file diff --git a/functions/version.php b/functions/version.php index 8a8489b18650c53f7eb7eaab540cbeb53efc104f..da913411eb540f6a004bd8e053d890938a854111 100644 --- a/functions/version.php +++ b/functions/version.php @@ -1,14 +1,14 @@ <?php /* set latest version */ -define("VERSION", "1.6"); //decimal release version e.g 1.32 +define("VERSION", "1.7"); //decimal release version e.g 1.32 /* set latest version */ -define("VERSION_VISIBLE", "1.6.1"); //visible version in footer e.g 1.3.2 +define("VERSION_VISIBLE", "1.7.0"); //visible version in footer e.g 1.3.2 /* set latest revision */ -define("REVISION", "003"); //increment on static content changes (js/css) or point releases to avoid caching issues +define("REVISION", "001"); //increment on static content changes (js/css) or point releases to avoid caching issues /* set last possible upgrade */ define("LAST_POSSIBLE", "1.4"); //minimum required version to be able to upgrade /* set published - hide dbversion in footer */ -define("PUBLISHED", true); //hide dbversion in footer +define("PUBLISHED", false); //hide dbversion in footer // Automatically set DBVERSION as everyone forgets! function get_dbversion() {