# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1543996666 -3600
# Node ID ffaa97a2c83a47e15c4326568208556d6e459b8d
# Parent  eedd082355f95fbba6d21f9afea9a751afb42b34# Parent  89a114f36c42aa2a9636e5107b0775ca36ec321e
merge

diff -r eedd082355f9 -r ffaa97a2c83a Framework/MySQL/MySQLParameters.cpp
--- a/Framework/MySQL/MySQLParameters.cpp	Wed Dec 05 08:57:16 2018 +0100
+++ b/Framework/MySQL/MySQLParameters.cpp	Wed Dec 05 08:57:46 2018 +0100
@@ -21,6 +21,8 @@
 
 #include "MySQLParameters.h"
 
+#include "MySQLDatabase.h"
+
 #include <Core/Logging.h>
 #include <Core/OrthancException.h>
 
@@ -116,14 +118,11 @@
       throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
     }
     
-    for (size_t i = 0; i < database.length(); i++)
+    if (!MySQLDatabase::IsValidDatabaseIdentifier(database))
     {
-      if (!isalnum(database [i]))
-      {
-        LOG(ERROR) << "MySQL: Only alphanumeric characters are allowed in a "
-                   << "database name: \"" << database << "\"";
-        throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);          
-      }
+      LOG(ERROR) << "MySQL: Only alphanumeric characters are allowed in a "
+                 << "database name: \"" << database << "\"";
+      throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);          
     }
     
     database_ = database;