diff --git a/Data/MySQL/include/Poco/Data/MySQL/Connector.h b/Data/MySQL/include/Poco/Data/MySQL/Connector.h index a9986e531..1bb4f641f 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Connector.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Connector.h @@ -40,7 +40,7 @@ #define Data_MySQL_Connector_INCLUDED -#include "MySQL.h" +#include "Poco/Data/MySQL/MySQL.h" #include "Poco/Data/Connector.h" diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h index 5b6770ccd..fd0f1ad80 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h +++ b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h @@ -42,8 +42,6 @@ #include #include "Poco/Data/MySQL/MySQLException.h" -#include - namespace Poco { namespace Data { namespace MySQL { @@ -87,7 +85,7 @@ public: /// Commit transaction void rollback(); - /// Rollback trabsaction + /// Rollback transaction operator MYSQL* (); diff --git a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h index 4a638eb79..fdaf26cd7 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h +++ b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h @@ -42,8 +42,6 @@ #include #include "Poco/Data/MySQL/MySQLException.h" -#include - namespace Poco { namespace Data { namespace MySQL { diff --git a/Data/MySQL/src/Extractor.cpp b/Data/MySQL/src/Extractor.cpp index 033a1136e..15f60c128 100644 --- a/Data/MySQL/src/Extractor.cpp +++ b/Data/MySQL/src/Extractor.cpp @@ -143,7 +143,7 @@ bool Extractor::extract(std::size_t pos, char& val) bool Extractor::extract(std::size_t pos, std::string& val) { if (_metadata.columnsReturned() <= pos) - throw MySQLException("Extractor: attempt to extract more paremeters, than query result contain"); + throw MySQLException("Extractor: attempt to extract more parameters, than query result contain"); if (_metadata.isNull(static_cast(pos))) return false; @@ -161,7 +161,7 @@ bool Extractor::extract(std::size_t pos, std::string& val) bool Extractor::extract(std::size_t pos, Poco::Data::BLOB& val) { if (_metadata.columnsReturned() <= pos) - throw MySQLException("Extractor: attempt to extract more paremeters, than query result contain"); + throw MySQLException("Extractor: attempt to extract more parameters, than query result contain"); if (_metadata.isNull(static_cast(pos))) return false; @@ -177,7 +177,7 @@ bool Extractor::extract(std::size_t pos, Poco::Data::BLOB& val) bool Extractor::extract(std::size_t pos, Poco::Data::CLOB& val) { if (_metadata.columnsReturned() <= pos) - throw MySQLException("Extractor: attempt to extract more paremeters, than query result contain"); + throw MySQLException("Extractor: attempt to extract more parameters, than query result contain"); if (_metadata.isNull(static_cast(pos))) return false; @@ -243,7 +243,7 @@ bool Extractor::isNull(std::size_t col, std::size_t row) poco_assert(row == POCO_DATA_INVALID_ROW); if (_metadata.columnsReturned() <= col) - throw MySQLException("Extractor: attempt to extract more paremeters, than query result contain"); + throw MySQLException("Extractor: attempt to extract more parameters, than query result contain"); if (_metadata.isNull(static_cast(col))) return true; diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h index 3731a3f03..fa5ec0365 100644 --- a/Data/include/Poco/Data/Statement.h +++ b/Data/include/Poco/Data/Statement.h @@ -348,13 +348,13 @@ public: /// Returns true if statement is in a state that allows the internal storage to be modified. Storage storage() const; - /// Returns the internal storage type for the stamement. + /// Returns the internal storage type for the statement. void setStorage(const std::string& storage); - /// Sets the internal storage type for the stamement. + /// Sets the internal storage type for the statement. const std::string& getStorage() const; - /// Returns the internal storage type for the stamement. + /// Returns the internal storage type for the statement. std::size_t columnsExtracted(int dataSet = StatementImpl::USE_CURRENT_DATA_SET) const; /// Returns the number of columns returned for current data set.