Skip to content

Commit b9f60b8

Browse files
obiltschnigobiltschnig
committed
some renaming and clean-up
1 parent 01bcb63 commit b9f60b8

44 files changed

Lines changed: 493 additions & 389 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Data/Data_VS71.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
RelativePath=".\include\Poco\Data\SessionImpl.h">
222222
</File>
223223
<File
224-
RelativePath=".\include\Poco\Data\SessionInstantiator.h">
224+
RelativePath=".\include\Poco\Data\Connector.h">
225225
</File>
226226
<File
227227
RelativePath=".\include\Poco\Data\Statement.h">
@@ -288,7 +288,7 @@
288288
RelativePath=".\src\SessionImpl.cpp">
289289
</File>
290290
<File
291-
RelativePath=".\src\SessionInstantiator.cpp">
291+
RelativePath=".\src\Connector.cpp">
292292
</File>
293293
<File
294294
RelativePath=".\src\Statement.cpp">

‎Data/Data_VS80.vcproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,10 @@
257257
RelativePath=".\include\Poco\Data\Common.h"
258258
>
259259
</File>
260+
<File
261+
RelativePath=".\include\Poco\Data\Connector.h"
262+
>
263+
</File>
260264
<File
261265
RelativePath=".\include\Poco\Data\Data.h"
262266
>
@@ -301,10 +305,6 @@
301305
RelativePath=".\include\Poco\Data\SessionImpl.h"
302306
>
303307
</File>
304-
<File
305-
RelativePath=".\include\Poco\Data\SessionInstantiator.h"
306-
>
307-
</File>
308308
<File
309309
RelativePath=".\include\Poco\Data\Statement.h"
310310
>
@@ -357,6 +357,10 @@
357357
RelativePath=".\src\BLOBStream.cpp"
358358
>
359359
</File>
360+
<File
361+
RelativePath=".\src\Connector.cpp"
362+
>
363+
</File>
360364
<File
361365
RelativePath=".\src\DataException.cpp"
362366
>
@@ -389,10 +393,6 @@
389393
RelativePath=".\src\SessionImpl.cpp"
390394
>
391395
</File>
392-
<File
393-
RelativePath=".\src\SessionInstantiator.cpp"
394-
>
395-
</File>
396396
<File
397397
RelativePath=".\src\Statement.cpp"
398398
>

‎Data/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Makefile
33
#
4-
# $Id: //poco/Main/Data/Makefile#10 $
4+
# $Id: //poco/Main/Data/Makefile#11 $
55
#
66
# Makefile for Poco Data
77
#
@@ -13,7 +13,7 @@ objects = AbstractBinder AbstractBinding AbstractExtraction \
1313
BLOB BLOBStream DataException Limit MetaColumn \
1414
PooledSessionHolder PooledSessionImpl \
1515
Range RecordSet Session SessionFactory SessionImpl \
16-
SessionInstantiator SessionPool Statement StatementCreator StatementImpl
16+
Connector SessionPool Statement StatementCreator StatementImpl
1717

1818
target = PocoData
1919
target_version = $(LIBVERSION)

‎Data/ODBC/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ endif
1616

1717
objects = Binder ConnectionHandle DataTypes EnvironmentHandle \
1818
Extractor ODBCColumn ODBCException ODBCStatementImpl Parameter Preparation \
19-
SessionImpl SessionInstantiator Utility
19+
SessionImpl Connector Utility
2020

2121
target = PocoODBC
2222
target_version = $(LIBVERSION)

‎Data/ODBC/ODBC_VS71.vcproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@
154154
<File
155155
RelativePath=".\include\Poco\Data\Odbc\ConnectionHandle.h">
156156
</File>
157+
<File
158+
RelativePath=".\include\Poco\Data\Odbc\Connector.h">
159+
</File>
157160
<File
158161
RelativePath=".\include\Poco\Data\Odbc\DataTypes.h">
159162
</File>
@@ -193,9 +196,6 @@
193196
<File
194197
RelativePath=".\include\Poco\Data\Odbc\SessionImpl.h">
195198
</File>
196-
<File
197-
RelativePath=".\include\Poco\Data\Odbc\SessionInstantiator.h">
198-
</File>
199199
<File
200200
RelativePath=".\include\Poco\Data\Odbc\Utility.h">
201201
</File>
@@ -209,6 +209,9 @@
209209
<File
210210
RelativePath=".\src\ConnectionHandle.cpp">
211211
</File>
212+
<File
213+
RelativePath=".\src\Connector.cpp">
214+
</File>
212215
<File
213216
RelativePath=".\src\DataTypes.cpp">
214217
</File>
@@ -236,9 +239,6 @@
236239
<File
237240
RelativePath=".\src\SessionImpl.cpp">
238241
</File>
239-
<File
240-
RelativePath=".\src\SessionInstantiator.cpp">
241-
</File>
242242
<File
243243
RelativePath=".\src\Utility.cpp">
244244
</File>

