add checks for mysql version, change alter user syntax if it's 8 or g…

schema.json

@@ -117,14 +117,14 @@
                   "propertyName" : {
                      "type" : "string",
                      "prettyName": "Property Name",
-                     "pattern": "^$|^[_a-zA-Z0-9]*$",
+                     "pattern": "^$|^[_a-zA-Z0-9\\-]*$",
                      "default": "",
                      "maxLength": 40
                   },
                   "value": {
                      "type": "string",
                      "prettyName": "Value",
-                     "pattern": "^$|^[_a-zA-Z0-9]*$",
+                     "pattern": "^$|^[_a-zA-Z0-9\/\\-\\._]*$",
                      "default": "",
                      "maxLength": 40
                   }

src/pluginops/pluginops.py

@@ -76,7 +76,8 @@ def find_mysql_binaries(connection):
                 versionArr=versionStr.split(" ")
                 version=versionArr[3]
                 if (version !="" and baseName =="mysqld"):
-                    prettyName= versionStr[versionStr.index("(MySQL"):len(versionStr)]
+                    r=re.compile("\((MariaDB|MySQL)")
+                    prettyName= versionStr[r.search(versionStr).start():len(versionStr)]
                     prettyName= prettyName+" {}".format(version)
                     repository = RepositoryDefinition(
                                     name=prettyName,

src/resources/restore_stage.sh

@@ -374,6 +374,19 @@ fi
 #
 CMD="${INSTALL_BIN}/mysql ${STAGING_CONN} --connect-expired-password -se \"ALTER USER 'root'@'localhost' IDENTIFIED BY ${STAGINGPASS};UPDATE mysql.user SET authentication_string=PASSWORD(${STAGINGPASS}) where USER='root';FLUSH PRIVILEGES;\""
 CMDFORLOG="${INSTALL_BIN}/mysql ${STAGING_CONN} --connect-expired-password -se \"ALTER USER 'root'@'localhost' IDENTIFIED BY '********';UPDATE mysql.user SET authentication_string=PASSWORD('********') where USER='root';FLUSH PRIVILEGES;\""
+
+# if mysql version >= 8, then change password syntx is different
+versionRegex="Ver ([0-9]*)"
+versionString=$(${MYSQLD}/mysqld -V)
+if [[ $versionString =~ $versionRegex ]]; then 
+   versionNumber="${BASH_REMATCH[1]}";
+   if [[ $versionNumber -ge 8 ]]; then
+      masklog "MySQL Version 8 or greater, change password syntax altered."
+      CMD="${INSTALL_BIN}/mysql ${STAGING_CONN} --connect-expired-password -se \"ALTER USER 'root'@'localhost' IDENTIFIED BY ${STAGINGPASS};FLUSH PRIVILEGES;\""
+      CMDFORLOG="${INSTALL_BIN}/mysql ${STAGING_CONN} --connect-expired-password -se \"ALTER USER 'root'@'localhost' IDENTIFIED BY '********';FLUSH PRIVILEGES;\""
+   fi
+fi
+
 masklog "Final Command to Change Password is : ${CMDFORLOG}"
 command_runner "${CMD}" 5
 

src/resources/restore_stage_bi.sh

@@ -341,6 +341,20 @@ fi
 ########################################################################
 # Change Password for Staging Conn ...
 CMD="${INSTALL_BIN}/mysql ${STAGING_CONN} --connect-expired-password -se \"ALTER USER 'root'@'localhost' IDENTIFIED BY ${STAGINGPASS};UPDATE mysql.user SET authentication_string=PASSWORD(${STAGINGPASS}) where USER='root';FLUSH PRIVILEGES;\""
+CMDFORLOG="${INSTALL_BIN}/mysql ${STAGING_CONN} --connect-expired-password -se \"ALTER USER 'root'@'localhost' IDENTIFIED BY '********';UPDATE mysql.user SET authentication_string=PASSWORD('********') where USER='root';FLUSH PRIVILEGES;\""
+
+# if mysql version >= 8, then change password syntx is different
+versionRegex="Ver ([0-9]*)"
+versionString=$(${MYSQLD}/mysqld -V)
+if [[ $versionString =~ $versionRegex ]]; then 
+   versionNumber="${BASH_REMATCH[1]}";
+   if [[ $versionNumber -ge 8 ]]; then
+      masklog "MySQL Version 8 or greater, change password syntax altered."
+      CMD="${INSTALL_BIN}/mysql ${STAGING_CONN} --connect-expired-password -se \"ALTER USER 'root'@'localhost' IDENTIFIED BY ${STAGINGPASS};FLUSH PRIVILEGES;\""
+      CMDFORLOG="${INSTALL_BIN}/mysql ${STAGING_CONN} --connect-expired-password -se \"ALTER USER 'root'@'localhost' IDENTIFIED BY '********';FLUSH PRIVILEGES;\""
+   fi
+fi
+
 masklog "Final Command to Change Password is : ${CMD}"
 command_runner "${CMD}" 5