Skip to content

Commit 6268aa3

Browse files
author
Marian Krivos
committed
backport changes from 1.4.3 branch
1 parent cc90b38 commit 6268aa3

69 files changed

Lines changed: 10351 additions & 5731 deletions

Some content is hidden

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

‎Data/SQLite/src/Connector.cpp‎

Lines changed: 92 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,96 @@
1-
//
2-
// Connector.cpp
3-
//
1+
//
2+
// Connector.cpp
3+
//
44
// $Id: //poco/Main/Data/SQLite/src/Connector.cpp#2 $
5-
//
5+
//
66
// Library: SQLite
7-
// Package: SQLite
8-
// Module: Connector
9-
//
10-
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
11-
// and Contributors.
12-
//
13-
// Permission is hereby granted, free of charge, to any person or organization
14-
// obtaining a copy of the software and accompanying documentation covered by
15-
// this license (the "Software") to use, reproduce, display, distribute,
16-
// execute, and transmit the Software, and to prepare derivative works of the
17-
// Software, and to permit third-parties to whom the Software is furnished to
18-
// do so, all subject to the following:
19-
//
20-
// The copyright notices in the Software and this entire statement, including
21-
// the above license grant, this restriction and the following disclaimer,
22-
// must be included in all copies of the Software, in whole or in part, and
23-
// all derivative works of the Software, unless such copies or derivative
24-
// works are solely in the form of machine-executable object code generated by
25-
// a source language processor.
26-
//
27-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
28-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
29-
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
30-
// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
31-
// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
32-
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
33-
// DEALINGS IN THE SOFTWARE.
34-
//
35-
36-
37-
#include "Poco/Data/SQLite/Connector.h"
38-
#include "Poco/Data/SQLite/SessionImpl.h"
39-
#include "Poco/Data/SessionFactory.h"
40-
#include "sqlite3.h"
41-
42-
43-
namespace Poco {
44-
namespace Data {
45-
namespace SQLite {
46-
47-
7+
// Package: SQLite
8+
// Module: Connector
9+
//
10+
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
11+
// and Contributors.
12+
//
13+
// Permission is hereby granted, free of charge, to any person or organization
14+
// obtaining a copy of the software and accompanying documentation covered by
15+
// this license (the "Software") to use, reproduce, display, distribute,
16+
// execute, and transmit the Software, and to prepare derivative works of the
17+
// Software, and to permit third-parties to whom the Software is furnished to
18+
// do so, all subject to the following:
19+
//
20+
// The copyright notices in the Software and this entire statement, including
21+
// the above license grant, this restriction and the following disclaimer,
22+
// must be included in all copies of the Software, in whole or in part, and
23+
// all derivative works of the Software, unless such copies or derivative
24+
// works are solely in the form of machine-executable object code generated by
25+
// a source language processor.
26+
//
27+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
28+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
29+
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
30+
// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
31+
// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
32+
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
33+
// DEALINGS IN THE SOFTWARE.
34+
//
35+
36+
37+
#include "Poco/Data/SQLite/Connector.h"
38+
#include "Poco/Data/SQLite/SessionImpl.h"
39+
#include "Poco/Data/SessionFactory.h"
40+
#if defined(POCO_UNBUNDLED)
41+
#include <sqlite3.h>
42+
#else
43+
#include "sqlite3.h"
44+
#endif
45+
46+
47+
namespace Poco {
48+
namespace Data {
49+
namespace SQLite {
50+
51+
4852
const std::string Connector::KEY("sqlite");
49-
50-
51-
Connector::Connector()
52-
{
53-
}
54-
55-
56-
Connector::~Connector()
57-
{
58-
}
59-
60-
53+
54+
55+
Connector::Connector()
56+
{
57+
}
58+
59+
60+
Connector::~Connector()
61+
{
62+
}
63+
64+
6165
Poco::AutoPtr<Poco::Data::SessionImpl> Connector::createSession(const std::string& connectionString,
62-
std::size_t timeout)
63-
{
64-
return Poco::AutoPtr<Poco::Data::SessionImpl>(new SessionImpl(connectionString, timeout));
65-
}
66-
67-
68-
void Connector::registerConnector()
69-
{
70-
Poco::Data::SessionFactory::instance().add(new Connector());
71-
}
72-
73-
74-
void Connector::unregisterConnector()
75-
{
76-
Poco::Data::SessionFactory::instance().remove(KEY);
77-
}
78-
79-
80-
void Connector::enableSharedCache(bool flag)
81-
{
82-
sqlite3_enable_shared_cache(flag ? 1 : 0);
83-
}
84-
85-
86-
void Connector::enableSoftHeapLimit(int limit)
87-
{
88-
sqlite3_soft_heap_limit(limit);
89-
}
90-
91-
92-
} } } // namespace Poco::Data::SQLite
66+
std::size_t timeout)
67+
{
68+
return Poco::AutoPtr<Poco::Data::SessionImpl>(new SessionImpl(connectionString, timeout));
69+
}
70+
71+
72+
void Connector::registerConnector()
73+
{
74+
Poco::Data::SessionFactory::instance().add(new Connector());
75+
}
76+
77+
78+
void Connector::unregisterConnector()
79+
{
80+
Poco::Data::SessionFactory::instance().remove(KEY);
81+
}
82+
83+
84+
void Connector::enableSharedCache(bool flag)
85+
{
86+
sqlite3_enable_shared_cache(flag ? 1 : 0);
87+
}
88+
89+
90+
void Connector::enableSoftHeapLimit(int limit)
91+
{
92+
sqlite3_soft_heap_limit(limit);
93+
}
94+
95+
96+
} } } // namespace Poco::Data::SQLite

0 commit comments

Comments
 (0)