X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdbms%2FConnection.cpp;h=a6cda56fd3ee11a218a42eeecffdb3491880a9a9;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=3d9078eac1a5f7a7f680a44bfe67cb2e2d9dc9d8;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/dbms/Connection.cpp b/source/dbms/Connection.cpp index 3d9078e..a6cda56 100644 --- a/source/dbms/Connection.cpp +++ b/source/dbms/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 @@ -52,7 +24,7 @@ using namespace anna; // (1) Si no tiene variables de salida => consideramos que es un update, insert o delete. //----------------------------------------------------------------------------------------------------------- dbms::ResultCode dbms::Connection::execute(Statement* statement) -throw(RuntimeException, dbms::DatabaseException) { +noexcept(false) { if(statement == NULL) { string msg(asString()); msg += " | Cannot execute a NULL sentence"; @@ -138,7 +110,7 @@ throw(RuntimeException, dbms::DatabaseException) { // y los volcados de contexto. //------------------------------------------------------------------------------------------------ void dbms::Connection::commit() -throw(RuntimeException, dbms::DatabaseException) { +noexcept(false) { LOGINFORMATION( string msg("dbms::Connection::commit | "); msg += asString(); @@ -161,7 +133,7 @@ throw(RuntimeException, dbms::DatabaseException) { // y los volcados de contexto. //------------------------------------------------------------------------------------------------ void dbms::Connection::rollback() -throw() { +{ LOGWARNING( string msg("dbms::Connection::rollback | "); msg += asString(); @@ -180,7 +152,7 @@ throw() { } void dbms::Connection::lock() -throw(RuntimeException) { +noexcept(false) { if(isAvailable() == false) { string msg(asString()); msg += " | Unavailable connection"; @@ -209,7 +181,7 @@ throw(RuntimeException) { } void dbms::Connection::unlock() -throw() { +{ LOGDEBUG( string msg("dbms::Connection::unlock | "); msg += asString(); @@ -233,7 +205,7 @@ throw() { } string dbms::Connection::asString() const -throw() { +{ string result("dbms::Connection { "); result += comm::Resource::asString(); result += " | "; @@ -247,7 +219,7 @@ throw() { } xml::Node* dbms::Connection::asXML(xml::Node* parent) const -throw() { +{ xml::Node* result = comm::Resource::asXML(parent); result->createAttribute("User", a_user); result->createAttribute("LockingCounter", a_lockingCounter);