Creation of skeleton Columns. (firebird-sdbc)

Change-Id: I5289dc68c05190e67420c51d8857dab5187cd98b

5 files changed, 18 insertions, 5 deletions

diff --git a/connectivity/source/drivers/firebird/Columns.hxx b/connectivity/source/drivers/firebird/Columns.hxx
index a1130ffd7358..c49dbfa5ae90 100644
--- a/connectivity/source/drivers/firebird/Columns.hxx
+++ b/connectivity/source/drivers/firebird/Columns.hxx
@@ -21,7 +21,7 @@ namespace connectivity
         class Columns: public ::connectivity::OColumnsHelper
         {
         public:
-            Columns(::cppu::OWeakObject& pTable,
+            Columns(::cppu::OWeakObject& rTable,
                     ::osl::Mutex& rMutex,
                     const ::connectivity::TStringVector &_rVector);
         };
diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx
index f53d2290b901..fe14352ce5dc 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -7,18 +7,21 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "Columns.hxx"
 #include "Table.hxx"
 
 using namespace ::connectivity;
 using namespace ::connectivity::firebird;
 using namespace ::connectivity::sdbcx;
 
+using namespace ::osl;
 using namespace ::rtl;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::sdbc;
 
 Table::Table(Tables* pTables,
+             Mutex& rMutex,
              const uno::Reference< XConnection >& rConnection,
              const OUString& rName,
              const OUString& rType,
@@ -31,7 +34,8 @@ Table::Table(Tables* pTables,
                  rType,
                  rDescription,
                  "",
-                 "")
+                 ""),
+    m_rMutex(rMutex)
 {
     (void) nPrivileges;
 }
@@ -39,9 +43,9 @@ Table::Table(Tables* pTables,
 //----- OTableHelper ---------------------------------------------------------
 OCollection* Table::createColumns(const TStringVector& rNames)
 {
-    (void) rNames;
-    // TODO: IMPLEMENT ME
-    return 0;
+    return new Columns(*this,
+                       m_rMutex,
+                       rNames);
 }
 
 OCollection* Table::createKeys(const TStringVector& rNames)
diff --git a/connectivity/source/drivers/firebird/Table.hxx b/connectivity/source/drivers/firebird/Table.hxx
index 426f9064ef67..f074e18932fc 100644
--- a/connectivity/source/drivers/firebird/Table.hxx
+++ b/connectivity/source/drivers/firebird/Table.hxx
@@ -21,8 +21,12 @@ namespace connectivity
 
         class Table: public OTableHelper
         {
+        private:
+            ::osl::Mutex& m_rMutex;
+
         public:
             Table(Tables* pTables,
+                  ::osl::Mutex& rMutex,
                   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
                   const OUString& rName,
                   const OUString& rType,
diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx
index e44e952d47d2..e894450b64b6 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -28,6 +28,7 @@ Tables::Tables(ODatabaseMetaData& xMetaData,
                ::osl::Mutex& rMutex,
                const TStringVector& rVector) :
     OCollection(rParent, sal_True, rMutex, rVector),
+    m_rMutex(rMutex),
     m_xMetaData(xMetaData)
 {
 }
@@ -57,6 +58,7 @@ ObjectType Tables::createObject(const OUString& rName)
         throw RuntimeException();
 
     ObjectType xRet(new Table(this,
+                              m_rMutex,
                               m_xMetaData.getConnection(),
                               rName,
                               "", // TODO: Type
diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx
index 2b3453c13e6b..85d7079c7e17 100644
--- a/connectivity/source/drivers/firebird/Tables.hxx
+++ b/connectivity/source/drivers/firebird/Tables.hxx
@@ -25,6 +25,9 @@ namespace connectivity
          */
         class Tables: public ::connectivity::sdbcx::OCollection
         {
+        private:
+            ::osl::Mutex& m_rMutex;
+
         protected:
             // OCollection: pure virtual functions requiring implementation
             virtual void impl_refresh()