Kaydet (Commit) 373e4d33 authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane

connectivity commontools DatabaseMetaData: provide for getUDTs, too

Change-Id: Id361ac34f400922893f6a906e4345eed2be1b2d2
üst 60b67b7e
...@@ -111,6 +111,7 @@ void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType) ...@@ -111,6 +111,7 @@ void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType)
case eTypeInfo: setTypeInfoMap(); break; case eTypeInfo: setTypeInfoMap(); break;
case eBestRowIdentifier: setBestRowIdentifierMap(); break; case eBestRowIdentifier: setBestRowIdentifierMap(); break;
case eVersionColumns: setVersionColumnsMap(); break; case eVersionColumns: setVersionColumnsMap(); break;
case eUDTs: setUDTsMap(); break;
default: default:
OSL_FAIL("Wrong type!"); OSL_FAIL("Wrong type!");
} }
...@@ -611,6 +612,13 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap() ...@@ -611,6 +612,13 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap()
m_xMetaData = pMetaData; m_xMetaData = pMetaData;
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::setUDTsMap()
{
ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
pMetaData->setUDTsMap();
m_xMetaData = pMetaData;
}
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::setTableTypes() void ODatabaseMetaDataResultSet::setTableTypes()
{ {
ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(); ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
......
...@@ -352,4 +352,14 @@ void ODatabaseMetaDataResultSetMetaData::setVersionColumnsMap() ...@@ -352,4 +352,14 @@ void ODatabaseMetaDataResultSetMetaData::setVersionColumnsMap()
m_mColumns[8] = OColumn(OUString(),"PSEUDO_COLUMN", ColumnValue::NO_NULLS, 0,0,0, DataType::INTEGER); m_mColumns[8] = OColumn(OUString(),"PSEUDO_COLUMN", ColumnValue::NO_NULLS, 0,0,0, DataType::INTEGER);
} }
void ODatabaseMetaDataResultSetMetaData::setUDTsMap()
{
m_mColumns[1] = OColumn(OUString(),"TYPE_CAT", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR);
m_mColumns[2] = OColumn(OUString(),"TYPE_SCHEM", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR);
m_mColumns[3] = OColumn(OUString(),"TYPE_NAME", ColumnValue::NO_NULLS, 0,0,0, DataType::VARCHAR);
m_mColumns[4] = OColumn(OUString(),"CLASS_NAME", ColumnValue::NO_NULLS, 0,0,0, DataType::VARCHAR);
m_mColumns[5] = OColumn(OUString(),"DATA_TYPE", ColumnValue::NO_NULLS, 0,0,0, DataType::VARCHAR);
m_mColumns[6] = OColumn(OUString(),"REMARKS", ColumnValue::NO_NULLS, 0,0,0, DataType::VARCHAR);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -101,7 +101,9 @@ namespace connectivity ...@@ -101,7 +101,9 @@ namespace connectivity
/// describes a result set as expected by XDatabaseMetaData::getBestRowIdentifier /// describes a result set as expected by XDatabaseMetaData::getBestRowIdentifier
eBestRowIdentifier = 15, eBestRowIdentifier = 15,
/// describes a result set as expected by XDatabaseMetaData::getVersionColumns /// describes a result set as expected by XDatabaseMetaData::getVersionColumns
eVersionColumns = 16 eVersionColumns = 16,
/// describes a result set as expected by XDatabaseMetaData::getUDTs
eUDTs = 17
}; };
private: private:
...@@ -234,6 +236,7 @@ namespace connectivity ...@@ -234,6 +236,7 @@ namespace connectivity
void setTypeInfoMap(); void setTypeInfoMap();
void setBestRowIdentifierMap(); void setBestRowIdentifierMap();
void setVersionColumnsMap(); void setVersionColumnsMap();
void setUDTsMap();
public: public:
// some methods to get already defined ORowSetValues // some methods to get already defined ORowSetValues
// this increase the reuse of ORowSetValues // this increase the reuse of ORowSetValues
......
...@@ -96,6 +96,7 @@ namespace connectivity ...@@ -96,6 +96,7 @@ namespace connectivity
void setImportedKeysMap() { setCrossReferenceMap(); } void setImportedKeysMap() { setCrossReferenceMap(); }
void setCatalogsMap(); void setCatalogsMap();
void setSchemasMap(); void setSchemasMap();
void setUDTsMap();
}; };
} }
#endif // _CONNECTIVITY_FILE_ADATABASEMETARESULTSETMETADATA_HXX_ #endif // _CONNECTIVITY_FILE_ADATABASEMETARESULTSETMETADATA_HXX_
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment