diff options
Diffstat (limited to 'connectivity/source/drivers/mysql')
| -rw-r--r-- | connectivity/source/drivers/mysql/YColumns.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/mysql/YDriver.cxx | 64 | ||||
| -rw-r--r-- | connectivity/source/drivers/mysql/YTable.cxx | 32 | ||||
| -rw-r--r-- | connectivity/source/drivers/mysql/YTables.cxx | 18 | ||||
| -rw-r--r-- | connectivity/source/drivers/mysql/YUser.cxx | 62 | ||||
| -rw-r--r-- | connectivity/source/drivers/mysql/YUsers.cxx | 10 | ||||
| -rw-r--r-- | connectivity/source/drivers/mysql/YViews.cxx | 6 |
7 files changed, 98 insertions, 98 deletions
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx index b70d0b26e881..0d124a6a1b6a 100644 --- a/connectivity/source/drivers/mysql/YColumns.cxx +++ b/connectivity/source/drivers/mysql/YColumns.cxx @@ -64,7 +64,7 @@ OMySQLColumn::OMySQLColumn( sal_Bool _bCase) // ------------------------------------------------------------------------- void OMySQLColumn::construct() { - m_sAutoIncrement = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("auto_increment")); + m_sAutoIncrement = ::rtl::OUString("auto_increment"); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); } // ----------------------------------------------------------------------------- @@ -81,7 +81,7 @@ void OMySQLColumn::construct() Sequence< ::rtl::OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Column")); + aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Column"); return aSupported; } diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 32ae159b329b..1a9d07e47ceb 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -111,7 +111,7 @@ namespace connectivity //-------------------------------------------------------------------- sal_Bool isNativeUrl(const ::rtl::OUString& _sUrl) { - return (!_sUrl.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:")), sizeof("sdbc:mysql:mysqlc:")-1)); + return (!_sUrl.compareTo(::rtl::OUString("sdbc:mysql:mysqlc:"), sizeof("sdbc:mysql:mysqlc:")-1)); } //-------------------------------------------------------------------- T_DRIVERTYPE lcl_getDriverType(const ::rtl::OUString& _sUrl) @@ -128,14 +128,14 @@ namespace connectivity { ::rtl::OUString sNewUrl = _sUrl.copy(11); if ( isOdbcUrl( _sUrl ) ) - sNewUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:")) + sNewUrl; + sNewUrl = ::rtl::OUString("sdbc:") + sNewUrl; else if ( isNativeUrl( _sUrl ) ) - sNewUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:")) + sNewUrl; + sNewUrl = ::rtl::OUString("sdbc:") + sNewUrl; else { sNewUrl = sNewUrl.copy(5); - ::rtl::OUString sTempUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jdbc:mysql://")); + ::rtl::OUString sTempUrl = ::rtl::OUString("jdbc:mysql://"); sTempUrl += sNewUrl; sNewUrl = sTempUrl; @@ -145,7 +145,7 @@ namespace connectivity //-------------------------------------------------------------------- Reference< XDriver > lcl_loadDriver(const Reference< XMultiServiceFactory >& _rxFactory,const ::rtl::OUString& _sUrl) { - Reference<XDriverAccess> xDriverAccess(_rxFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager")) ),UNO_QUERY); + Reference<XDriverAccess> xDriverAccess(_rxFactory->createInstance(::rtl::OUString("com.sun.star.sdbc.DriverManager") ),UNO_QUERY); OSL_ENSURE(xDriverAccess.is(),"Could not load driver manager!"); Reference< XDriver > xDriver; if ( xDriverAccess.is() ) @@ -168,12 +168,12 @@ namespace connectivity if ( _eType == D_ODBC ) { aProps.push_back( PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Silent")) + ::rtl::OUString("Silent") ,0 ,makeAny(sal_True) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreventGetVersionColumns")) + ::rtl::OUString("PreventGetVersionColumns") ,0 ,makeAny(sal_True) ,PropertyState_DIRECT_VALUE) ); @@ -181,31 +181,31 @@ namespace connectivity else if ( _eType == D_JDBC ) { aProps.push_back( PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass")) + ::rtl::OUString("JavaDriverClass") ,0 - ,makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.mysql.jdbc.Driver"))) + ,makeAny(::rtl::OUString("com.mysql.jdbc.Driver")) ,PropertyState_DIRECT_VALUE) ); } else { aProps.push_back( PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PublicConnectionURL")) + ::rtl::OUString("PublicConnectionURL") ,0 ,makeAny(_sUrl) ,PropertyState_DIRECT_VALUE) ); } aProps.push_back( PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled")) + ::rtl::OUString("IsAutoRetrievingEnabled") ,0 ,makeAny(sal_True) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoRetrievingStatement")) + ::rtl::OUString("AutoRetrievingStatement") ,0 - ,makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT LAST_INSERT_ID()"))) + ,makeAny(::rtl::OUString("SELECT LAST_INSERT_ID()")) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParameterNameSubstitution")) + ::rtl::OUString("ParameterNameSubstitution") ,0 ,makeAny(sal_True) ,PropertyState_DIRECT_VALUE) ); @@ -234,7 +234,7 @@ namespace connectivity else { ::comphelper::NamedValueCollection aSettings( info ); - ::rtl::OUString sDriverClass(RTL_CONSTASCII_USTRINGPARAM("com.mysql.jdbc.Driver")); + ::rtl::OUString sDriverClass("com.mysql.jdbc.Driver"); sDriverClass = aSettings.getOrDefault( "JavaDriverClass", sDriverClass ); TJDBCDrivers::iterator aFind = m_aJdbcDrivers.find(sDriverClass); @@ -272,18 +272,18 @@ namespace connectivity ::rtl::OUString sAdd; if ( RTL_TEXTENCODING_UTF8 == (*aLookup).getEncoding() ) { - static const ::rtl::OUString s_sCharSetOp(RTL_CONSTASCII_USTRINGPARAM("useUnicode=true&")); + static const ::rtl::OUString s_sCharSetOp("useUnicode=true&"); if ( !sCuttedUrl.matchIgnoreAsciiCase(s_sCharSetOp) ) { sAdd = s_sCharSetOp; } // if ( !sCuttedUrl.matchIgnoreAsciiCase(s_sCharSetOp) ) } // if ( RTL_TEXTENCODING_UTF8 == (*aLookup).getEncoding() ) if ( sCuttedUrl.indexOf('?') == -1 ) - sCuttedUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?")); + sCuttedUrl += ::rtl::OUString("?"); else - sCuttedUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&")); + sCuttedUrl += ::rtl::OUString("&"); sCuttedUrl += sAdd; - sCuttedUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("characterEncoding=")); + sCuttedUrl += ::rtl::OUString("characterEncoding="); sCuttedUrl += sIanaName; } } @@ -329,32 +329,32 @@ namespace connectivity return Sequence< DriverPropertyInfo >(); Sequence< ::rtl::OUString > aBoolean(2); - aBoolean[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")); - aBoolean[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")); + aBoolean[0] = ::rtl::OUString("0"); + aBoolean[1] = ::rtl::OUString("1"); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet of the database.")) + ::rtl::OUString("CharSet") + ,::rtl::OUString("CharSet of the database.") ,sal_False ,::rtl::OUString() ,Sequence< ::rtl::OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SuppressVersionColumns")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Display version columns (when available).")) + ::rtl::OUString("SuppressVersionColumns") + ,::rtl::OUString("Display version columns (when available).") ,sal_False - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) + ,::rtl::OUString("0") ,aBoolean) ); const T_DRIVERTYPE eType = lcl_getDriverType( url ); if ( eType == D_JDBC ) { aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The JDBC driver class name.")) + ::rtl::OUString("JavaDriverClass") + ,::rtl::OUString("The JDBC driver class name.") ,sal_True - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.mysql.jdbc.Driver")) + ,::rtl::OUString("com.mysql.jdbc.Driver") ,Sequence< ::rtl::OUString >()) ); } @@ -442,14 +442,14 @@ namespace connectivity //------------------------------------------------------------------------------ rtl::OUString ODriverDelegator::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.drivers.MySQL.Driver")); + return rtl::OUString("org.openoffice.comp.drivers.MySQL.Driver"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); - aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Driver")); + aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); + aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver"); return aSNS; } //------------------------------------------------------------------ diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index 1dba6792e81f..914f818417f3 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -69,7 +69,7 @@ namespace connectivity // ----------------------------------------------------------------------------- virtual ::rtl::OUString getDropForeignKey() const { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP FOREIGN KEY ")); + return ::rtl::OUString(" DROP FOREIGN KEY "); } public: OMySQLKeysHelper( OTableHelper* _pTable, @@ -237,12 +237,12 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co ::rtl::OUString sTypeName; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sTypeName; - static ::rtl::OUString s_sAutoIncrement(RTL_CONSTASCII_USTRINGPARAM("auto_increment")); + static ::rtl::OUString s_sAutoIncrement("auto_increment"); if ( bAutoIncrement ) { if ( sTypeName.indexOf(s_sAutoIncrement) == -1 ) { - sTypeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + sTypeName += ::rtl::OUString(" "); sTypeName += s_sAutoIncrement; } } @@ -280,10 +280,10 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co if ( !sNewColumnName.equalsIgnoreAsciiCase(colName) && !bColumnNameChanged ) { ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" CHANGE ")); + sSql += ::rtl::OUString(" CHANGE "); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,colName); - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + sSql += ::rtl::OUString(" "); sSql += OTables::adjustSQL(::dbtools::createStandardColumnPart(descriptor,getConnection(),static_cast<OTables*>(m_pTables),getTypeCreatePattern())); executeStatement(sSql); } @@ -303,10 +303,10 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co void OMySQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rColName, const Reference<XPropertySet>& _xDescriptor) { ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" CHANGE ")); + sSql += ::rtl::OUString(" CHANGE "); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,_rColName); - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + sSql += ::rtl::OUString(" "); OColumn* pColumn = new OColumn(sal_True); Reference<XPropertySet> xProp = pColumn; @@ -319,19 +319,19 @@ void OMySQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rCo // ----------------------------------------------------------------------------- ::rtl::OUString OMySQLTable::getTypeCreatePattern() const { - static const ::rtl::OUString s_sCreatePattern(RTL_CONSTASCII_USTRINGPARAM("(M,D)")); + static const ::rtl::OUString s_sCreatePattern("(M,D)"); return s_sCreatePattern; } // ----------------------------------------------------------------------------- void OMySQLTable::alterDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName) { ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ALTER ")); + sSql += ::rtl::OUString(" ALTER "); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,_rColName); - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" SET DEFAULT '")) + _sNewDefault; - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")); + sSql += ::rtl::OUString(" SET DEFAULT '") + _sNewDefault; + sSql += ::rtl::OUString("'"); executeStatement(sSql); } @@ -339,18 +339,18 @@ void OMySQLTable::alterDefaultValue(const ::rtl::OUString& _sNewDefault,const :: void OMySQLTable::dropDefaultValue(const ::rtl::OUString& _rColName) { ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ALTER ")); + sSql += ::rtl::OUString(" ALTER "); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,_rColName); - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP DEFAULT")); + sSql += ::rtl::OUString(" DROP DEFAULT"); executeStatement(sSql); } // ----------------------------------------------------------------------------- ::rtl::OUString OMySQLTable::getAlterTableColumnPart() { - ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " )); + ::rtl::OUString sSql( "ALTER TABLE " ); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString sComposedName( @@ -364,7 +364,7 @@ void OMySQLTable::executeStatement(const ::rtl::OUString& _rStatement ) { ::rtl::OUString sSQL = _rStatement; if(sSQL.lastIndexOf(',') == (sSQL.getLength()-1)) - sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,::rtl::OUString(")")); Reference< XStatement > xStmt = getConnection()->createStatement( ); if ( xStmt.is() ) @@ -376,7 +376,7 @@ void OMySQLTable::executeStatement(const ::rtl::OUString& _rStatement ) // ----------------------------------------------------------------------------- ::rtl::OUString OMySQLTable::getRenameStart() const { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RENAME TABLE ")); + return ::rtl::OUString("RENAME TABLE "); } diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index 2264ddb6914d..e77a22003fdc 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.cxx @@ -60,9 +60,9 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData,_rName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - static const ::rtl::OUString s_sTableTypeView(RTL_CONSTASCII_USTRINGPARAM("VIEW")); - static const ::rtl::OUString s_sTableTypeTable(RTL_CONSTASCII_USTRINGPARAM("TABLE")); - static const ::rtl::OUString s_sAll(RTL_CONSTASCII_USTRINGPARAM("%")); + static const ::rtl::OUString s_sTableTypeView("VIEW"); + static const ::rtl::OUString s_sTableTypeTable("TABLE"); + static const ::rtl::OUString s_sAll("%"); Sequence< ::rtl::OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; @@ -154,14 +154,14 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData,_sElementName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP " )); + ::rtl::OUString aSql( "DROP " ); Reference<XPropertySet> xProp(xObject,UNO_QUERY); - sal_Bool bIsView = xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")); + sal_Bool bIsView = xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString("VIEW"); if(bIsView) // here we have a view - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW ")); + aSql += ::rtl::OUString("VIEW "); else - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE ")); + aSql += ::rtl::OUString("TABLE "); ::rtl::OUString sComposedName( ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) ); @@ -185,7 +185,7 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) ::rtl::OUString OTables::adjustSQL(const ::rtl::OUString& _sSql) { ::rtl::OUString sSQL = _sSql; - static const ::rtl::OUString s_sUNSIGNED(RTL_CONSTASCII_USTRINGPARAM("UNSIGNED")); + static const ::rtl::OUString s_sUNSIGNED("UNSIGNED"); sal_Int32 nIndex = sSQL.indexOf(s_sUNSIGNED); while(nIndex != -1 ) { @@ -201,7 +201,7 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) void OTables::createTable( const Reference< XPropertySet >& descriptor ) { const Reference< XConnection > xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection(); - static const ::rtl::OUString s_sCreatePattern(RTL_CONSTASCII_USTRINGPARAM("(M,D)")); + static const ::rtl::OUString s_sCreatePattern("(M,D)"); const ::rtl::OUString aSql = adjustSQL(::dbtools::createSqlCreateTableStatement(descriptor,xConnection,this,s_sCreatePattern)); Reference< XStatement > xStmt = xConnection->createStatement( ); if ( xStmt.is() ) diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index 575a6d076e07..f2dcf22eeed4 100644 --- a/connectivity/source/drivers/mysql/YUser.cxx +++ b/connectivity/source/drivers/mysql/YUser.cxx @@ -121,23 +121,23 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName Any aCatalog; if ( !sCatalog.isEmpty() ) aCatalog <<= sCatalog; - xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); + xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,::rtl::OUString("%")); } break; } if ( xRes.is() ) { - static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( "SELECT" )); - static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( "INSERT" )); - static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( "UPDATE" )); - static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( "DELETE" )); - static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( "READ" )); - static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( "CREATE" )); - static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( "ALTER" )); - static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( "REFERENCE" )); - static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( "DROP" )); - static const ::rtl::OUString sYes( RTL_CONSTASCII_USTRINGPARAM( "YES" )); + static const ::rtl::OUString sSELECT( "SELECT" ); + static const ::rtl::OUString sINSERT( "INSERT" ); + static const ::rtl::OUString sUPDATE( "UPDATE" ); + static const ::rtl::OUString sDELETE( "DELETE" ); + static const ::rtl::OUString sREAD( "READ" ); + static const ::rtl::OUString sCREATE( "CREATE" ); + static const ::rtl::OUString sALTER( "ALTER" ); + static const ::rtl::OUString sREFERENCE( "REFERENCE" ); + static const ::rtl::OUString sDROP( "DROP" ); + static const ::rtl::OUString sYes( "YES" ); nRightsWithGrant = nRights = 0; @@ -235,12 +235,12 @@ void SAL_CALL OMySQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_I if(!sPrivs.isEmpty()) { ::rtl::OUString sGrant; - sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANT ")); + sGrant += ::rtl::OUString("GRANT "); sGrant += sPrivs; - sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON ")); + sGrant += ::rtl::OUString(" ON "); Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData(); sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); - sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO ")); + sGrant += ::rtl::OUString(" TO "); sGrant += m_Name; Reference<XStatement> xStmt = m_xConnection->createStatement(); @@ -265,12 +265,12 @@ void SAL_CALL OMySQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_ if(!sPrivs.isEmpty()) { ::rtl::OUString sGrant; - sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REVOKE ")); + sGrant += ::rtl::OUString("REVOKE "); sGrant += sPrivs; - sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON ")); + sGrant += ::rtl::OUString(" ON "); Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData(); sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); - sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")); + sGrant += ::rtl::OUString(" FROM "); sGrant += m_Name; Reference<XStatement> xStmt = m_xConnection->createStatement(); @@ -286,11 +286,11 @@ void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/ ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); ::rtl::OUString sAlterPwd; - sAlterPwd = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET PASSWORD FOR ")); + sAlterPwd = ::rtl::OUString("SET PASSWORD FOR "); sAlterPwd += m_Name; - sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("@\"%\" = PASSWORD('")) ; + sAlterPwd += ::rtl::OUString("@\"%\" = PASSWORD('") ; sAlterPwd += newPassword; - sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("')")) ; + sAlterPwd += ::rtl::OUString("')") ; Reference<XStatement> xStmt = m_xConnection->createStatement(); @@ -305,41 +305,41 @@ void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/ { ::rtl::OUString sPrivs; if((nRights & Privilege::INSERT) == Privilege::INSERT) - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT")); + sPrivs += ::rtl::OUString("INSERT"); if((nRights & Privilege::DELETE) == Privilege::DELETE) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE")); + sPrivs += ::rtl::OUString(","); + sPrivs += ::rtl::OUString("DELETE"); } if((nRights & Privilege::UPDATE) == Privilege::UPDATE) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE")); + sPrivs += ::rtl::OUString(","); + sPrivs += ::rtl::OUString("UPDATE"); } if((nRights & Privilege::ALTER) == Privilege::ALTER) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER")); + sPrivs += ::rtl::OUString(","); + sPrivs += ::rtl::OUString("ALTER"); } if((nRights & Privilege::SELECT) == Privilege::SELECT) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT")); + sPrivs += ::rtl::OUString(","); + sPrivs += ::rtl::OUString("SELECT"); } if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); - sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REFERENCES")); + sPrivs += ::rtl::OUString(","); + sPrivs += ::rtl::OUString("REFERENCES"); } return sPrivs; diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index de00aecb1b06..ed9d6828ecb5 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.cxx @@ -77,18 +77,18 @@ Reference< XPropertySet > OUsers::createDescriptor() // XAppend sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "GRANT USAGE ON * TO " )); + ::rtl::OUString aSql( "GRANT USAGE ON * TO " ); ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString sUserName( _rForName ); aSql += ::dbtools::quoteName(aQuote,sUserName) - + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" @\"%\" ")); + + ::rtl::OUString(" @\"%\" "); ::rtl::OUString sPassword; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword; if ( !sPassword.isEmpty() ) { - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" IDENTIFIED BY '")); + aSql += ::rtl::OUString(" IDENTIFIED BY '"); aSql += sPassword; - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")); + aSql += ::rtl::OUString("'"); } Reference< XStatement > xStmt = m_xConnection->createStatement( ); @@ -102,7 +102,7 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const // XDrop void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) { - ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "REVOKE ALL ON * FROM " )); + ::rtl::OUString aSql( "REVOKE ALL ON * FROM " ); ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); aSql += ::dbtools::quoteName(aQuote,_sElementName); diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx index ac80c8d9806e..6cd100cc3ef5 100644 --- a/connectivity/source/drivers/mysql/YViews.cxx +++ b/connectivity/source/drivers/mysql/YViews.cxx @@ -111,7 +111,7 @@ void OViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject ); if (!bIsNew) { - ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP VIEW" )); + ::rtl::OUString aSql( "DROP VIEW" ); Reference<XPropertySet> xProp(xObject,UNO_QUERY); aSql += ::dbtools::composeTableName( m_xMetaData, xProp, ::dbtools::eInTableDefinitions, false, false, true ); @@ -134,13 +134,13 @@ void OViews::createView( const Reference< XPropertySet >& descriptor ) { Reference<XConnection> xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection(); - ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE VIEW " )); + ::rtl::OUString aSql( "CREATE VIEW " ); ::rtl::OUString aQuote = xConnection->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString sSchema,sCommand; aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AS ")); + aSql += ::rtl::OUString(" AS "); descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand; aSql += sCommand; |