mirror/soci
1
0
Fork 0
mirror of https://github.com/SOCI/soci.git synced 2026-01-05 20:50:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop-3.2.3

Browse Source 
wip: Merging SOCI 3.2.3 changes (current master) into develop.

Conflicts:
	.gitignore
	.travis.yml
	AUTHORS
	CHANGES
	cmake/SociBackend.cmake
	cmake/modules/FindODBC.cmake
	docs/installation.html
	include/soci/boost-fusion.h
	include/soci/boost-tuple.h
	include/soci/odbc/soci-odbc.h
	include/soci/prepare-temp-type.h
	include/soci/ref-counted-prepare-info.h
	include/soci/soci-platform.h
	include/soci/statement.h
	include/soci/use.h
	include/soci/version.h
	src/CMakeLists.txt
	src/backends/postgresql/test/test-postgresql.cpp
	src/backends/sqlite3/blob.cpp
	src/backends/sqlite3/test/test-sqlite3.cpp
	src/core/CMakeLists.txt
	src/core/test/common-tests.h
	tests/mysql/test-mysql.cpp
	www/index.html
This commit is contained in:
Mateusz Łoskot
2015-04-09 23:43:22 +02:00
parent 327857927b 111b50af8c
commit e4376edaec
37 changed files with 690 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/core/statement.cpp
View File

@@ -22,15 +22,6 @@
using namespace soci;
using namespace soci::details;
void statement::exchange(into_type_ptr const & i)
{
impl_->exchange(i);
}
void statement::exchange(use_type_ptr const & u)
{
impl_->exchange(u);
}
statement_impl::statement_impl(session & s)
: session_(s), refCount_(1), row_(0),
@@ -153,40 +144,6 @@ void statement_impl::bind(values & values)
}
}
void statement_impl::exchange(into_type_ptr const & i)
{
intos_.push_back(i.get());
i.release();
}
void statement_impl::exchange_for_row(into_type_ptr const & i)
{
intosForRow_.push_back(i.get());
i.release();
}
void statement_impl::exchange_for_rowset(into_type_ptr const & i)
{
if (intos_.empty() == false)
{
throw soci_error("Explicit into elements not allowed with rowset.");
}
into_type_base* p = i.get();
intos_.push_back(p);
i.release();
int definePosition = 1;
p->define(*this, definePosition);
definePositionForRow_ = definePosition;
}
void statement_impl::exchange(use_type_ptr const & u)
{
uses_.push_back(u.get());
u.release();
}
void statement_impl::clean_up()
{
// deallocate all bind and define objects