use getTableName instead of getName

5 files changed, 24 insertions, 25 deletions

diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx
index 303bb4bbbd49..dfc7a3c98b93 100644
--- a/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/connectivity/source/drivers/adabas/BColumns.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BColumns.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-03 14:08:03 $
+ *  last change: $Author: oj $ $Date: 2000-11-08 14:08:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,9 +102,8 @@ typedef connectivity::sdbcx::OCollection OCollection_TYPE;
 
 Reference< XNamed > OColumns::createObject(const ::rtl::OUString& _rName)
 {
-
     Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(Any(),
-    m_pTable->getSchema(),m_pTable->getName(),_rName);
+    m_pTable->getSchema(),m_pTable->getTableName(),_rName);
 
     Reference< XNamed > xRet = NULL;
     if(xResult.is())
@@ -154,7 +153,7 @@ void SAL_CALL OColumns::appendByDescriptor( const Reference< XPropertySet >& des
         ::rtl::OUString aQuote  = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(  );
         ::rtl::OUString aDot    = ::rtl::OUString::createFromAscii(".");
 
-        aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getName() + aQuote;
+        aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getTableName() + aQuote;
         aSql = aSql + ::rtl::OUString::createFromAscii(" ADD ");
         aSql = aSql + aQuote + getString(descriptor->getPropertyValue(PROPERTY_NAME)) + aQuote;
         aSql = aSql + ::rtl::OUString::createFromAscii(" ");
@@ -211,7 +210,7 @@ void SAL_CALL OColumns::dropByName( const ::rtl::OUString& elementName ) throw(S
         ::rtl::OUString aQuote  = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(  );
         ::rtl::OUString aDot    = ::rtl::OUString::createFromAscii(".");
 
-        aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getName() + aQuote;
+        aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getTableName() + aQuote;
         aSql = aSql + ::rtl::OUString::createFromAscii(" DROP ");
         aSql = aSql + aQuote + elementName + aQuote;
 
@@ -234,7 +233,7 @@ void SAL_CALL OColumns::dropByIndex( sal_Int32 index ) throw(SQLException, Index
         ::rtl::OUString aQuote  = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(  );
         ::rtl::OUString aDot    = ::rtl::OUString::createFromAscii(".");
 
-        aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getName() + aQuote;
+        aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getTableName() + aQuote;
         aSql = aSql + ::rtl::OUString::createFromAscii(" DROP ");
         aSql = aSql + aQuote + m_aElements[index]->first + aQuote;
 
diff --git a/connectivity/source/drivers/adabas/BIndex.cxx b/connectivity/source/drivers/adabas/BIndex.cxx
index c06751f1d054..c089063a0091 100644
--- a/connectivity/source/drivers/adabas/BIndex.cxx
+++ b/connectivity/source/drivers/adabas/BIndex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BIndex.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-03 14:08:03 $
+ *  last change: $Author: oj $ $Date: 2000-11-08 14:08:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,7 +108,7 @@ void OAdabasIndex::refreshColumns()
 
     ::std::vector< ::rtl::OUString> aVector;
     Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getIndexInfo(Any(),
-    m_pTable->getSchema(),m_pTable->getName(),sal_False,sal_False);
+    m_pTable->getSchema(),m_pTable->getTableName(),sal_False,sal_False);
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx
index 8eeffd438398..ac3da71beb60 100644
--- a/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BIndexColumns.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-03 14:08:03 $
+ *  last change: $Author: oj $ $Date: 2000-11-08 14:08:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,7 +94,7 @@ Reference< XNamed > OIndexColumns::createObject(const ::rtl::OUString& _rName)
 {
 
         Reference< XResultSet > xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getIndexInfo(Any(),
-        m_pIndex->getTable()->getSchema(),m_pIndex->getTable()->getName(),sal_False,sal_False);
+        m_pIndex->getTable()->getSchema(),m_pIndex->getTable()->getTableName(),sal_False,sal_False);
 
     sal_Bool bAsc = sal_True;
     if(xResult.is())
@@ -109,7 +109,7 @@ Reference< XNamed > OIndexColumns::createObject(const ::rtl::OUString& _rName)
     }
 
          xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getColumns(Any(),
-        m_pIndex->getTable()->getSchema(),m_pIndex->getTable()->getName(),_rName);
+        m_pIndex->getTable()->getSchema(),m_pIndex->getTable()->getTableName(),_rName);
 
         Reference< XNamed > xRet = NULL;
     if(xResult.is())