‎Data/ODBC/ODBC_VS80.vcproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,10 @@
217217
RelativePath=".\include\Poco\Data\ODBC\ConnectionHandle.h"
218218
>
219219
</File>
220+
<File
221+
RelativePath=".\include\Poco\Data\ODBC\Connector.h"
222+
>
223+
</File>
220224
<File
221225
RelativePath=".\include\Poco\Data\ODBC\DataTypes.h"
222226
>
@@ -269,10 +273,6 @@
269273
RelativePath=".\include\Poco\Data\ODBC\SessionImpl.h"
270274
>
271275
</File>
272-
<File
273-
RelativePath=".\include\Poco\Data\ODBC\SessionInstantiator.h"
274-
>
275-
</File>
276276
<File
277277
RelativePath=".\include\Poco\Data\ODBC\Utility.h"
278278
>
@@ -289,6 +289,10 @@
289289
RelativePath=".\src\ConnectionHandle.cpp"
290290
>
291291
</File>
292+
<File
293+
RelativePath=".\src\Connector.cpp"
294+
>
295+
</File>
292296
<File
293297
RelativePath=".\src\DataTypes.cpp"
294298
>
@@ -325,10 +329,6 @@
325329
RelativePath=".\src\SessionImpl.cpp"
326330
>
327331
</File>
328-
<File
329-
RelativePath=".\src\SessionInstantiator.cpp"
330-
>
331-
</File>
332332
<File
333333
RelativePath=".\src\Utility.cpp"
334334
>

Data/ODBC/include/Poco/Data/ODBC/SessionInstantiator.h renamed to Data/ODBC/include/Poco/Data/ODBC/Connector.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//
2-
// SessionInstantiator.h
2+
// Connector.h
33
//
4-
// $Id: //poco/Main/Data/ODBC/include/Poco/Data/ODBC/SessionInstantiator.h#2 $
4+
// $Id: //poco/Main/Data/ODBC/include/Poco/Data/ODBC/Connector.h#2 $
55
//
66
// Library: ODBC
77
// Package: ODBC
8-
// Module: SessionInstantiator
8+
// Module: Connector
99
//
10-
// Definition of the SessionInstantiator class.
10+
// Definition of the Connector class.
1111
//
1212
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
1313
// and Contributors.
@@ -36,44 +36,44 @@
3636
//
3737

3838

39-
#ifndef DataConnectors_ODBC_SessionInstantiator_INCLUDED
40-
#define DataConnectors_ODBC_SessionInstantiator_INCLUDED
39+
#ifndef DataConnectors_ODBC_Connector_INCLUDED
40+
#define DataConnectors_ODBC_Connector_INCLUDED
4141

4242

4343
#include "Poco/Data/ODBC/ODBC.h"
44-
#include "Poco/Data/SessionInstantiator.h"
44+
#include "Poco/Data/Connector.h"
4545

4646

4747
namespace Poco {
4848
namespace Data {
4949
namespace ODBC {
5050

5151

52-
class ODBC_API SessionInstantiator: public Poco::Data::SessionInstantiator
53-
/// SessionInstantiator instantiates SqLite SessionImpl objects.
52+
class ODBC_API Connector: public Poco::Data::Connector
53+
/// Connector instantiates SqLite SessionImpl objects.
5454
{
5555
public:
5656
static const std::string KEY;
5757
/// Keyword for creating ODBC sessions
5858

59-
SessionInstantiator();
60-
/// Creates the SessionInstantiator.
59+
Connector();
60+
/// Creates the Connector.
6161

62-
~SessionInstantiator();
63-
/// Destroys the SessionInstantiator.
62+
~Connector();
63+
/// Destroys the Connector.
6464

65-
Poco::AutoPtr<Poco::Data::SessionImpl> create(const std::string& initString);
66-
/// Creates a ODBC SessionImpl object and initializes it with the given initString.
65+
Poco::AutoPtr<Poco::Data::SessionImpl> createSession(const std::string& connectionString);
66+
/// Creates a ODBC SessionImpl object and initializes it with the given connectionString.
6767

68-
static void addToFactory();
69-
/// Registers the SessionInstantiator under the Keyword SessionInstantiator::KEY at the Poco::Data::SessionFactory
68+
static void registerConnector();
69+
/// Registers the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory
7070

71-
static void removeFromFactory();
72-
/// Unregisters the SessionInstantiator under the Keyword SessionInstantiator::KEY at the Poco::Data::SessionFactory
71+
static void unregisterConnector();
72+
/// Unregisters the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory
7373
};
7474

7575

7676
} } } // namespace Poco::Data::ODBC
7777

7878

