Tag: cws_src680_qiq User: fs Date: 06/06/19 02:44:39 Modified: /dba/dbaccess/source/core/dataaccess/ connection.cxx
Log: #i51143# don't check for name conflicts between tables and queries if the connection does not support queries in queries File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: connection.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/connection.cxx?r1=1.46.2.4&r2=1.46.2.5 Delta lines: +10 -2 -------------------- --- connection.cxx 16 Jun 2006 11:47:39 -0000 1.46.2.4 +++ connection.cxx 19 Jun 2006 09:44:36 -0000 1.46.2.5 @@ -4,9 +4,9 @@ * * $RCSfile: connection.cxx,v $ * - * $Revision: 1.46.2.4 $ + * $Revision: 1.46.2.5 $ * - * last change: $Author: fs $ $Date: 2006/06/16 11:47:39 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:44:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -89,6 +89,9 @@ #ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> #endif +#ifndef CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX +#include <connectivity/dbmetadata.hxx> +#endif #ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> #endif @@ -812,6 +815,11 @@ // ----------------------------------------------------------------------------- void OConnection::impl_checkTableQueryNames_nothrow() { + DatabaseMetaData aMeta( static_cast< XConnection* >( this ) ); + if ( !aMeta.supportsSubqueriesInFrom() ) + // nothing to do + return; + try { Reference< XNameAccess > xTables( getTables() ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