diff --git a/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx
index c2d062bd2c9a..9401847dd707 100644
--- a/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/connectivity/source/drivers/adabas/BIndexes.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BIndexes.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-03 14:08:03 $
+ *  last change: $Author: oj $ $Date: 2000-11-08 14:08:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,7 +106,7 @@ Reference< XNamed > OIndexes::createObject(const ::rtl::OUString& _rName)
 
 
     Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getIndexInfo(Any(),
-        m_pTable->getSchema(),m_pTable->getName(),sal_False,sal_False);
+        m_pTable->getSchema(),m_pTable->getTableName(),sal_False,sal_False);
 
     Reference< XNamed > xRet = NULL;
     if(xResult.is())
@@ -164,7 +164,7 @@ void SAL_CALL OIndexes::appendByDescriptor( const Reference< XPropertySet >& des
             aSql = aSql + aQuote + aName + aQuote
                         + ::rtl::OUString::createFromAscii(" ON ")
                         + aQuote + m_pTable->getSchema() + aQuote + aDot
-                        + aQuote + m_pTable->getName() + aQuote
+                        + aQuote + m_pTable->getTableName() + aQuote
                         + ::rtl::OUString::createFromAscii(" ( ");
 
             Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
@@ -185,7 +185,7 @@ void SAL_CALL OIndexes::appendByDescriptor( const Reference< XPropertySet >& des
         }
         else
         {
-            aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getName() + aQuote;
+            aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getTableName() + aQuote;
 
             Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
             Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY);
@@ -224,7 +224,7 @@ void SAL_CALL OIndexes::dropByName( const ::rtl::OUString& elementName ) throw(S
         ::rtl::OUString aDot    = ::rtl::OUString::createFromAscii(".");
 
         aSql = aSql + aQuote + aSchema + aQuote + aDot + aQuote + aName + ::rtl::OUString::createFromAscii(" ON ")
-                    + aQuote + m_pTable->getSchema() + aQuote + m_pTable->getName() + aQuote;
+                    + aQuote + m_pTable->getSchema() + aQuote + m_pTable->getTableName() + aQuote;
 
         Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement(  );
         xStmt->execute(aSql);
diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx
index 47b376687c37..d63acaf0defa 100644
--- a/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/connectivity/source/drivers/adabas/BKeys.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BKeys.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-03 14:08:03 $
+ *  last change: $Author: oj $ $Date: 2000-11-08 14:08:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,7 +127,7 @@ Reference< XNamed > OKeys::createObject(const ::rtl::OUString& _rName)
     if(_rName.getLength())
     {
         Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getExportedKeys(Any(),
-            m_pTable->getSchema(),m_pTable->getName());
+            m_pTable->getSchema(),m_pTable->getTableName());
 
         if(xResult.is())
         {
@@ -185,7 +185,7 @@ void SAL_CALL OKeys::appendByDescriptor( const Reference< XPropertySet >& descri
         ::rtl::OUString aQuote  = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(  );
         ::rtl::OUString aDot    = ::rtl::OUString::createFromAscii(".");
 
-        aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getName() + aQuote;
+        aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + aDot + aQuote + m_pTable->getTableName() + aQuote;
         if(nKeyType == KeyType::PRIMARY)
         {
             aSql = aSql + ::rtl::OUString::createFromAscii(" ALTER PRIMARY KEY (");
@@ -266,7 +266,7 @@ void SAL_CALL OKeys::dropByName( const ::rtl::OUString& elementName ) throw(SQLE
         ::rtl::OUString aQuote  = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(  );
         ::rtl::OUString aDot    = ::rtl::OUString::createFromAscii(".");
 
-        aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + m_pTable->getName() + aQuote
+        aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + m_pTable->getTableName() + aQuote
                     + ::rtl::OUString::createFromAscii(" DROP PRIMARY KEY");
 
         Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement(  );