Mercurial > hg > orthanc-databases
annotate Framework/MySQL/MySQLParameters.cpp @ 46:6a574d810b98
Compatibility with MySQL 8.0
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 18 Jul 2018 12:27:40 +0200 |
| parents | b2ff1cd2907a |
| children | 89a114f36c42 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
| 5 * Copyright (C) 2017-2018 Osimis S.A., Belgium | |
| 6 * | |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "MySQLParameters.h" | |
| 23 | |
| 24 #include <Core/Logging.h> | |
| 25 #include <Core/OrthancException.h> | |
| 26 | |
| 27 namespace OrthancDatabases | |
| 28 { | |
| 29 void MySQLParameters::Reset() | |
| 30 { | |
| 31 host_ = "localhost"; | |
| 32 username_.clear(); | |
| 33 password_.clear(); | |
| 34 database_.clear(); | |
| 35 port_ = 3306; | |
|
46
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
36 |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
37 #if defined(_WIN32) |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
38 unixSocket_.clear(); |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
39 #else |
| 0 | 40 unixSocket_ = "/var/run/mysqld/mysqld.sock"; |
|
46
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
41 #endif |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
42 |
| 0 | 43 lock_ = true; |
| 44 } | |
| 45 | |
| 46 | |
| 47 MySQLParameters::MySQLParameters() | |
| 48 { | |
| 49 Reset(); | |
| 50 } | |
| 51 | |
| 52 | |
| 53 MySQLParameters::MySQLParameters(const OrthancPlugins::OrthancConfiguration& configuration) | |
| 54 { | |
| 55 Reset(); | |
| 56 | |
| 57 std::string s; | |
| 58 if (configuration.LookupStringValue(s, "Host")) | |
| 59 { | |
| 60 SetHost(s); | |
| 61 } | |
| 62 | |
| 63 if (configuration.LookupStringValue(s, "Username")) | |
| 64 { | |
| 65 SetUsername(s); | |
| 66 } | |
| 67 | |
| 68 if (configuration.LookupStringValue(s, "Password")) | |
| 69 { | |
| 70 SetPassword(s); | |
| 71 } | |
| 72 | |
| 73 if (configuration.LookupStringValue(s, "Database")) | |
| 74 { | |
| 75 SetDatabase(s); | |
| 76 } | |
| 77 | |
| 78 unsigned int port; | |
| 79 if (configuration.LookupUnsignedIntegerValue(port, "Port")) | |
| 80 { | |
| 81 SetPort(port); | |
| 82 } | |
| 83 | |
| 84 if (configuration.LookupStringValue(s, "UnixSocket")) | |
| 85 { | |
| 86 SetUnixSocket(s); | |
| 87 } | |
| 88 | |
| 89 lock_ = configuration.GetBooleanValue("Lock", true); // Use locking by default | |
| 90 } | |
| 91 | |
| 92 | |
| 93 void MySQLParameters::SetHost(const std::string& host) | |
| 94 { | |
| 95 host_ = host; | |
| 96 } | |
| 97 | |
| 98 | |
| 99 void MySQLParameters::SetUsername(const std::string& username) | |
| 100 { | |
| 101 username_ = username; | |
| 102 } | |
| 103 | |
| 104 | |
| 105 void MySQLParameters::SetPassword(const std::string& password) | |
| 106 { | |
| 107 password_ = password; | |
| 108 } | |
| 109 | |
| 110 | |
| 111 void MySQLParameters::SetDatabase(const std::string& database) | |
| 112 { | |
|
23
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
113 if (database.empty()) |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
114 { |
|
46
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
115 LOG(ERROR) << "MySQL: Empty database name"; |
|
23
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
116 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
117 } |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
118 |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
119 for (size_t i = 0; i < database.length(); i++) |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
120 { |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
121 if (!isalnum(database [i])) |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
122 { |
|
46
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
123 LOG(ERROR) << "MySQL: Only alphanumeric characters are allowed in a " |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
124 << "database name: \"" << database << "\""; |
|
23
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
125 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
126 } |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
127 } |
|
b2ff1cd2907a
handling of implicit transactions in DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
128 |
| 0 | 129 database_ = database; |
| 130 } | |
| 131 | |
| 132 | |
| 133 void MySQLParameters::SetPort(unsigned int port) | |
| 134 { | |
| 135 if (port >= 65535) | |
| 136 { | |
| 137 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 138 } | |
| 139 else | |
| 140 { | |
| 141 port_ = port; | |
| 142 } | |
| 143 } | |
| 144 | |
| 145 | |
| 146 void MySQLParameters::SetUnixSocket(const std::string& socket) | |
| 147 { | |
|
46
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
148 #if defined(_WIN32) |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
149 if (!socket.empty()) |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
150 { |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
151 LOG(WARNING) << "MySQL: Setting an UNIX socket on Windows has no effect"; |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
152 } |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
153 #endif |
|
6a574d810b98
Compatibility with MySQL 8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
154 |
| 0 | 155 unixSocket_ = socket; |
| 156 } | |
|
22
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
157 |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
158 |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
159 void MySQLParameters::Format(Json::Value& target) const |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
160 { |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
161 target = Json::objectValue; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
162 target["Host"] = host_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
163 target["Username"] = username_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
164 target["Password"] = password_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
165 target["Database"] = database_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
166 target["Port"] = port_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
167 target["UnixSocket"] = unixSocket_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
168 target["Lock"] = lock_; |
|
1e9bad493475
prevent running unit tests on a non-existing db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
169 } |
| 0 | 170 } |