From 36b85440fbc270769a770b3ab006cb730f97f9dc Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <dceejay@gmail.com>
Date: Tue, 28 Nov 2023 17:58:06 +0000
Subject: [PATCH] Major bump of mysql2 libs

and move name field
---
 storage/mysql/68-mysql.html | 16 ++++++++--------
 storage/mysql/package.json  | 10 +++++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/storage/mysql/68-mysql.html b/storage/mysql/68-mysql.html
index ac437e31..00ff469c 100644
--- a/storage/mysql/68-mysql.html
+++ b/storage/mysql/68-mysql.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="MySQLdatabase">
+    <div class="form-row">
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
+        <input type="text" id="node-config-input-name" data-i18n="[placeholder]node-red:common.label.name">
+    </div>
     <div class="form-row">
         <label for="node-config-input-host"><i class="fa fa-globe"></i> <span data-i18n="mysql.label.host"></span></label>
         <input type="text" id="node-config-input-host">
@@ -28,10 +32,6 @@
         <label for="node-config-input-charset"><i class="fa fa-language"></i> <span data-i18n="mysql.label.charset"></span></label>
         <input type="text" id="node-config-input-charset">
     </div>
-    <div class="form-row">
-        <label for="node-config-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
-        <input type="text" id="node-config-input-name" data-i18n="[placeholder]node-red:common.label.name">
-    </div>
     <div class="form-tips"><span data-i18n="[html]mysql.tip"></span></div>
 </script>
 
@@ -57,14 +57,14 @@
 </script>
 
 <script type="text/html" data-template-name="mysql">
-    <div class="form-row">
-        <label for="node-input-mydb"><i class="fa fa-database"></i> <span data-i18n="mysql.label.database"></label>
-        <input type="text" id="node-input-mydb">
-    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
     </div>
+    <div class="form-row">
+        <label for="node-input-mydb"><i class="fa fa-database"></i> <span data-i18n="mysql.label.database"></label>
+        <input type="text" id="node-input-mydb">
+    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/storage/mysql/package.json b/storage/mysql/package.json
index dabe5c85..ed01ad46 100644
--- a/storage/mysql/package.json
+++ b/storage/mysql/package.json
@@ -1,9 +1,9 @@
 {
     "name": "node-red-node-mysql",
-    "version": "1.0.3",
+    "version": "2.0.0",
     "description": "A Node-RED node to read and write to a MySQL database",
     "dependencies": {
-        "mysql2": "^2.3.3"
+        "mysql2": "^3.6.5"
     },
     "repository": {
         "type": "git",
@@ -16,13 +16,17 @@
         "mysql"
     ],
     "node-red": {
+        "version": ">=3.0.0",
         "nodes": {
             "mysql": "68-mysql.js"
         }
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
+    },
+    "engines": {
+        "node": ">=16"
     }
 }