79-
#endif // DataConnectors_ODBC_SessionInstantiator_INCLUDED
79+
#endif // DataConnectors_ODBC_Connector_INCLUDED

Data/ODBC/src/SessionInstantiator.cpp renamed to Data/ODBC/src/Connector.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//
2-
// SessionInstantiator.cpp
2+
// Connector.cpp
33
//
4-
// $Id: //poco/Main/Data/ODBC/src/SessionInstantiator.cpp#2 $
4+
// $Id: //poco/Main/Data/ODBC/src/Connector.cpp#2 $
55
//
66
// Library: ODBC
77
// Package: ODBC
8-
// Module: SessionInstantiator
8+
// Module: Connector
99
//
1010
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
1111
// and Contributors.
@@ -34,7 +34,7 @@
3434
//
3535

3636

37-
#include "Poco/Data/ODBC/SessionInstantiator.h"
37+
#include "Poco/Data/ODBC/Connector.h"
3838
#include "Poco/Data/ODBC/SessionImpl.h"
3939
#include "Poco/Data/SessionFactory.h"
4040

@@ -44,32 +44,32 @@ namespace Data {
4444
namespace ODBC {
4545

4646

47-
const std::string SessionInstantiator::KEY("ODBC");
47+
const std::string Connector::KEY("ODBC");
4848

4949

50-
SessionInstantiator::SessionInstantiator()
50+
Connector::Connector()
5151
{
5252
}
5353

5454

55-
SessionInstantiator::~SessionInstantiator()
55+
Connector::~Connector()
5656
{
5757
}
5858

5959

60-
Poco::AutoPtr<Poco::Data::SessionImpl> SessionInstantiator::create(const std::string& initString)
60+
Poco::AutoPtr<Poco::Data::SessionImpl> Connector::createSession(const std::string& connectionString)
6161
{
62-
return Poco::AutoPtr<Poco::Data::SessionImpl>(new SessionImpl(initString));
62+
return Poco::AutoPtr<Poco::Data::SessionImpl>(new SessionImpl(connectionString));
6363
}
6464

6565

66-
void SessionInstantiator::addToFactory()
66+
void Connector::registerConnector()
6767
{
68-
Poco::Data::SessionFactory::instance().add(KEY, new SessionInstantiator());
68+
Poco::Data::SessionFactory::instance().add(KEY, new Connector());
6969
}
7070

7171

72-
void SessionInstantiator::removeFromFactory()
72+
void Connector::unregisterConnector()
7373
{
7474
Poco::Data::SessionFactory::instance().remove(KEY);
7575
}

‎Data/ODBC/testsuite/src/ODBCAccessTest.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// ODBCAccessTest.cpp
33
//
4-
// $Id: //poco/Main/Data/ODBC/testsuite/src/ODBCAccessTest.cpp#2 $
4+
// $Id: //poco/Main/Data/ODBC/testsuite/src/ODBCAccessTest.cpp#3 $
55
//
66
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
77
// and Contributors.
@@ -39,7 +39,7 @@
3939
#include "Poco/Data/Common.h"
4040
#include "Poco/Data/BLOB.h"
4141
#include "Poco/Data/StatementImpl.h"
42-
#include "Poco/Data/ODBC/SessionInstantiator.h"
42+
#include "Poco/Data/ODBC/Connector.h"
4343
#include "Poco/Data/ODBC/Utility.h"
4444
#include "Poco/Data/ODBC/Diagnostics.h"
4545
#include "Poco/Data/ODBC/ODBCException.h"
@@ -69,7 +69,7 @@ ODBCAccessTest::ODBCAccessTest(const std::string& name):
6969
{
7070
static bool beenHere = false;
7171

72-
ODBC::SessionInstantiator::addToFactory();
72+
ODBC::Connector::registerConnector();
7373
if (_drivers.empty() || _dataSources.empty())
7474
{
7575
Utility::drivers(_drivers);
@@ -80,7 +80,7 @@ ODBCAccessTest::ODBCAccessTest(const std::string& name):
8080
{
8181
try
8282
{
83-
_pSession = new Session(SessionFactory::instance().create(ODBC::SessionInstantiator::KEY, _dbConnString));
83+
_pSession = new Session(SessionFactory::instance().create(ODBC::Connector::KEY, _dbConnString));
8484
}catch (ConnectionException& ex)
8585
{
8686
std::cout << "!!! WARNING: Connection failed. Access tests will fail !!!" << std::endl;
@@ -100,7 +100,7 @@ ODBCAccessTest::ODBCAccessTest(const std::string& name):
100100

101101
ODBCAccessTest::~ODBCAccessTest()
102102
{
103-
ODBC::SessionInstantiator::removeFromFactory();
103+
ODBC::Connector::unregisterConnector();
104104
}
105105

106106

0 commit comments

Comments
 (0)