Tag: cws_src680_dba205b User: oj Date: 2006/09/04 05:09:44 Modified: dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx
Log: RESYNC: (1.80-1.82); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QueryDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx?r1=1.80.18.2&r2=1.80.18.3 Delta lines: +12 -19 --------------------- --- QueryDesignView.cxx 3 Aug 2006 12:51:44 -0000 1.80.18.2 +++ QueryDesignView.cxx 4 Sep 2006 12:09:41 -0000 1.80.18.3 @@ -317,7 +317,7 @@ { if(xMetaData.is()) { - ::comphelper::UStringMixEqual bCase(xMetaData->storesMixedCaseQuotedIdentifiers()); + ::comphelper::UStringMixEqual bCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); if (bCase(rValue, String(ModuleRes(STR_QUERY_TRUE)))) rNewValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TRUE")); else if (bCase(rValue, String(ModuleRes(STR_QUERY_FALSE)))) @@ -373,7 +373,7 @@ try { Reference<XDatabaseMetaData> xMeta = _pView->getController()->getConnection()->getMetaData(); - if ( xMeta.is() && xMeta->storesMixedCaseQuotedIdentifiers() ) + if ( xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers() ) _pView->getController()->appendError(SQLException(String(ModuleRes(STR_QRY_CHECK_CASESENSITIVE)),NULL,getStandardSQLState( SQL_GENERAL_ERROR ),1000,Any())); } catch(Exception&) @@ -2184,19 +2184,12 @@ aInfo->SetTabWindow( NULL ); // since we support queries in queries, the thingie might belong to an existing "table" - if ( !lcl_findColumnInTables( aColumns, *pTabList, aInfo ) ) + OQueryTableWindow* pExistingTable = lcl_findColumnInTables( aColumns, *pTabList, aInfo ); + if ( pExistingTable ) { - // okay, it doesn't belong to a query directly. In this case, it must belong - // to the (only) table in the FROM part - DBG_ASSERT( pTabList->size() == 1, "InstallFields: unqualified expression, but more or less than one table!" ); - if ( !pTabList->empty() ) - { - OQueryTableWindow* pWindow = static_cast< OQueryTableWindow* >( pTabList->begin()->second ); - aInfo->SetTabWindow( pWindow ); - aInfo->SetTable( pWindow->GetTableName() ); - aInfo->SetAlias( pWindow->GetAliasName() ); - aInfo->SetDatabase( pWindow->GetComposedName() ); - } + aInfo->SetTabWindow( pExistingTable ); + aInfo->SetTable( pExistingTable->GetTableName() ); + aInfo->SetAlias( pExistingTable->GetAliasName() ); } aInfo->SetDataType(DataType::DOUBLE); @@ -2968,7 +2961,7 @@ nType, sal_False, sal_False, - xMeta.is() && xMeta->storesMixedCaseQuotedIdentifiers()); + xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers()); _rxColumn = pColumn; pColumn->setFunction(sal_True); pColumn->setRealName(pEntry->GetField()); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
