X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdbms.mysql%2FConnection.cpp;h=f32884b71e8acaa501dccb44f02647f67804da7c;hb=d8ece13fc2c7f6d649e4f0e9689006f1d02a54b2;hp=ee17482e5104832e1ec48c83636ce012989bf506;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/dbms.mysql/Connection.cpp b/source/dbms.mysql/Connection.cpp index ee17482..f32884b 100644 --- a/source/dbms.mysql/Connection.cpp +++ b/source/dbms.mysql/Connection.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not 'N' Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #include @@ -55,7 +27,7 @@ mysql::Connection::Connection(Database& database, const std::string& name, const } void mysql::Connection::open() -throw(dbms::DatabaseException) { +noexcept(false) { if(a_mysql != NULL) { LOGWARNING( string msg = asString(); @@ -88,7 +60,7 @@ throw(dbms::DatabaseException) { } void mysql::Connection::close() -throw() { +{ LOGINFORMATION( string msg("anna::dbms::mysql::Connection::close | "); msg += asString(); @@ -107,12 +79,12 @@ throw() { } void mysql::Connection::do_commit() -throw(RuntimeException, dbms::DatabaseException) { +noexcept(false) { anna_dbms_mysql_check(mysql_commit(a_mysql), a_mysql); } void mysql::Connection::do_rollback() -throw() { +{ try { anna_dbms_mysql_check(mysql_rollback(a_mysql), a_mysql); } catch(Exception& ex) { @@ -121,7 +93,7 @@ throw() { } string mysql::Connection::asString() const -throw() { +{ string result("dbms::mysql::Connection { "); result += dbms::Connection::asString(); result += " | Context: ";