MySQL updates for 5.7

zesk · Feb 1, 2021 · 3692954 · 3692954
1 parent c970e8f
commit 3692954
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/modules/mysql/classes/Database/Parser.php b/modules/mysql/classes/Database/Parser.php
@@ -260,7 +260,8 @@ private function parse_column_sql(Database_Table $table, $sql) {
 
 			if ($sql_type === "timestamp" && !isset($options['default'])) {
 				if (!avalue($options, 'not null')) {
-					$options['default'] = null;
+					// $options['default'] = null;
+					// KMD False DEFAULT NULL not compatible 2021
 				} else {
 					$options['default'] = 0;
 					// KMD Was 2020-07-13 "CURRENT_TIMESTAMP";

diff --git a/modules/mysql/classes/Database/Type.php b/modules/mysql/classes/Database/Type.php
@@ -87,9 +87,9 @@ public function sql_type_default($native_type, $default_value = null) {
 			case self::sql_type_text:
 				return null;
 			case self::sql_type_integer:
-				return intval($default_value);
+				return is_numeric($default_value) ? intval($default_value) : null;
 			case self::sql_type_double:
-				return doubleval($default_value);
+				return is_numeric($default_value) ? floatval($default_value) : null;
 			case self::sql_type_datetime:
 				if ($default_value === 0 || $default_value === "0") {
 					$invalid_dates_ok = $this->database->option_bool("invalid_dates_ok");

diff --git a/modules/orm/classes/Module/ORM.php b/modules/orm/classes/Module/ORM.php
@@ -511,4 +511,14 @@ public function database_table_add_column(Database_Table $table, Database_Column
 		$adapter = $this->database_adapters[$code];
 		$adapter->database_column_set_type($column);
 	}
+
+	/**
+	 * Run beforehand.
+	 */
+	public function hook_cron_before() {
+		$application = $this->application;
+		$server = $application->orm_factory(Server::class);
+		/* @var $server Server */
+		$server->bury_dead_servers();
+	}
 }
diff --git a/modules/polyglot/classes/module/polyglot.inc b/modules/polyglot/classes/module/polyglot.inc
@@ -107,9 +107,9 @@ class Module_PolyGlot extends Module implements Interface_Module_Routes {
 	/**
 	 *
 	 * @param string $locale
-	 * @throws Exception_File_NotFound
-	 * @throws Exception_File_Format
 	 * @return PolyGlot_Token[]
+	 * @throws Exception_File_Format|Exception_Directory_NotFound
+	 * @throws Exception_File_NotFound
 	 */
 	public function load_locale($locale = null) {
 		$source_files = $this->option_list("source_files");