User: rt Date: 2008-01-30 07:53:56+0000 Modified: dba/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
Log: INTEGRATION: CWS dba24d (1.26.44); FILE MERGED 2007/11/28 09:30:15 oj 1.26.44.3: #i58268# cache some databasemetadata 2007/11/21 12:40:51 oj 1.26.44.2: #i68854# impl TypeSettingInfo for Oracle and some clean up 2007/11/06 09:04:02 oj 1.26.44.1: #i51965# impl updateNumericObject and setObjectWithInfo File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: DatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx?r1=1.27&r2=1.28 Delta lines: +16 -24 --------------------- --- DatabaseMetaData.cxx 2007-11-27 12:01:38+0000 1.27 +++ DatabaseMetaData.cxx 2008-01-30 07:53:54+0000 1.28 @@ -100,13 +100,12 @@ } // ----------------------------------------------------------------------------- java_sql_DatabaseMetaData::java_sql_DatabaseMetaData( JNIEnv * pEnv, jobject myObj, java_sql_Connection& _rConnection ) - :ODatabaseMetaDataBase( &_rConnection ) + :ODatabaseMetaDataBase( &_rConnection,_rConnection.getConnectionInfo() ) ,java_lang_Object( pEnv, myObj ) ,m_pConnection( &_rConnection ) ,m_aLogger( _rConnection.getLogger() ) { SDBThreadAttach::addRef(); - setConnectionInfo( _rConnection.getConnectionInfo() ); } // ------------------------------------------------------------------------- @@ -118,7 +117,7 @@ theClass = pClass; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTypeInfo( ) throw(SQLException, RuntimeException) +Reference< XResultSet > java_sql_DatabaseMetaData::impl_getTypeInfo_throw( ) { static jmethodID mID = NULL; return impl_callResultSetMethod( "getTypeInfo", mID ); @@ -130,7 +129,7 @@ return impl_callResultSetMethod( "getCatalogs", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException) +::rtl::OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw( ) { static jmethodID mID = NULL; return impl_callStringMethod( "getCatalogSeparator", mID ); @@ -337,7 +336,7 @@ return impl_callIntMethod( "getMaxTableNameLength", mID ); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { static jmethodID mID = NULL; return impl_callIntMethod( "getMaxTablesInSelect", mID ); @@ -498,10 +497,9 @@ } // fill our own resultset - ODatabaseMetaDataResultSet* pNewPrivRes = new ODatabaseMetaDataResultSet(); + ODatabaseMetaDataResultSet* pNewPrivRes = new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); Reference< XResultSet > xTemp = xReturn; xReturn = pNewPrivRes; - pNewPrivRes->setTablePrivilegesMap(); ODatabaseMetaDataResultSet::ORows aRows; Reference< XRow > xRow(xTemp,UNO_QUERY); ::rtl::OUString sValue; @@ -822,7 +820,7 @@ return impl_callBooleanMethod( "storesLowerCaseIdentifiers", mID ); } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool java_sql_DatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { static jmethodID mID = NULL; return impl_callBooleanMethod( "storesMixedCaseQuotedIdentifiers", mID ); @@ -846,13 +844,13 @@ return impl_callBooleanMethod( "storesUpperCaseIdentifiers", mID ); } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException) +sal_Bool java_sql_DatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) { static jmethodID mID = NULL; return impl_callBooleanMethod( "supportsAlterTableWithAddColumn", mID ); } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException) +sal_Bool java_sql_DatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) { static jmethodID mID = NULL; return impl_callBooleanMethod( "supportsAlterTableWithDropColumn", mID ); @@ -876,7 +874,7 @@ return impl_callStringMethod( "getCatalogTerm", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) +::rtl::OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { static jmethodID mID = NULL; return impl_callStringMethod( "getIdentifierQuoteString", mID ); @@ -894,7 +892,7 @@ return impl_callBooleanMethod( "supportsDifferentTableCorrelationNames", mID ); } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_DatabaseMetaData::isCatalogAtStart( ) throw(SQLException, RuntimeException) +sal_Bool java_sql_DatabaseMetaData::impl_isCatalogAtStart_throw( ) { static jmethodID mID = NULL; return impl_callBooleanMethod( "isCatalogAtStart", mID ); @@ -966,7 +964,7 @@ return impl_callBooleanMethodWithIntArg( "supportsTransactionIsolationLevel", mID, level ); } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool java_sql_DatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { static jmethodID mID = NULL; return impl_callBooleanMethod( "supportsSchemasInDataManipulation", mID ); @@ -996,13 +994,13 @@ return impl_callBooleanMethod( "supportsSchemasInIndexDefinitions", mID ); } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool java_sql_DatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { static jmethodID mID = NULL; return impl_callBooleanMethod( "supportsSchemasInTableDefinitions", mID ); } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool java_sql_DatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) { static jmethodID mID = NULL; return impl_callBooleanMethod( "supportsCatalogsInTableDefinitions", mID ); @@ -1014,7 +1012,7 @@ return impl_callBooleanMethod( "supportsCatalogsInIndexDefinitions", mID ); } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool java_sql_DatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) { static jmethodID mID = NULL; return impl_callBooleanMethod( "supportsCatalogsInDataManipulation", mID ); @@ -1032,7 +1030,7 @@ return impl_callResultSetMethod( "getTableTypes", mID ); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException) +sal_Int32 java_sql_DatabaseMetaData::impl_getMaxStatements_throw( ) { static jmethodID mID = NULL; return impl_callIntMethod( "getMaxStatements", mID ); @@ -1214,7 +1212,7 @@ return impl_callBooleanMethod( "supportsMixedCaseIdentifiers", mID ); } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool java_sql_DatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) { static jmethodID mID = NULL; return impl_callBooleanMethod( "supportsMixedCaseQuotedIdentifiers", mID ); @@ -1599,9 +1597,3 @@ return out ? new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection ) : 0; } // ------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL java_sql_DatabaseMetaData::getConnection( ) throw(SQLException, RuntimeException) -{ - return (Reference< XConnection >)m_pConnection; -} -// ------------------------------------------------------------------------- - --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
